Author: j16sdiz
Date: 2008-10-30 08:34:35 +0000 (Thu, 30 Oct 2008)
New Revision: 23214
Modified:
trunk/freenet/src/freenet/node/Announcer.java
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java
Log:
use Array, enchanced for-loop, generic
Modified: trunk/freenet/src/freenet/node/Announcer.java
===================================================================
--- trunk/freenet/src/freenet/node/Announcer.java 2008-10-30 08:34:08 UTC
(rev 23213)
+++ trunk/freenet/src/freenet/node/Announcer.java 2008-10-30 08:34:35 UTC
(rev 23214)
@@ -11,7 +11,9 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.InetAddress;
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Vector;
import freenet.io.comm.PeerParseException;
@@ -118,7 +120,7 @@
boolean announceNow = false;
if(logMINOR)
Logger.minor(this, "Connecting some seednodes...");
- Vector/*<SimpleFieldSet>*/ seeds =
Announcer.readSeednodes(node.nodeDir);
+ List<SimpleFieldSet> seeds =
Announcer.readSeednodes(node.nodeDir);
long now = System.currentTimeMillis();
synchronized(this) {
if(now - timeAddedSeeds < MIN_ADDED_SEEDS_INTERVAL)
return;
@@ -180,13 +182,13 @@
}
// Synchronize to protect announcedToIdentities and prevent running in
parallel.
- private synchronized int connectSomeNodesInner(Vector seeds) {
+ private synchronized int connectSomeNodesInner(List<SimpleFieldSet>
seeds) {
if(logMINOR)
Logger.minor(this, "Connecting some seednodes from
"+seeds.size());
int count = 0;
while(count < CONNECT_AT_ONCE) {
if(seeds.size() == 0) break;
- SimpleFieldSet fs = (SimpleFieldSet)
seeds.remove(node.random.nextInt(seeds.size()));
+ SimpleFieldSet fs =
seeds.remove(node.random.nextInt(seeds.size()));
try {
SeedServerPeerNode seed =
new SeedServerPeerNode(fs, node,
om.crypto, node.peers, false, om.crypto.packetMangler);
@@ -220,9 +222,9 @@
return count;
}
- public static Vector readSeednodes(File nodeDir) {
+ public static List<SimpleFieldSet> readSeednodes(File nodeDir) {
File file = new File(nodeDir, "seednodes.fref");
- Vector<SimpleFieldSet> list = new Vector<SimpleFieldSet>();
+ List<SimpleFieldSet> list = new ArrayList<SimpleFieldSet>();
FileInputStream fis = null;
try {
fis = new FileInputStream(file);
@@ -437,8 +439,8 @@
}
private synchronized void addAnnouncedIPs(InetAddress[] addrs) {
- for(int i=0;i<addrs.length;i++)
- announcedToIPs.add(addrs[i]);
+ for (InetAddress addr : addrs)
+ announcedToIPs.add(addr);
}
/**
@@ -582,9 +584,8 @@
runningAnnouncements =
Announcer.this.runningAnnouncements;
}
- Vector nodes =
node.peers.getSeedServerPeersVector();
- for(int i=0;i<nodes.size();i++) {
- SeedServerPeerNode seed =
(SeedServerPeerNode) nodes.get(i);
+ List<SeedServerPeerNode> nodes =
node.peers.getSeedServerPeersVector();
+ for(SeedServerPeerNode seed : nodes) {
if(seed.isConnected())
connectedSeednodes++;
else
@@ -593,7 +594,7 @@
if(dontKnowAddress) {
sb.append(l10n("dontKnowAddress"));
} else {
- sb.append(l10n("announceDetails",
+ sb.append(l10n("announceDetails",
new String[] {
"addedNodes", "refusedNodes", "recentSentAnnouncements",
"runningAnnouncements", "connectedSeednodes", "disconnectedSeednodes" },
new String[] {
Integer.toString(addedNodes),
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2008-10-30 08:34:08 UTC
(rev 23213)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2008-10-30 08:34:35 UTC
(rev 23214)
@@ -17,6 +17,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import java.util.Vector;
@@ -1673,16 +1674,16 @@
return v;
}
- public Vector getSeedServerPeersVector() {
+ public List<SeedServerPeerNode> getSeedServerPeersVector() {
PeerNode[] peers;
synchronized(this) {
peers = myPeers;
}
// FIXME optimise! Maybe maintain as a separate list?
- Vector v = new Vector(myPeers.length);
- for(int i = 0; i < peers.length; i++) {
- if(peers[i] instanceof SeedServerPeerNode)
- v.add(peers[i]);
+ List<SeedServerPeerNode> v = new
ArrayList<SeedServerPeerNode>(myPeers.length);
+ for(PeerNode peer : peers) {
+ if(peer instanceof SeedServerPeerNode)
+ v.add((SeedServerPeerNode)peer);
}
return v;
}
Modified: trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java
2008-10-30 08:34:08 UTC (rev 23213)
+++ trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java
2008-10-30 08:34:35 UTC (rev 23214)
@@ -3,6 +3,18 @@
* http://www.gnu.org/ for further details of the GPL. */
package freenet.node.simulator;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+
import freenet.crypt.RandomSource;
import freenet.io.comm.NotConnectedException;
import freenet.io.comm.PeerParseException;
@@ -19,21 +31,10 @@
import freenet.support.Executor;
import freenet.support.Logger;
import freenet.support.PooledExecutor;
-import freenet.support.LoggerHook.InvalidThresholdException;
import freenet.support.SimpleFieldSet;
import freenet.support.TimeUtil;
+import freenet.support.LoggerHook.InvalidThresholdException;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.util.EnumMap;
-import java.util.Map;
-import java.util.Vector;
-
/**
* @author Florent Daignière <nextgens at freenetproject.org>
*/
@@ -52,8 +53,8 @@
Executor executor = new PooledExecutor();
node = NodeStarter.createTestNode(5000, 5001, "seednode-pingtest",
true, false, false, Node.DEFAULT_MAX_HTL, 0, random, executor, 1000,
5*1024*1024, true, false, false, false, false, false, false, 0, false, false,
null);
// Connect & ping
- Vector<SeedServerTestPeerNode> seedNodes = new
Vector<SeedServerTestPeerNode>();
- Vector<SimpleFieldSet> seedNodesAsSFS = Announcer.readSeednodes(new
File("/tmp/"));
+ List<SeedServerTestPeerNode> seedNodes = new
ArrayList<SeedServerTestPeerNode>();
+ List<SimpleFieldSet> seedNodesAsSFS = Announcer.readSeednodes(new
File("/tmp/"));
int numberOfNodesInTheFile = 0;
for(SimpleFieldSet sfs : seedNodesAsSFS) {
numberOfNodesInTheFile++;
