Author: j16sdiz
Date: 2008-10-30 08:37:02 +0000 (Thu, 30 Oct 2008)
New Revision: 23220
Modified:
trunk/freenet/src/freenet/node/NodeIPDetector.java
trunk/freenet/src/freenet/node/NodeIPPortDetector.java
Log:
generic, enchanced for-loop
Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java 2008-10-30 08:36:38 UTC
(rev 23219)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java 2008-10-30 08:37:02 UTC
(rev 23220)
@@ -7,6 +7,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import freenet.config.InvalidConfigValueException;
import freenet.config.SubConfig;
@@ -128,7 +129,7 @@
synchronized(this) {
hasValidIP = addedValidIP;
}
- lastIPAddress = (FreenetInetAddress[]) addresses.toArray(new
FreenetInetAddress[addresses.size()]);
+ lastIPAddress = addresses.toArray(new
FreenetInetAddress[addresses.size()]);
if(dumpLocalAddresses) {
ArrayList<FreenetInetAddress> filtered = new
ArrayList<FreenetInetAddress>(lastIPAddress.length);
for(int i=0;i<lastIPAddress.length;i++) {
@@ -139,7 +140,7 @@
else
if(IPUtil.isValidAddress(lastIPAddress[i].getAddress(), false))
filtered.add(lastIPAddress[i]);
}
- return (FreenetInetAddress[]) filtered.toArray(new
FreenetInetAddress[filtered.size()]);
+ return filtered.toArray(new
FreenetInetAddress[filtered.size()]);
}
return lastIPAddress;
}
@@ -229,8 +230,8 @@
}
}
if(countsByPeer.size() == 1) {
- Iterator it = countsByPeer.keySet().iterator();
- FreenetInetAddress addr = (FreenetInetAddress)
(it.next());
+ Iterator<FreenetInetAddress> it =
countsByPeer.keySet().iterator();
+ FreenetInetAddress addr = it.next();
Logger.minor(this, "Everyone agrees we are
"+addr);
if(!addresses.contains(addr)) {
if(addr.isRealInternetAddress(false,
false, false))
@@ -238,15 +239,14 @@
addresses.add(addr);
}
} else if(countsByPeer.size() > 1) {
- Iterator it = countsByPeer.keySet().iterator();
// Take two most popular addresses.
FreenetInetAddress best = null;
FreenetInetAddress secondBest = null;
int bestPopularity = 0;
int secondBestPopularity = 0;
- while(it.hasNext()) {
- FreenetInetAddress cur =
(FreenetInetAddress) (it.next());
- int curPop = ((Integer)
(countsByPeer.get(cur))).intValue();
+ for(Map.Entry<FreenetInetAddress,Integer> entry
: countsByPeer.entrySet()) {
+ FreenetInetAddress cur = entry.getKey();
+ int curPop = entry.getValue();
Logger.minor(this, "Detected peer:
"+cur+" popularity "+curPop);
if(curPop >= bestPopularity) {
secondBestPopularity =
bestPopularity;
Modified: trunk/freenet/src/freenet/node/NodeIPPortDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPPortDetector.java 2008-10-30
08:36:38 UTC (rev 23219)
+++ trunk/freenet/src/freenet/node/NodeIPPortDetector.java 2008-10-30
08:37:02 UTC (rev 23220)
@@ -7,6 +7,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import freenet.io.comm.FreenetInetAddress;
import freenet.io.comm.Peer;
@@ -90,22 +91,21 @@
}
}
if(countsByPeer.size() == 1) {
- Iterator it = countsByPeer.keySet().iterator();
- Peer p = (Peer) (it.next());
+ Iterator<Peer> it =
countsByPeer.keySet().iterator();
+ Peer p = (it.next());
Logger.minor(this, "Everyone agrees we are "+p);
if(!addresses.contains(p)) {
addresses.add(p);
}
} else if(countsByPeer.size() > 1) {
- Iterator it = countsByPeer.keySet().iterator();
// Take two most popular addresses.
Peer best = null;
Peer secondBest = null;
int bestPopularity = 0;
int secondBestPopularity = 0;
- while(it.hasNext()) {
- Peer cur = (Peer) (it.next());
- int curPop = ((Integer)
(countsByPeer.get(cur))).intValue();
+ for (Map.Entry<Peer,Integer> entry :
countsByPeer.entrySet()) {
+ Peer cur = entry.getKey();
+ int curPop = entry.getValue();
Logger.normal(this, "Detected peer:
"+cur+" popularity "+curPop);
if(curPop >= bestPopularity) {
secondBestPopularity =
bestPopularity;
@@ -141,7 +141,7 @@
}
}
}
- lastPeers = (Peer[]) addresses.toArray(new
Peer[addresses.size()]);
+ lastPeers = addresses.toArray(new Peer[addresses.size()]);
if(logMINOR)
Logger.minor(this, "Returning for port
"+crypto.portNumber+" : "+Arrays.toString(lastPeers));
return lastPeers;
