Author: nextgens
Date: 2008-09-28 10:42:16 +0000 (Sun, 28 Sep 2008)
New Revision: 22871
Modified:
trunk/freenet/src/freenet/node/PeerNode.java
Log:
get rid of redundant casts
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-09-28 10:40:27 UTC
(rev 22870)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-09-28 10:42:16 UTC
(rev 22871)
@@ -16,9 +16,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.ListIterator;
import java.util.Vector;
import java.util.zip.DataFormatException;
import java.util.zip.Inflater;
@@ -569,7 +566,7 @@
Logger.normal(this, "No IP addresses found for identity
'" + Base64.encode(identity) + "', possibly at location '" +
Double.toString(currentLocation) + ": " + userToString());
detectedPeer = null;
} else {
- detectedPeer = (Peer) nominalPeer.firstElement();
+ detectedPeer = nominalPeer.firstElement();
}
updateShortToString();
@@ -821,7 +818,7 @@
HashSet<Peer> ret = new HashSet<Peer>();
for(int i = 0; i < localHandshakeIPs.length; i++)
ret.add(localHandshakeIPs[i]);
- return (Peer[]) ret.toArray(new Peer[ret.size()]);
+ return ret.toArray(new Peer[ret.size()]);
}
/**
@@ -847,7 +844,7 @@
// Don't synchronize while doing lookups which may take a long
time!
synchronized(this) {
- myNominalPeer = (Peer[]) nominalPeer.toArray(new
Peer[nominalPeer.size()]);
+ myNominalPeer = nominalPeer.toArray(new
Peer[nominalPeer.size()]);
}
Peer[] localHandshakeIPs;
@@ -911,7 +908,7 @@
peers.add(p);
}
- localHandshakeIPs = (Peer[]) peers.toArray(new
Peer[peers.size()]);
+ localHandshakeIPs = peers.toArray(new Peer[peers.size()]);
localHandshakeIPs = updateHandshakeIPs(localHandshakeIPs,
ignoreHostnames);
synchronized(this) {
handshakeIPs = localHandshakeIPs;
@@ -2331,7 +2328,7 @@
nominalPeer = new Vector<Peer>();
nominalPeer.removeAllElements();
- Peer[] oldPeers = (Peer[]) nominalPeer.toArray(new
Peer[nominalPeer.size()]);
+ Peer[] oldPeers = nominalPeer.toArray(new
Peer[nominalPeer.size()]);
boolean refHadPhysicalUDP = false;
@@ -2935,7 +2932,7 @@
messageSpecName = m.getSpec().getName();
// Synchronize to make increments atomic.
synchronized(this) {
- count = (Long)
localNodeSentMessageTypes.get(messageSpecName);
+ count = localNodeSentMessageTypes.get(messageSpecName);
if(count == null)
count = 1L;
else
@@ -2951,7 +2948,7 @@
messageSpecName = m.getSpec().getName();
// Synchronize to make increments atomic.
synchronized(localNodeReceivedMessageTypes) {
- count = (Long)
localNodeReceivedMessageTypes.get(messageSpecName);
+ count =
localNodeReceivedMessageTypes.get(messageSpecName);
if(count == null)
count = 1L;
else
@@ -3799,12 +3796,12 @@
if(validIPs.isEmpty()) {
ret = null;
} else if(validIPs.size() == 1) {
- ret = (Peer) validIPs.get(0);
+ ret = validIPs.get(0);
} else {
synchronized(this) {
if(handshakeIPAlternator >= validIPs.size())
handshakeIPAlternator = 0;
- ret = (Peer)
validIPs.get(handshakeIPAlternator);
+ ret = validIPs.get(handshakeIPAlternator);
handshakeIPAlternator++;
}
}
