Author: j16sdiz
Date: 2008-10-30 08:59:24 +0000 (Thu, 30 Oct 2008)
New Revision: 23222
Modified:
trunk/freenet/src/freenet/node/RequestSender.java
trunk/freenet/src/freenet/node/RequestStarter.java
trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
Log:
generic, enchanced for-loop
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2008-10-30 08:37:30 UTC
(rev 23221)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2008-10-30 08:59:24 UTC
(rev 23222)
@@ -5,7 +5,6 @@
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import freenet.crypt.CryptFormatException;
import freenet.crypt.DSAPublicKey;
@@ -78,7 +77,7 @@
/** If true, only try to fetch the key from nodes which have offered it */
private boolean tryOffersOnly;
- private ArrayList listeners=new ArrayList();
+ private ArrayList<Listener> listeners=new ArrayList<Listener>();
// Terminal status
// Always set finished AFTER setting the reason flag
@@ -446,7 +445,7 @@
int routeAttempts=0;
int rejectOverloads=0;
- HashSet nodesRoutedTo = new HashSet();
+ HashSet<PeerNode> nodesRoutedTo = new HashSet<PeerNode>();
PeerNode next = null;
while(true) {
/*
@@ -1317,9 +1316,7 @@
synchronized (listeners) {
if(sentReceivedRejectOverload) return;
sentReceivedRejectOverload = true;
- Iterator i=listeners.iterator();
- while (i.hasNext()) {
- Listener l=(Listener)i.next();
+ for (Listener l : listeners) {
try {
l.onReceivedRejectOverload();
} catch (Throwable t) {
@@ -1334,9 +1331,7 @@
private void fireCHKTransferBegins() {
synchronized (listeners) {
sentCHKTransferBegins = true;
- Iterator i=listeners.iterator();
- while (i.hasNext()) {
- Listener l=(Listener)i.next();
+ for (Listener l : listeners) {
try {
l.onCHKTransferBegins();
} catch (Throwable t) {
@@ -1351,9 +1346,7 @@
private void fireRequestSenderFinished(int status) {
synchronized (listeners) {
sentRequestSenderFinished = true;
- Iterator i=listeners.iterator();
- while (i.hasNext()) {
- Listener l=(Listener)i.next();
+ for (Listener l : listeners) {
try {
l.onRequestSenderFinished(status);
} catch (Throwable t) {
Modified: trunk/freenet/src/freenet/node/RequestStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestStarter.java 2008-10-30 08:37:30 UTC
(rev 23221)
+++ trunk/freenet/src/freenet/node/RequestStarter.java 2008-10-30 08:59:24 UTC
(rev 23222)
@@ -73,7 +73,7 @@
this.averageInputBytesPerRequest = averageInputBytesPerRequest;
this.isInsert = isInsert;
this.isSSK = isSSK;
- if(!isInsert) keysFetching = new HashSet();
+ if(!isInsert) keysFetching = new HashSet<Key>();
}
void setScheduler(RequestScheduler sched) {
@@ -181,7 +181,7 @@
* we'd move this to node but only track keys we are fetching at max
HTL.
* LOCKING: Always lock this LAST.
*/
- private HashSet keysFetching;
+ private HashSet<Key> keysFetching;
private boolean startRequest(SendableRequest req, boolean logMINOR) {
// Create a thread to handle starting the request, and the
resulting feedback
Modified: trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
2008-10-30 08:37:30 UTC (rev 23221)
+++ trunk/freenet/src/freenet/node/ResettingHTLProbeRequestSender.java
2008-10-30 08:59:24 UTC (rev 23222)
@@ -5,7 +5,6 @@
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import freenet.io.comm.ByteCounter;
import freenet.io.comm.DMT;
@@ -50,7 +49,7 @@
final PeerNode source;
private boolean hasForwarded;
- private ArrayList listeners=new ArrayList();
+ private ArrayList<Listener> listeners=new ArrayList<Listener>();
private static boolean logMINOR;
@@ -100,7 +99,7 @@
private void realRun() {
int routeAttempts=0;
int rejectOverloads=0;
- HashSet nodesRoutedTo = new HashSet();
+ HashSet<PeerNode> nodesRoutedTo = new HashSet<PeerNode>();
while(true) {
if(logMINOR) Logger.minor(this, "htl="+htl);
if(htl == 0) {
@@ -358,9 +357,7 @@
uniqueCounter = (short) (uniqueCounter + this.uniqueCounter);
linearCounter = (short) (linearCounter + this.linearCounter);
synchronized (listeners) {
- Iterator i=listeners.iterator();
- while (i.hasNext()) {
- Listener l=(Listener)i.next();
+ for (Listener l : listeners) {
try {
l.onTrace(uid, nearest, best, htl,
counter, uniqueCounter, location, myUID,
peerLocs, peerUIDs,
(short)0, linearCounter, reason, prevUID);
@@ -477,9 +474,7 @@
private void fireReceivedRejectOverload(double nearest, double best,
short counter, short uniqueCounter, short linearCounter, String reason) {
synchronized (listeners) {
- Iterator i=listeners.iterator();
- while (i.hasNext()) {
- Listener l=(Listener)i.next();
+ for (Listener l : listeners) {
try {
l.onReceivedRejectOverload(nearest,
best, counter, uniqueCounter, linearCounter, reason);
} catch (Throwable t) {
@@ -491,9 +486,7 @@
private void fireCompletion() {
synchronized (listeners) {
- Iterator i=listeners.iterator();
- while (i.hasNext()) {
- Listener l=(Listener)i.next();
+ for (Listener l : listeners) {
try {
l.onCompletion(nearestLoc, best,
counter, uniqueCounter, linearCounter);
} catch (Throwable t) {
@@ -505,9 +498,7 @@
private void fireRNF() {
synchronized (listeners) {
- Iterator i=listeners.iterator();
- while (i.hasNext()) {
- Listener l=(Listener)i.next();
+ for (Listener l : listeners) {
try {
l.onRNF(htl, nearestLoc, best, counter,
uniqueCounter, linearCounter);
} catch (Throwable t) {
@@ -519,9 +510,7 @@
private void fireTimeout(String reason) {
synchronized (listeners) {
- Iterator i=listeners.iterator();
- while (i.hasNext()) {
- Listener l=(Listener)i.next();
+ for (Listener l : listeners) {
try {
l.onTimeout(nearestLoc, best, counter,
uniqueCounter, linearCounter, reason);
} catch (Throwable t) {
@@ -533,9 +522,9 @@
private void updateBest() {
PeerNode[] nodes = node.peers.myPeers;
- for(int i=0;i<nodes.length;i++) {
- if(!nodes[i].isConnected()) continue;
- double loc = nodes[i].getLocation();
+ for(PeerNode node : nodes) {
+ if(!node.isConnected()) continue;
+ double loc = node.getLocation();
if(loc < target)
continue;
if(loc > target && loc < best)
