Author: toad
Date: 2008-09-24 16:46:22 +0000 (Wed, 24 Sep 2008)
New Revision: 22810
Modified:
trunk/freenet/src/freenet/node/OpennetManager.java
Log:
More cleanups (ArrayList, generics, change return type to be more specific in
one case).
Modified: trunk/freenet/src/freenet/node/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java 2008-09-24 16:41:47 UTC
(rev 22809)
+++ trunk/freenet/src/freenet/node/OpennetManager.java 2008-09-24 16:46:22 UTC
(rev 22810)
@@ -11,9 +11,9 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
-import java.util.Vector;
import freenet.io.comm.ByteCounter;
import freenet.io.comm.DMT;
@@ -128,11 +128,8 @@
oldPeers = new LRUQueue();
node.peers.tryReadPeers(new File(node.nodeDir,
"openpeers-"+crypto.portNumber).toString(), crypto, this, true, false);
OpennetPeerNode[] nodes = node.peers.getOpennetPeers();
- Arrays.sort(nodes, new Comparator() {
- public int compare(Object arg0, Object arg1) {
- OpennetPeerNode pn1 = (OpennetPeerNode) arg0;
- OpennetPeerNode pn2 = (OpennetPeerNode) arg1;
-
+ Arrays.sort(nodes, new Comparator<OpennetPeerNode>() {
+ public int compare(OpennetPeerNode pn1, OpennetPeerNode
pn2) {
long lastSuccess1 = pn1.timeLastSuccess();
long lastSuccess2 = pn2.timeLastSuccess();
@@ -310,7 +307,7 @@
return true;
}
boolean canAdd = true;
- Vector dropList = new Vector();
+ ArrayList<OpennetPeerNode> dropList = new
ArrayList<OpennetPeerNode>();
synchronized(this) {
int maxPeers = getNumberOfConnectedPeersToAim();
// If we have dropped a disconnected peer, then the
inter-peer offer cooldown doesn't apply: we can accept immediately.
@@ -320,7 +317,7 @@
if(toDrop != null)
hasDisconnected = !toDrop.isConnected();
} else while(peersLRU.size() > maxPeers - (nodeToAddNow
== null ? 0 : 1)) {
- PeerNode toDrop;
+ OpennetPeerNode toDrop;
// can drop peers which are over the limit
toDrop = peerToDrop(noDisconnect ||
nodeToAddNow == null);
if(toDrop == null) {
@@ -370,8 +367,7 @@
// Just because it's in the global peers list doesn't
mean its in the LRU, it may be an old-opennet-peers reconnection.
// In which case we add it to the global peers list
*before* adding it here.
}
- for(int i=0;i<dropList.size();i++) {
- OpennetPeerNode pn = (OpennetPeerNode) dropList.get(i);
+ for(OpennetPeerNode pn : dropList) {
if(logMINOR) Logger.minor(this, "Dropping LRU opennet
peer: "+pn);
node.peers.disconnect(pn, true, true);
}
@@ -392,7 +388,7 @@
}
}
- synchronized PeerNode peerToDrop(boolean noDisconnect) {
+ synchronized OpennetPeerNode peerToDrop(boolean noDisconnect) {
if(peersLRU.size() < getNumberOfConnectedPeersToAim()) {
// Don't drop any peers
return null;
