zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

org.cybergarage.*: type arguments, unused imports

Browse Source
This commit is contained in:
str4d
2013-11-21 05:58:54 +00:00
parent 3aa982529e
commit 567c328331
21 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
router/java/src/org/cybergarage/net/HostInterface.java
View File

@@ -100,12 +100,12 @@ public class HostInterface
int nHostAddrs = 0;
try {
Enumeration nis = NetworkInterface.getNetworkInterfaces();
Enumeration<NetworkInterface> nis = NetworkInterface.getNetworkInterfaces();
while (nis.hasMoreElements()){
NetworkInterface ni = (NetworkInterface)nis.nextElement();
Enumeration addrs = ni.getInetAddresses();
NetworkInterface ni = nis.nextElement();
Enumeration<InetAddress> addrs = ni.getInetAddresses();
while (addrs.hasMoreElements()) {
InetAddress addr = (InetAddress)addrs.nextElement();
InetAddress addr = addrs.nextElement();
if (isUsableAddress(addr) == false)
continue;
nHostAddrs++;
@@ -126,9 +126,9 @@ public class HostInterface
* @since 1.8.0
*/
public final static InetAddress[] getInetAddress(int ipfilter,String[] interfaces){
Enumeration nis;
Enumeration<NetworkInterface> nis;
if(interfaces!=null){
Vector iflist = new Vector();
Vector<NetworkInterface> iflist = new Vector<NetworkInterface>();
for (int i = 0; i < interfaces.length; i++) {
NetworkInterface ni;
try {
@@ -147,12 +147,12 @@ public class HostInterface
return null;
}
}
ArrayList addresses = new ArrayList();
ArrayList<InetAddress> addresses = new ArrayList<InetAddress>();
while (nis.hasMoreElements()){
NetworkInterface ni = (NetworkInterface)nis.nextElement();
Enumeration addrs = ni.getInetAddresses();
NetworkInterface ni = nis.nextElement();
Enumeration<InetAddress> addrs = ni.getInetAddresses();
while (addrs.hasMoreElements()) {
InetAddress addr = (InetAddress)addrs.nextElement();
InetAddress addr = addrs.nextElement();
if(((ipfilter & LOCAL_BITMASK)==0) && addr.isLoopbackAddress())
continue;
@@ -163,7 +163,7 @@ public class HostInterface
}
}
}
return (InetAddress[]) addresses.toArray(new InetAddress[]{});
return addresses.toArray(new InetAddress[]{});
}
@@ -174,12 +174,12 @@ public class HostInterface
int hostAddrCnt = 0;
try {
Enumeration nis = NetworkInterface.getNetworkInterfaces();
Enumeration<NetworkInterface> nis = NetworkInterface.getNetworkInterfaces();
while (nis.hasMoreElements()){
NetworkInterface ni = (NetworkInterface)nis.nextElement();
Enumeration addrs = ni.getInetAddresses();
NetworkInterface ni = nis.nextElement();
Enumeration<InetAddress> addrs = ni.getInetAddresses();
while (addrs.hasMoreElements()) {
InetAddress addr = (InetAddress)addrs.nextElement();
InetAddress addr = addrs.nextElement();
if (isUsableAddress(addr) == false)
continue;
if (hostAddrCnt < n) {

8
router/java/src/org/cybergarage/upnp/Action.java
View File

@@ -67,9 +67,9 @@ public class Action
void setService(Service s){
serviceNode=s.getServiceNode();
/*To ensure integrity of the XML structure*/
Iterator i = getArgumentList().iterator();
Iterator<Argument> i = getArgumentList().iterator();
while (i.hasNext()) {
Argument arg = (Argument) i.next();
Argument arg = i.next();
arg.setService(s);
}
}
@@ -170,9 +170,9 @@ public class Action
}else{
argumentListNode.removeAllNodes();
}
Iterator i = al.iterator();
Iterator<Argument> i = al.iterator();
while (i.hasNext()) {
Argument a = (Argument) i.next();
Argument a = i.next();
a.setService(getService());
argumentListNode.addNode(a.getArgumentNode());
}

2
router/java/src/org/cybergarage/upnp/ActionList.java
View File

@@ -17,7 +17,7 @@ package org.cybergarage.upnp;
import java.util.Vector;
public class ActionList extends Vector
public class ActionList extends Vector<Action>
{
////////////////////////////////////////////////
// Constants

6
router/java/src/org/cybergarage/upnp/AllowedValueList.java
View File

@@ -20,7 +20,7 @@ package org.cybergarage.upnp;
import java.util.Iterator;
import java.util.Vector;
public class AllowedValueList extends Vector
public class AllowedValueList extends Vector<AllowedValue>
{
////////////////////////////////////////////////
// Constants
@@ -55,8 +55,8 @@ public class AllowedValueList extends Vector
}
public boolean isAllowed(String v){
for (Iterator i = this.iterator(); i.hasNext();) {
AllowedValue av = (AllowedValue) i.next();
for (Iterator<AllowedValue> i = this.iterator(); i.hasNext();) {
AllowedValue av = i.next();
if(av.getValue().equals(v))
return true;
}

2
router/java/src/org/cybergarage/upnp/ArgumentList.java
View File

@@ -17,7 +17,7 @@ package org.cybergarage.upnp;
import java.util.Vector;
public class ArgumentList extends Vector
public class ArgumentList extends Vector<Argument>
{
////////////////////////////////////////////////
// Constants

2
router/java/src/org/cybergarage/upnp/DeviceList.java
View File

@@ -17,7 +17,7 @@ package org.cybergarage.upnp;
import java.util.Vector;
public class DeviceList extends Vector
public class DeviceList extends Vector<Device>
{
////////////////////////////////////////////////
// Constants

2
router/java/src/org/cybergarage/upnp/IconList.java
View File

@@ -17,7 +17,7 @@ package org.cybergarage.upnp;
import java.util.Vector;
public class IconList extends Vector
public class IconList extends Vector<Icon>
{
////////////////////////////////////////////////
// Constants

4
router/java/src/org/cybergarage/upnp/Service.java
View File

@@ -501,9 +501,9 @@ public class Service
}
public void addAction(Action a){
Iterator i = a.getArgumentList().iterator();
Iterator<Argument> i = a.getArgumentList().iterator();
while (i.hasNext()) {
Argument arg = (Argument) i.next();
Argument arg = i.next();
arg.setService(this);
}

2
router/java/src/org/cybergarage/upnp/ServiceList.java
View File

@@ -19,7 +19,7 @@ package org.cybergarage.upnp;
import java.util.Vector;
public class ServiceList extends Vector
public class ServiceList extends Vector<Service>
{
////////////////////////////////////////////////
// Constants

2
router/java/src/org/cybergarage/upnp/ServiceStateTable.java
View File

@@ -17,7 +17,7 @@ package org.cybergarage.upnp;
import java.util.Vector;
public class ServiceStateTable extends Vector
public class ServiceStateTable extends Vector<StateVariable>
{
////////////////////////////////////////////////
// Constants

4
router/java/src/org/cybergarage/upnp/StateVariable.java
View File

@@ -277,9 +277,9 @@ public class StateVariable extends NodeData
getStateVariableNode().removeNode(AllowedValueList.ELEM_NAME);
getStateVariableNode().removeNode(AllowedValueRange.ELEM_NAME);
Node n = new Node(AllowedValueList.ELEM_NAME);
Iterator i=avl.iterator();
Iterator<AllowedValue> i=avl.iterator();
while (i.hasNext()) {
AllowedValue av = (AllowedValue) i.next();
AllowedValue av = i.next();
//n.addNode(new Node(AllowedValue.ELEM_NAME,av.getValue())); wrong!
n.addNode(av.getAllowedValueNode()); //better (twa)
}

2
router/java/src/org/cybergarage/upnp/event/SubscriberList.java
View File

@@ -19,7 +19,7 @@ package org.cybergarage.upnp.event;
import java.util.*;
public class SubscriberList extends Vector
public class SubscriberList extends Vector<Subscriber>
{
////////////////////////////////////////////////
// Constructor

4
router/java/src/org/cybergarage/upnp/ssdp/HTTPMUSocket.java
View File

@@ -83,9 +83,9 @@ public class HTTPMUSocket
if (ssdpMultiGroup == null || ssdpMultiIf == null)
return "";
InetAddress mcastAddr = ssdpMultiGroup.getAddress();
Enumeration addrs = ssdpMultiIf.getInetAddresses();
Enumeration<InetAddress> addrs = ssdpMultiIf.getInetAddresses();
while (addrs.hasMoreElements()) {
InetAddress addr = (InetAddress)addrs.nextElement();
InetAddress addr = addrs.nextElement();
if (mcastAddr instanceof Inet6Address && addr instanceof Inet6Address)
return addr.getHostAddress();
if (mcastAddr instanceof Inet4Address && addr instanceof Inet4Address)

1
router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocket.java
View File

@@ -33,7 +33,6 @@ import java.net.*;
import java.io.IOException;
import org.cybergarage.net.*;
import org.cybergarage.util.*;
import org.cybergarage.http.*;
import org.cybergarage.upnp.*;
import org.cybergarage.util.Debug;

2
router/java/src/org/cybergarage/upnp/ssdp/SSDPNotifySocketList.java
View File

@@ -22,7 +22,7 @@ import org.cybergarage.net.*;
import org.cybergarage.upnp.*;
public class SSDPNotifySocketList extends Vector
public class SSDPNotifySocketList extends Vector<SSDPNotifySocket>
{
////////////////////////////////////////////////
// Constructor

2
router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchResponseSocketList.java
View File

@@ -24,7 +24,7 @@ import org.cybergarage.net.*;
import org.cybergarage.upnp.*;
public class SSDPSearchResponseSocketList extends Vector
public class SSDPSearchResponseSocketList extends Vector<SSDPSearchResponseSocket>
{
////////////////////////////////////////////////
// Constructor

2
router/java/src/org/cybergarage/upnp/ssdp/SSDPSearchSocketList.java
View File

@@ -24,7 +24,7 @@ import java.util.Vector;
import org.cybergarage.net.HostInterface;
import org.cybergarage.upnp.device.SearchListener;
public class SSDPSearchSocketList extends Vector
public class SSDPSearchSocketList extends Vector<SSDPSearchSocket>
{
////////////////////////////////////////////////
// Constructor

2
router/java/src/org/cybergarage/util/ListenerList.java
View File

@@ -17,7 +17,7 @@ package org.cybergarage.util;
import java.util.Vector;
public class ListenerList extends Vector
public class ListenerList extends Vector<Object>
{
public boolean add(Object obj)
{

2
router/java/src/org/cybergarage/xml/AttributeList.java
View File

@@ -17,7 +17,7 @@ package org.cybergarage.xml;
import java.util.Vector;
public class AttributeList extends Vector
public class AttributeList extends Vector<Attribute>
{
public AttributeList()
{

4
router/java/src/org/cybergarage/xml/Node.java
View File

@@ -275,9 +275,9 @@ public class Node
public int getIndex(String name){
int index = -1;
for (Iterator i = nodeList.iterator(); i.hasNext();) {
for (Iterator<Node> i = nodeList.iterator(); i.hasNext();) {
index++;
Node n = (Node) i.next();
Node n = i.next();
if(n.getName().equals(name))
return index;
}

2
router/java/src/org/cybergarage/xml/NodeList.java
View File

@@ -17,7 +17,7 @@ package org.cybergarage.xml;
import java.util.Vector;
public class NodeList extends Vector
public class NodeList extends Vector<Node>
{
public NodeList()
{