Author: toad
Date: 2008-09-24 16:58:17 +0000 (Wed, 24 Sep 2008)
New Revision: 22812
Modified:
trunk/freenet/src/freenet/node/AnnounceSender.java
trunk/freenet/src/freenet/node/CHKInsertSender.java
trunk/freenet/src/freenet/node/DarknetPeerNode.java
trunk/freenet/src/freenet/node/FailureTable.java
trunk/freenet/src/freenet/node/FailureTableEntry.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Squash a bunch of generics warnings.
Modified: trunk/freenet/src/freenet/node/AnnounceSender.java
===================================================================
--- trunk/freenet/src/freenet/node/AnnounceSender.java 2008-09-24 16:48:39 UTC
(rev 22811)
+++ trunk/freenet/src/freenet/node/AnnounceSender.java 2008-09-24 16:58:17 UTC
(rev 22812)
@@ -92,7 +92,7 @@
// Now route it.
- HashSet nodesRoutedTo = new HashSet();
+ HashSet<PeerNode> nodesRoutedTo = new HashSet<PeerNode>();
PeerNode next = null;
while(true) {
if(logMINOR) Logger.minor(this, "htl="+htl);
Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2008-09-24 16:48:39 UTC
(rev 22811)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2008-09-24 16:58:17 UTC
(rev 22812)
@@ -179,7 +179,7 @@
this.prb = prb;
this.fromStore = fromStore;
this.startTime = System.currentTimeMillis();
- this.backgroundTransfers = new Vector();
+ this.backgroundTransfers = new Vector<BackgroundTransfer>();
logMINOR = Logger.shouldLog(Logger.MINOR, this);
}
@@ -210,7 +210,7 @@
/** List of nodes we are waiting for either a transfer completion
* notice or a transfer completion from. Also used as a sync object for
waiting for transfer completion. */
- private Vector backgroundTransfers;
+ private Vector<BackgroundTransfer> backgroundTransfers;
/** Have all transfers completed and all nodes reported completion status?
*/
private boolean allTransfersCompleted;
@@ -268,7 +268,7 @@
}
private void realRun() {
- HashSet nodesRoutedTo = new HashSet();
+ HashSet<PeerNode> nodesRoutedTo = new HashSet<PeerNode>();
PeerNode next = null;
while(true) {
Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-09-24 16:48:39 UTC
(rev 22811)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-09-24 16:58:17 UTC
(rev 22812)
@@ -68,7 +68,7 @@
private boolean allowLocalAddresses;
/** Extra peer data file numbers */
- private LinkedHashSet extraPeerDataFileNumbers;
+ private LinkedHashSet<Integer> extraPeerDataFileNumbers;
/** Private comment on the peer for /friends/ page */
private String privateDarknetComment;
@@ -77,7 +77,7 @@
private int privateDarknetCommentFileNumber;
/** Queued-to-send N2NM extra peer data file numbers */
- private LinkedHashSet queuedToSendN2NMExtraPeerDataFileNumbers;
+ private LinkedHashSet<Integer> queuedToSendN2NMExtraPeerDataFileNumbers;
private static boolean logMINOR;
@@ -111,10 +111,10 @@
privateDarknetCommentFileNumber = -1;
// Setup the extraPeerDataFileNumbers
- extraPeerDataFileNumbers = new LinkedHashSet();
+ extraPeerDataFileNumbers = new LinkedHashSet<Integer>();
// Setup the queuedToSendN2NMExtraPeerDataFileNumbers
- queuedToSendN2NMExtraPeerDataFileNumbers = new LinkedHashSet();
+ queuedToSendN2NMExtraPeerDataFileNumbers = new
LinkedHashSet<Integer>();
}
Modified: trunk/freenet/src/freenet/node/FailureTable.java
===================================================================
--- trunk/freenet/src/freenet/node/FailureTable.java 2008-09-24 16:48:39 UTC
(rev 22811)
+++ trunk/freenet/src/freenet/node/FailureTable.java 2008-09-24 16:58:17 UTC
(rev 22812)
@@ -43,9 +43,9 @@
public class FailureTable implements OOMHook {
/** FailureTableEntry's by key. Note that we push an entry only when
sentTime changes. */
- private final LRUHashtable entriesByKey;
+ private final LRUHashtable<Key,FailureTableEntry> entriesByKey;
/** BlockOfferList by key */
- private final LRUHashtable blockOfferListByKey;
+ private final LRUHashtable<Key,BlockOfferList> blockOfferListByKey;
private final Node node;
/** Maximum number of keys to track */
@@ -67,8 +67,8 @@
static boolean logDEBUG;
FailureTable(Node node) {
- entriesByKey = new LRUHashtable();
- blockOfferListByKey = new LRUHashtable();
+ entriesByKey = new LRUHashtable<Key,FailureTableEntry>();
+ blockOfferListByKey = new LRUHashtable<Key,BlockOfferList>();
this.node = node;
offerAuthenticatorKey = new byte[32];
node.random.nextBytes(offerAuthenticatorKey);
@@ -505,8 +505,8 @@
OfferList(BlockOfferList offerList) {
this.offerList = offerList;
- recentOffers = new Vector();
- expiredOffers = new Vector();
+ recentOffers = new Vector<BlockOffer>();
+ expiredOffers = new Vector<BlockOffer>();
long now = System.currentTimeMillis();
BlockOffer[] offers = offerList.offers;
for(int i=0;i<offers.length;i++) {
@@ -521,8 +521,8 @@
private final BlockOfferList offerList;
- private final Vector recentOffers;
- private final Vector expiredOffers;
+ private final Vector<BlockOffer> recentOffers;
+ private final Vector<BlockOffer> expiredOffers;
/** The last offer we returned */
private BlockOffer lastOffer;
Modified: trunk/freenet/src/freenet/node/FailureTableEntry.java
===================================================================
--- trunk/freenet/src/freenet/node/FailureTableEntry.java 2008-09-24
16:48:39 UTC (rev 22811)
+++ trunk/freenet/src/freenet/node/FailureTableEntry.java 2008-09-24
16:58:17 UTC (rev 22812)
@@ -297,7 +297,7 @@
/** Offer this key to all the nodes that have requested it, and all the
nodes it has been requested from.
* Called after a) the data has been stored, and b) this entry has been
removed from the FT */
public synchronized void offer() {
- HashSet set = new HashSet();
+ HashSet<PeerNode> set = new HashSet<PeerNode>();
if(logMINOR) Logger.minor(this, "Sending offers to nodes which
requested the key from us:");
for(int i=0;i<requestorNodes.length;i++) {
WeakReference ref = requestorNodes[i];
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-09-24 16:48:39 UTC
(rev 22811)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-09-24 16:58:17 UTC
(rev 22812)
@@ -119,7 +119,7 @@
/** My OutgoingPacketMangler i.e. the object which encrypts packets
sent to this node */
private final OutgoingPacketMangler outgoingMangler;
/** Advertised addresses */
- protected Vector nominalPeer;
+ protected Vector<Peer> nominalPeer;
/** The PeerNode's report of our IP address */
private Peer remoteDetectedPeer;
/** Is this a testnet node? */
@@ -284,9 +284,9 @@
}
/** Holds a String-Long pair that shows which message types (as name)
have been send to this peer. */
- private final Hashtable localNodeSentMessageTypes = new Hashtable();
+ private final Hashtable<String, Long> localNodeSentMessageTypes = new
Hashtable<String, Long>();
/** Holds a String-Long pair that shows which message types (as name)
have been received by this peer. */
- private final Hashtable localNodeReceivedMessageTypes = new Hashtable();
+ private final Hashtable<String, Long> localNodeReceivedMessageTypes =
new Hashtable<String, Long>();
/** Hold collected IP addresses for handshake attempts, populated by
DNSRequestor */
private Peer[] handshakeIPs;
@@ -319,7 +319,7 @@
private static final long CLEAR_MESSAGE_QUEUE_AFTER = 60 * 60 * 1000L;
/** A WeakReference to this object. Can be taken whenever a node object
needs to refer to this object for a
* long time, but without preventing it from being GC'ed. */
- final WeakReference myRef;
+ final WeakReference<PeerNode> myRef;
/** The node is being disconnected, but it may take a while. */
private boolean disconnecting;
/** When did we last disconnect? Not Disconnected because a discrete
event */
@@ -349,7 +349,7 @@
* The initiator has to ensure that nonces send back by the
* responder in message2 match what was chosen in message 1
*/
- protected final HashMap jfkNoncesSent = new HashMap();
+ protected final HashMap<Peer,byte[]> jfkNoncesSent = new
HashMap<Peer,byte[]>();
private static boolean logMINOR;
/**
@@ -381,7 +381,7 @@
boolean noSig = false;
if(fromLocal || fromAnonymousInitiator) noSig = true;
logMINOR = Logger.shouldLog(Logger.MINOR, PeerNode.class);
- myRef = new WeakReference(this);
+ myRef = new WeakReference<PeerNode>(this);
this.outgoingMangler = mangler;
this.node = node2;
this.crypto = crypto;
@@ -541,7 +541,7 @@
throw new Error(e1);
}
- nominalPeer = new Vector();
+ nominalPeer = new Vector<Peer>();
try {
String physical[] = fs.getAll("physical.udp");
if(physical == null) {
@@ -817,7 +817,7 @@
}
}
// De-dupe
- HashSet ret = new HashSet();
+ 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()]);
@@ -873,9 +873,9 @@
FreenetInetAddress localhost = node.fLocalhostAddress;
Peer[] nodePeers = outgoingMangler.getPrimaryIPAddress();
- Vector peers = null;
+ Vector<Peer> peers = null;
synchronized(this) {
- peers = new Vector(nominalPeer);
+ peers = new Vector<Peer>(nominalPeer);
}
boolean addedLocalhost = false;
@@ -1659,7 +1659,7 @@
if(!isConnected)
return;
// Prevent leak by clearing, *but keep the
current handshake*
- Object o = jfkNoncesSent.get(newPeer);
+ byte[] o = jfkNoncesSent.get(newPeer);
jfkNoncesSent.clear();
jfkNoncesSent.put(newPeer, o);
} else
@@ -2324,7 +2324,7 @@
Vector oldNominalPeer = nominalPeer;
if(nominalPeer == null)
- nominalPeer = new Vector();
+ nominalPeer = new Vector<Peer>();
nominalPeer.removeAllElements();
Peer[] oldPeers = (Peer[]) nominalPeer.toArray(new
Peer[nominalPeer.size()]);
@@ -2956,14 +2956,14 @@
}
}
- public synchronized Hashtable getLocalNodeSentMessagesToStatistic() {
- return new Hashtable(localNodeSentMessageTypes);
+ public synchronized Hashtable<String,Long>
getLocalNodeSentMessagesToStatistic() {
+ return new Hashtable<String,Long>(localNodeSentMessageTypes);
}
- public Hashtable getLocalNodeReceivedMessagesFromStatistic() {
+ public Hashtable<String,Long>
getLocalNodeReceivedMessagesFromStatistic() {
// Must be synchronized *during the copy*
synchronized (localNodeReceivedMessageTypes) {
- return new Hashtable(localNodeReceivedMessageTypes);
+ return new
Hashtable<String,Long>(localNodeReceivedMessageTypes);
}
}
@@ -3773,7 +3773,7 @@
return null;
}
long loopTime1 = System.currentTimeMillis();
- Vector validIPs = new Vector();
+ Vector<Peer> validIPs = new Vector<Peer>();
for(int i=0;i<handshakeIPs.length;i++){
Peer peer = handshakeIPs[i];
FreenetInetAddress addr = peer.getFreenetAddress();
