diff --git a/router/java/src/org/cybergarage/http/HTTPPacket.java b/router/java/src/org/cybergarage/http/HTTPPacket.java
index 5d26279f5dfc87d569789db5654b08ab0d66d4d3..76ed7dac818ae604cb1b87385525dfcf9f69af9e 100644
--- a/router/java/src/org/cybergarage/http/HTTPPacket.java
+++ b/router/java/src/org/cybergarage/http/HTTPPacket.java
@@ -387,7 +387,7 @@ public class HTTPPacket
 
 	public HTTPHeader getHeader(int n)
 	{
-		return (HTTPHeader)httpHeaderList.get(n);
+		return httpHeaderList.get(n);
 	}
 	
 	public HTTPHeader getHeader(String name)
diff --git a/router/java/src/org/cybergarage/http/HTTPServerList.java b/router/java/src/org/cybergarage/http/HTTPServerList.java
index 07acedec07894c2ce2e755b7963b1898f1a4a35e..ef41bb0028bde58a045381fc0094ce77bd9262fa 100644
--- a/router/java/src/org/cybergarage/http/HTTPServerList.java
+++ b/router/java/src/org/cybergarage/http/HTTPServerList.java
@@ -55,7 +55,7 @@ public class HTTPServerList extends Vector<HTTPServer>
 	
 	public HTTPServer getHTTPServer(int n)
 	{
-		return (HTTPServer)get(n);
+		return get(n);
 	}
 
 	////////////////////////////////////////////////
diff --git a/router/java/src/org/cybergarage/http/ParameterList.java b/router/java/src/org/cybergarage/http/ParameterList.java
index 9c1ad484827f01d2733dd59515bcd09e5f7ff84f..50bef7152555204ebef654901be33648fab90c0a 100644
--- a/router/java/src/org/cybergarage/http/ParameterList.java
+++ b/router/java/src/org/cybergarage/http/ParameterList.java
@@ -25,12 +25,12 @@ public class ParameterList extends Vector<Parameter>
 	
 	public Parameter at(int n)
 	{
-		return (Parameter)get(n);
+		return get(n);
 	}
 
 	public Parameter getParameter(int n)
 	{
-		return (Parameter)get(n);
+		return get(n);
 	}
 	
 	public Parameter getParameter(String name) 
diff --git a/router/java/src/org/cybergarage/upnp/Action.java b/router/java/src/org/cybergarage/upnp/Action.java
index 6024be5d0284a2510fba9b7dad7eab83f5f072b8..ccdccc4388d7584946287caf5d1ca9c0c5462b67 100644
--- a/router/java/src/org/cybergarage/upnp/Action.java
+++ b/router/java/src/org/cybergarage/upnp/Action.java
@@ -326,7 +326,7 @@ public class Action
 	
 	public boolean performActionListener(ActionRequest actionReq)
 	{
-		ActionListener listener = (ActionListener)getActionListener();
+		ActionListener listener = getActionListener();
 		if (listener == null)
 			return false;
 		ActionResponse actionRes = new ActionResponse();
diff --git a/router/java/src/org/cybergarage/upnp/ActionList.java b/router/java/src/org/cybergarage/upnp/ActionList.java
index a6e4eaeed6c21f423ba05c64c1132fbcfc1a9cc5..3c01a98244a9c5f43da527c17fcba707c409d7d2 100644
--- a/router/java/src/org/cybergarage/upnp/ActionList.java
+++ b/router/java/src/org/cybergarage/upnp/ActionList.java
@@ -39,7 +39,7 @@ public class ActionList extends Vector<Action>
 	
 	public Action getAction(int n)
 	{
-		return (Action)get(n);
+		return get(n);
 	}
 }
 
diff --git a/router/java/src/org/cybergarage/upnp/AllowedValueList.java b/router/java/src/org/cybergarage/upnp/AllowedValueList.java
index 851b9d5ff1da4acd294aa68a7a4c129fdfc85a74..212ea5c3dd7de301cf5d122f7e8865e911bcefff 100644
--- a/router/java/src/org/cybergarage/upnp/AllowedValueList.java
+++ b/router/java/src/org/cybergarage/upnp/AllowedValueList.java
@@ -51,7 +51,7 @@ public class AllowedValueList extends Vector<AllowedValue>
 	
 	public AllowedValue getAllowedValue(int n)
 	{
-		return (AllowedValue)get(n);
+		return get(n);
 	}
 
 	public boolean isAllowed(String v){
diff --git a/router/java/src/org/cybergarage/upnp/ArgumentList.java b/router/java/src/org/cybergarage/upnp/ArgumentList.java
index 148d5c544a016bb702d6516702bff8720504cb75..e1c0e46dbb004dc6d65a617d0c2cff4ae7cf26f0 100644
--- a/router/java/src/org/cybergarage/upnp/ArgumentList.java
+++ b/router/java/src/org/cybergarage/upnp/ArgumentList.java
@@ -39,7 +39,7 @@ public class ArgumentList extends Vector<Argument>
 	
 	public Argument getArgument(int n)
 	{
-		return (Argument)get(n);
+		return get(n);
 	}
 
 	public Argument getArgument(String name)
diff --git a/router/java/src/org/cybergarage/upnp/Device.java b/router/java/src/org/cybergarage/upnp/Device.java
index 18dc6126e18503a9cf95f6947b95eae339b399f8..08b48d874bc7d5bd22f530de70481cef2ccf6279 100644
--- a/router/java/src/org/cybergarage/upnp/Device.java
+++ b/router/java/src/org/cybergarage/upnp/Device.java
@@ -1280,7 +1280,7 @@ public class Device implements org.cybergarage.http.HTTPRequestListener,
 			ActionList actionList = service.getActionList();
 			int actionCnt = actionList.size();
 			for (int i = 0; i < actionCnt; i++) {
-				Action action = (Action) actionList.getAction(i);
+				Action action = actionList.getAction(i);
 				String actionName = action.getName();
 				if (actionName == null)
 					continue;
diff --git a/router/java/src/org/cybergarage/upnp/DeviceList.java b/router/java/src/org/cybergarage/upnp/DeviceList.java
index bce9a26eb807c7ba632a2d92cbe4f2002a0246f0..40163c34bd01263cfa1cda78440e94ecbba544b8 100644
--- a/router/java/src/org/cybergarage/upnp/DeviceList.java
+++ b/router/java/src/org/cybergarage/upnp/DeviceList.java
@@ -39,7 +39,7 @@ public class DeviceList extends Vector<Device>
 	
 	public Device getDevice(int n)
 	{
-		return (Device)get(n);
+		return get(n);
 	}
 }
 
diff --git a/router/java/src/org/cybergarage/upnp/IconList.java b/router/java/src/org/cybergarage/upnp/IconList.java
index 707e5b7a3bb369f434ca6c7e66901721bcd8bb7c..82267b38aeac1c523cce31784b2f5b630348bf80 100644
--- a/router/java/src/org/cybergarage/upnp/IconList.java
+++ b/router/java/src/org/cybergarage/upnp/IconList.java
@@ -39,7 +39,7 @@ public class IconList extends Vector<Icon>
 	
 	public Icon getIcon(int n)
 	{
-		return (Icon)get(n);
+		return get(n);
 	}
 }
 
diff --git a/router/java/src/org/cybergarage/upnp/ServiceStateTable.java b/router/java/src/org/cybergarage/upnp/ServiceStateTable.java
index cf1e1d5e9868503d189b12691b33de392bf3f1bc..9773d8e03a4dce0befb49ae16830eea599f684f9 100644
--- a/router/java/src/org/cybergarage/upnp/ServiceStateTable.java
+++ b/router/java/src/org/cybergarage/upnp/ServiceStateTable.java
@@ -39,7 +39,7 @@ public class ServiceStateTable extends Vector<StateVariable>
 	
 	public StateVariable getStateVariable(int n)
 	{
-		return (StateVariable)get(n);
+		return get(n);
 	}
 }
 
diff --git a/router/java/src/org/cybergarage/upnp/UPnP.java b/router/java/src/org/cybergarage/upnp/UPnP.java
index d4a8d4caa30542618c6f303984ef1fcc2f76c8c7..6a3fa984abd840a8e8d6a210d746566ab7c33eaf 100644
--- a/router/java/src/org/cybergarage/upnp/UPnP.java
+++ b/router/java/src/org/cybergarage/upnp/UPnP.java
@@ -172,7 +172,7 @@ public class UPnP
 
 	private static final String toUUID(int seed)
 	{
-		String id = Integer.toString((int)(seed & 0xFFFF), 16);
+		String id = Integer.toString(seed & 0xFFFF, 16);
 		int idLen = id.length();
 		String uuid = "";
 		for (int n=0; n<(4-idLen); n++)
diff --git a/router/java/src/org/cybergarage/upnp/event/PropertyList.java b/router/java/src/org/cybergarage/upnp/event/PropertyList.java
index 23e782efc9967bdda451d820296964f71c760886..55980ed6ce0222a2552f1304f863d05fad0a4cbf 100644
--- a/router/java/src/org/cybergarage/upnp/event/PropertyList.java
+++ b/router/java/src/org/cybergarage/upnp/event/PropertyList.java
@@ -39,7 +39,7 @@ public class PropertyList extends Vector<Property>
 	
 	public Property getProperty(int n)
 	{
-		return (Property)get(n);
+		return get(n);
 	}
 }
 
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java
index 491466efec77ba011f14b0654ad0f07243b57d7e..1ba3726a00253837fc46bf1fb7ad5180eced8761 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java
@@ -48,7 +48,7 @@ public class SSDPNotifySocketList extends Vector<SSDPNotifySocket>
 	
 	public SSDPNotifySocket getSSDPNotifySocket(int n)
 	{
-		return (SSDPNotifySocket)get(n);
+		return get(n);
 	}
 
 	////////////////////////////////////////////////
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java
index 06c1986c7f2afbcde082e40bcd2adb6a4f994642..3eeb4c8a443b8e28e95b34aa3114896c6a9d8367 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java
@@ -66,7 +66,7 @@ public class SSDPSearchResponseSocketList extends Vector<SSDPSearchResponseSocke
 	
 	public SSDPSearchResponseSocket getSSDPSearchResponseSocket(int n)
 	{
-		return (SSDPSearchResponseSocket)get(n);
+		return get(n);
 	}
 	
 	////////////////////////////////////////////////
diff --git a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java
index 6e3c5b13071b528efd034fb2c3b5a9b3f0018b1e..298652758b5ef736f7565482823e812200ca17a6 100644
--- a/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java
+++ b/router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java
@@ -67,7 +67,7 @@ public class SSDPSearchSocketList extends Vector<SSDPSearchSocket>
 	
 	public SSDPSearchSocket getSSDPSearchSocket(int n)
 	{
-		return (SSDPSearchSocket)get(n);
+		return get(n);
 	}
 	
 	public void addSearchListener(SearchListener listener)
diff --git a/router/java/src/org/cybergarage/xml/AttributeList.java b/router/java/src/org/cybergarage/xml/AttributeList.java
index ea6840f524707f50d3d3a190fe0cc1858b658df6..9619af2c0b5a9cc994d9481a5116e81c9f126079 100644
--- a/router/java/src/org/cybergarage/xml/AttributeList.java
+++ b/router/java/src/org/cybergarage/xml/AttributeList.java
@@ -25,7 +25,7 @@ public class AttributeList extends Vector<Attribute>
 	
 	public Attribute getAttribute(int n)
 	{
-		return (Attribute)get(n);
+		return get(n);
 	}
 	
 	public Attribute getAttribute(String name) 
diff --git a/router/java/src/org/cybergarage/xml/NodeList.java b/router/java/src/org/cybergarage/xml/NodeList.java
index 77e9c61c9f2eb1cae5629d99ddc6de74e743e5f0..73d6f28f0bb837984c0802d423e2d22cfa094fd9 100644
--- a/router/java/src/org/cybergarage/xml/NodeList.java
+++ b/router/java/src/org/cybergarage/xml/NodeList.java
@@ -25,7 +25,7 @@ public class NodeList extends Vector<Node>
 	
 	public Node getNode(int n)
 	{
-		return (Node)get(n);
+		return get(n);
 	}
 
 	public Node getNode(String name)