Author: j16sdiz
Date: 2008-10-30 08:59:50 +0000 (Thu, 30 Oct 2008)
New Revision: 23223
Modified:
trunk/freenet/src/freenet/node/DarknetPeerNode.java
trunk/freenet/src/freenet/node/SSKInsertSender.java
trunk/freenet/src/freenet/node/SeedServerPeerNode.java
trunk/freenet/src/freenet/node/SemiOrderedShutdownHook.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
Log:
unused field, generic, enchanced for-loop
Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-10-30 08:59:24 UTC
(rev 23222)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-10-30 08:59:50 UTC
(rev 23223)
@@ -121,7 +121,7 @@
/**
*
* Normally this is the address that packets have been received from
from this node.
- * However, if ignoreSourcePort is set, we will search for a similar
address with a different port
+ * However, if ignoreSourcePort is set, we will search for a similar
address with a different port
* number in the node reference.
*/
@Override
@@ -131,7 +131,7 @@
FreenetInetAddress addr = detectedPeer == null ? null :
detectedPeer.getFreenetAddress();
int port = detectedPeer == null ? -1 :
detectedPeer.getPort();
if(nominalPeer == null) return detectedPeer;
- for(Peer p : nominalPeer) {
+ for(Peer p : nominalPeer) {
if(p.getPort() != port &&
p.getFreenetAddress().equals(addr)) {
return p;
}
@@ -201,7 +201,7 @@
return PeerManager.PEER_NODE_STATUS_DISABLED;
}
int status = super.getPeerNodeStatus(now, backedOffUntil);
- if(status == PeerManager.PEER_NODE_STATUS_CONNECTED ||
+ if(status == PeerManager.PEER_NODE_STATUS_CONNECTED ||
status ==
PeerManager.PEER_NODE_STATUS_CLOCK_PROBLEM ||
status ==
PeerManager.PEER_NODE_STATUS_ROUTING_BACKED_OFF ||
status ==
PeerManager.PEER_NODE_STATUS_CONN_ERROR ||
@@ -360,10 +360,10 @@
}
boolean gotError = false;
boolean readResult = false;
- for (int i = 0; i < extraPeerDataFiles.length; i++) {
+ for (File extraPeerDataFile : extraPeerDataFiles) {
Integer fileNumber;
try {
- fileNumber = new
Integer(extraPeerDataFiles[i].getName());
+ fileNumber = new
Integer(extraPeerDataFile.getName());
} catch (NumberFormatException e) {
gotError = true;
continue;
@@ -371,7 +371,7 @@
synchronized(extraPeerDataFileNumbers) {
extraPeerDataFileNumbers.add(fileNumber);
}
- readResult =
readExtraPeerDataFile(extraPeerDataFiles[i], fileNumber.intValue());
+ readResult = readExtraPeerDataFile(extraPeerDataFile,
fileNumber.intValue());
if(!readResult) {
gotError = true;
}
@@ -648,8 +648,8 @@
synchronized(extraPeerDataFileNumbers) {
localFileNumbers = extraPeerDataFileNumbers.toArray(new
Integer[extraPeerDataFileNumbers.size()]);
}
- for (int i = 0; i < localFileNumbers.length; i++) {
- deleteExtraPeerDataFile(localFileNumbers[i].intValue());
+ for (Integer localFileNumber : localFileNumbers) {
+ deleteExtraPeerDataFile(localFileNumber.intValue());
}
extraPeerDataPeerDir.delete();
}
@@ -746,8 +746,8 @@
localFileNumbers =
queuedToSendN2NMExtraPeerDataFileNumbers.toArray(new
Integer[queuedToSendN2NMExtraPeerDataFileNumbers.size()]);
}
Arrays.sort(localFileNumbers);
- for (int i = 0; i < localFileNumbers.length; i++) {
- rereadExtraPeerDataFile(localFileNumbers[i].intValue());
+ for (Integer localFileNumber : localFileNumbers) {
+ rereadExtraPeerDataFile(localFileNumber.intValue());
}
}
@@ -1198,10 +1198,10 @@
form.addChild("input", new String[] {
"type", "name", "value" },
new String[] {
"hidden", "id", Long.toString(uid) });
- form.addChild("input", new String[] {
"type", "name", "value" },
+ form.addChild("input", new String[] {
"type", "name", "value" },
new String[] {
"submit", "acceptTransfer", l10n("acceptTransferButton") });
- form.addChild("input", new String[] {
"type", "name", "value" },
+ form.addChild("input", new String[] {
"type", "name", "value" },
new String[] {
"submit", "rejectTransfer", l10n("rejectTransferButton") });
return div;
Modified: trunk/freenet/src/freenet/node/SSKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertSender.java 2008-10-30 08:59:24 UTC
(rev 23222)
+++ trunk/freenet/src/freenet/node/SSKInsertSender.java 2008-10-30 08:59:50 UTC
(rev 23223)
@@ -120,7 +120,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/SeedServerPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/SeedServerPeerNode.java 2008-10-30
08:59:24 UTC (rev 23222)
+++ trunk/freenet/src/freenet/node/SeedServerPeerNode.java 2008-10-30
08:59:50 UTC (rev 23223)
@@ -4,7 +4,7 @@
package freenet.node;
import java.net.InetAddress;
-import java.util.Vector;
+import java.util.ArrayList;
import freenet.io.comm.Peer;
import freenet.io.comm.PeerParseException;
@@ -91,13 +91,13 @@
public InetAddress[] getInetAddresses() {
Peer[] peers = getHandshakeIPs();
- Vector v = new Vector();
+ ArrayList<InetAddress> v = new ArrayList<InetAddress>();
for(int i=0;i<peers.length;i++) {
InetAddress ia =
peers[i].getFreenetAddress().dropHostname().getAddress();
if(v.contains(ia)) continue;
v.add(ia);
}
- return (InetAddress[]) v.toArray(new InetAddress[v.size()]);
+ return v.toArray(new InetAddress[v.size()]);
}
@Override
Modified: trunk/freenet/src/freenet/node/SemiOrderedShutdownHook.java
===================================================================
--- trunk/freenet/src/freenet/node/SemiOrderedShutdownHook.java 2008-10-30
08:59:24 UTC (rev 23222)
+++ trunk/freenet/src/freenet/node/SemiOrderedShutdownHook.java 2008-10-30
08:59:50 UTC (rev 23223)
@@ -5,12 +5,12 @@
public class SemiOrderedShutdownHook extends Thread {
private static final int TIMEOUT = 100*1000;
- private final ArrayList earlyJobs;
- private final ArrayList lateJobs;
+ private final ArrayList<Thread> earlyJobs;
+ private final ArrayList<Thread> lateJobs;
public SemiOrderedShutdownHook() {
- earlyJobs = new ArrayList();
- lateJobs = new ArrayList();
+ earlyJobs = new ArrayList<Thread>();
+ lateJobs = new ArrayList<Thread>();
}
public synchronized void addEarlyJob(Thread r) {
@@ -25,12 +25,10 @@
public void run() {
// First run early jobs, all at once, and wait for them to all
complete.
- for(int i=0;i<earlyJobs.size();i++) {
- Thread r = (Thread) earlyJobs.get(i);
+ for(Thread r : earlyJobs) {
r.start();
}
- for(int i=0;i<earlyJobs.size();i++) {
- Thread r = (Thread) earlyJobs.get(i);
+ for(Thread r : earlyJobs) {
try {
r.join(TIMEOUT);
} catch (InterruptedException e) {
@@ -40,12 +38,10 @@
}
// Then run late jobs, all at once, and wait for them to all
complete (JVM will exit when we return).
- for(int i=0;i<lateJobs.size();i++) {
- Thread r = (Thread) lateJobs.get(i);
+ for(Thread r : lateJobs) {
r.start();
}
- for(int i=0;i<lateJobs.size();i++) {
- Thread r = (Thread) lateJobs.get(i);
+ for(Thread r : lateJobs) {
try {
r.join(TIMEOUT);
} catch (InterruptedException e) {
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2008-10-30
08:59:24 UTC (rev 23222)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2008-10-30
08:59:50 UTC (rev 23223)
@@ -20,8 +20,8 @@
import java.net.URL;
import java.net.URLConnection;
import java.text.NumberFormat;
+import java.util.Arrays;
import java.util.HashMap;
-import java.util.Hashtable;
import freenet.client.ClientMetadata;
import freenet.client.DefaultMIMETypes;
@@ -50,7 +50,6 @@
import freenet.support.io.ArrayBucketFactory;
import freenet.support.io.BucketTools;
import freenet.support.io.FileBucket;
-import java.util.Arrays;
/**
* @author amphibian
@@ -65,7 +64,6 @@
final Node n;
final NodeClientCore core;
final HighLevelSimpleClient client;
- final Hashtable streams;
final File downloadsDir;
final InputStream in;
final OutputStream out;
@@ -76,7 +74,6 @@
this.core = server.n.clientCore;
this.r = server.r;
client = core.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS,
true);
- this.streams = new Hashtable();
this.downloadsDir = server.downloadsDir;
this.in = in;
this.out = out;
@@ -88,7 +85,6 @@
this.r = n.random;
this.core = n.clientCore;
this.client = c;
- this.streams = new Hashtable();
this.downloadsDir = downloadDir;
this.in = in;
this.out = out;
@@ -405,9 +401,9 @@
return true;
} else if(uline.startsWith("MEMSTAT")) {
Runtime rt = Runtime.getRuntime();
- float freeMemory = (float) rt.freeMemory();
- float totalMemory = (float) rt.totalMemory();
- float maxMemory = (float) rt.maxMemory();
+ float freeMemory = rt.freeMemory();
+ float totalMemory = rt.totalMemory();
+ float maxMemory = rt.maxMemory();
long usedJavaMem = (long)(totalMemory - freeMemory);
long allocatedJavaMem = (long)totalMemory;
@@ -520,7 +516,7 @@
}
}
- HashMap bucketsByName =
+ HashMap<String, Object> bucketsByName =
makeBucketsByName(line);
if(defaultFile == null) {
@@ -991,7 +987,7 @@
* Create a map of String -> Bucket for every file in a directory
* and its subdirs.
*/
- private HashMap makeBucketsByName(String directory) {
+ private HashMap<String, Object> makeBucketsByName(String directory) {
if (!directory.endsWith("/"))
directory = directory + '/';
@@ -999,7 +995,7 @@
System.out.println("Listing dir: "+thisdir);
- HashMap ret = new HashMap();
+ HashMap<String, Object> ret = new HashMap<String, Object>();
File filelist[] = thisdir.listFiles();
if(filelist == null)
@@ -1015,7 +1011,7 @@
ret.put(f.getName(), bucket);
} else if(filelist[i].isDirectory()) {
- HashMap subdir = makeBucketsByName(directory +
filelist[i].getName());
+ HashMap<String, Object> subdir =
makeBucketsByName(directory + filelist[i].getName());
ret.put(filelist[i].getName(), subdir);
}
}
Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2008-10-30 08:59:24 UTC (rev 23222)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2008-10-30 08:59:50 UTC (rev 23223)
@@ -10,7 +10,6 @@
import java.net.Socket;
import java.net.SocketException;
import java.net.SocketTimeoutException;
-import java.util.Hashtable;
import freenet.client.HighLevelSimpleClient;
import freenet.config.Config;
@@ -30,8 +29,6 @@
final RandomSource r;
final Node n;
final NodeClientCore core;
-// final HighLevelSimpleClient client;
- final Hashtable streams;
final File downloadsDir;
int port;
String bindTo;
@@ -44,7 +41,6 @@
this.n = node;
this.core = n.clientCore;
this.r = n.random;
- streams = new Hashtable();
this.downloadsDir = core.downloadDir;
this.port=port;
this.bindTo=bindTo;
