Author: nextgens
Date: 2008-08-14 21:48:20 +0000 (Thu, 14 Aug 2008)
New Revision: 21877
Modified:
trunk/freenet/src/freenet/clients/http/PageMaker.java
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/FailureTableEntry.java
trunk/freenet/src/freenet/node/GlobalProbe.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
trunk/freenet/src/freenet/support/io/BaseFileBucket.java
Log:
Second part of the patch ^-^
Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java 2008-08-14
21:33:35 UTC (rev 21876)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java 2008-08-14
21:48:20 UTC (rev 21877)
@@ -202,11 +202,11 @@
*
* @return An {@link ArrayList} containing the names of all available
themes
*/
- public List getThemes() {
+ public List<String> getThemes() {
if (jarThemesCache != null) {
return jarThemesCache;
}
- List themes = new ArrayList();
+ List<String> themes = new ArrayList<String>();
try {
URL url = getClass().getResource("staticfiles/themes/");
URLConnection urlConnection = url.openConnection();
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-08-14 21:33:35 UTC (rev 21876)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2008-08-14 21:48:20 UTC (rev 21877)
@@ -38,7 +38,6 @@
import freenet.support.HTMLNode;
import freenet.support.Logger;
import freenet.support.OOMHandler;
-import freenet.support.StringArray;
import freenet.support.api.BooleanCallback;
import freenet.support.api.BucketFactory;
import freenet.support.api.IntCallback;
@@ -181,7 +180,7 @@
}
public String[] getPossibleValues() {
- return
StringArray.toArray(pageMaker.getThemes().toArray());
+ return pageMaker.getThemes().toArray(new String[0]);
}
}
Modified: trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java
2008-08-14 21:33:35 UTC (rev 21876)
+++ trunk/freenet/src/freenet/clients/http/bookmark/BookmarkCategory.java
2008-08-14 21:48:20 UTC (rev 21877)
@@ -4,8 +4,6 @@
import freenet.support.SimpleFieldSet;
import java.util.Vector;
-import freenet.support.StringArray;
-
public class BookmarkCategory extends Bookmark {
public static final String NAME = "BookmarkCategory";
@@ -112,13 +110,13 @@
}
public String[] toStrings() {
- return StringArray.toArray(toStrings("").toArray());
+ return toStrings("").toArray(new String[0]);
}
// Iternal use only
- private Vector toStrings(String prefix) {
- Vector strings = new Vector();
+ private Vector<String> toStrings(String prefix) {
+ Vector<String> strings = new Vector<String>();
BookmarkItems items = getItems();
BookmarkCategories subCategories = getSubCategories();
prefix += this.name + "/";
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-08-14
21:33:35 UTC (rev 21876)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2008-08-14
21:48:20 UTC (rev 21877)
@@ -43,7 +43,6 @@
import freenet.support.HexUtil;
import freenet.support.Logger;
import freenet.support.SimpleFieldSet;
-import freenet.support.StringArray;
import freenet.support.TimeUtil;
import freenet.support.WouldBlockException;
import freenet.support.io.NativeThread;
@@ -2076,7 +2075,7 @@
alreadyReported[x] = mi.alreadyReportedBytes;
x++;
if(mi.cb != null) callbacksCount +=
mi.cb.length;
- if(logMINOR) Logger.minor(this, "Sending:
"+mi+" length "+data.length+" cb "+ StringArray.toString(mi.cb)+" reported
"+mi.alreadyReportedBytes);
+ if(logMINOR) Logger.minor(this, "Sending:
"+mi+" length "+data.length+" cb "+ Arrays.toString(mi.cb)+" reported
"+mi.alreadyReportedBytes);
length += (data.length + 2);
}
}
@@ -2293,7 +2292,7 @@
if(logMINOR) {
String log =
"processOutgoingPreformatted("+Fields.hashCode(buf)+", "+offset+ ',' +length+
',' +tracker+ ',' +packetNumber+ ',';
if(callbacks == null) log += "null";
- else log +=
""+callbacks.length+StringArray.toString(callbacks); // FIXME too verbose?
+ else log +=
""+callbacks.length+Arrays.toString(callbacks); // FIXME too verbose?
Logger.minor(this, log);
}
if((tracker == null) || (!tracker.pn.isConnected())) {
Modified: trunk/freenet/src/freenet/node/FailureTableEntry.java
===================================================================
--- trunk/freenet/src/freenet/node/FailureTableEntry.java 2008-08-14
21:33:35 UTC (rev 21876)
+++ trunk/freenet/src/freenet/node/FailureTableEntry.java 2008-08-14
21:48:20 UTC (rev 21877)
@@ -8,7 +8,7 @@
import freenet.keys.Key;
import freenet.support.Logger;
-import freenet.support.StringArray;
+import java.util.Arrays;
class FailureTableEntry implements TimedOutNodesList {
@@ -75,7 +75,7 @@
*/
public void onFailure(short htl2, PeerNode[] requestors, PeerNode[]
requestedFrom, int timeout, long now) {
if(logMINOR)
- Logger.minor(this,
"onFailure("+htl2+",requestors="+StringArray.toString(requestors)+",requestedFrom="+StringArray.toString(requestedFrom)+",timeout="+timeout);
+ Logger.minor(this,
"onFailure("+htl2+",requestors="+Arrays.toString(requestors)+",requestedFrom="+Arrays.toString(requestedFrom)+",timeout="+timeout);
synchronized(this) {
if(requestors != null) {
for(int i=0;i<requestors.length;i++)
Modified: trunk/freenet/src/freenet/node/GlobalProbe.java
===================================================================
--- trunk/freenet/src/freenet/node/GlobalProbe.java 2008-08-14 21:33:35 UTC
(rev 21876)
+++ trunk/freenet/src/freenet/node/GlobalProbe.java 2008-08-14 21:48:20 UTC
(rev 21877)
@@ -4,7 +4,7 @@
package freenet.node;
import freenet.support.Logger;
-import freenet.support.StringArray;
+import java.util.Arrays;
public class GlobalProbe implements Runnable {
@@ -33,7 +33,7 @@
}
public void onTrace(long uid, double target, double
nearest, double best, short htl, short counter, double location, long nodeUID,
double[] peerLocs, long[] peerUIDs, double[] locsNotVisited, short forkCount,
short linearCount, String reason, long prevUID) {
- String msg = "Probe trace: UID="+uid+"
target="+target+" nearest="+nearest+" best="+best+" htl="+htl+"
counter="+counter+" location="+location+" node UID="+nodeUID+" prev
UID="+prevUID+" peers="+NodeDispatcher.peersUIDsToString(peerUIDs, peerLocs)+"
locs not visited: "+StringArray.toString(locsNotVisited)+" fork count:
"+forkCount+" linear count: "+linearCount+" from "+reason;
+ String msg = "Probe trace: UID="+uid+"
target="+target+" nearest="+nearest+" best="+best+" htl="+htl+"
counter="+counter+" location="+location+" node UID="+nodeUID+" prev
UID="+prevUID+" peers="+NodeDispatcher.peersUIDsToString(peerUIDs, peerLocs)+"
locs not visited: "+Arrays.toString(locsNotVisited)+" fork count: "+forkCount+"
linear count: "+linearCount+" from "+reason;
Logger.normal(this, msg);
}
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2008-08-14
21:33:35 UTC (rev 21876)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2008-08-14
21:48:20 UTC (rev 21877)
@@ -45,12 +45,12 @@
import freenet.support.OOMHandler;
import freenet.support.SimpleFieldSet;
import freenet.support.SizeUtil;
-import freenet.support.StringArray;
import freenet.support.api.Bucket;
import freenet.support.io.ArrayBucket;
import freenet.support.io.ArrayBucketFactory;
import freenet.support.io.BucketTools;
import freenet.support.io.FileBucket;
+import java.util.Arrays;
/**
* @author amphibian
@@ -860,7 +860,7 @@
}
public void onTrace(long uid, double target,
double nearest, double best, short htl, short counter, double location, long
nodeUID, double[] peerLocs, long[] peerUIDs, double[] locsNotVisited, short
forkCount, short linearCounter, String reason, long prevUID) {
- String msg = "Probe trace: UID="+uid+"
target="+target+" nearest="+nearest+" best="+best+" htl="+htl+"
counter="+counter+" linear="+linearCounter+" location="+location+"node
UID="+nodeUID+" prev UID="+prevUID+" peer
locs="+StringArray.toString(peerLocs)+" peer
UIDs="+StringArray.toString(peerUIDs)+" locs not visited =
"+StringArray.toString(locsNotVisited)+" forks: "+forkCount+"
reason="+reason+'\n';
+ String msg = "Probe trace: UID="+uid+"
target="+target+" nearest="+nearest+" best="+best+" htl="+htl+"
counter="+counter+" linear="+linearCounter+" location="+location+"node
UID="+nodeUID+" prev UID="+prevUID+" peer locs="+Arrays.toString(peerLocs)+"
peer UIDs="+Arrays.toString(peerUIDs)+" locs not visited =
"+Arrays.toString(locsNotVisited)+" forks: "+forkCount+" reason="+reason+'\n';
try {
out.write(msg.getBytes());
out.flush();
Modified:
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2008-08-14 21:33:35 UTC (rev 21876)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2008-08-14 21:48:20 UTC (rev 21877)
@@ -24,7 +24,6 @@
import freenet.support.Executor;
import freenet.support.Logger;
import freenet.support.PooledExecutor;
-import freenet.support.StringArray;
import freenet.support.LoggerHook.InvalidThresholdException;
import freenet.support.io.ArrayBucket;
import freenet.support.io.FileUtil;
@@ -209,7 +208,7 @@
if(totalRunningUIDsAlt != 0)
System.err.println("Still running UIDs (alt):
"+totalRunningUIDsAlt);
if(!runningUIDsList.isEmpty()) {
- System.err.println("List of running UIDs:
"+StringArray.toString(runningUIDsList.toArray()));
+ System.err.println("List of running UIDs:
"+Arrays.toString(runningUIDsList.toArray()));
}
} catch (Throwable t) {
Logger.error(RealNodeRequestInsertTest.class, "Caught "+t, t);
Modified: trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
2008-08-14 21:33:35 UTC (rev 21876)
+++ trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
2008-08-14 21:48:20 UTC (rev 21877)
@@ -5,7 +5,6 @@
import freenet.l10n.L10n;
import freenet.support.Logger;
-import freenet.support.StringArray;
public class PluginInfoWrapper {
// Parameters to make the object OTP
@@ -25,7 +24,7 @@
private final boolean isFCPPlugin;
private final boolean isVersionedPlugin;
private final String filename;
- private HashSet toadletLinks = new HashSet();
+ private HashSet<String> toadletLinks = new HashSet<String>();
private volatile boolean stopping = false;
private volatile boolean unregistered = false;
@@ -79,7 +78,7 @@
}
public synchronized String[] getPluginToadletSymlinks(){
- return StringArray.toArray(toadletLinks.toArray());
+ return toadletLinks.toArray(new String[0]);
}
public synchronized boolean addPluginToadletSymlink(String linkfrom){
Modified: trunk/freenet/src/freenet/support/io/BaseFileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BaseFileBucket.java 2008-08-14
21:33:35 UTC (rev 21876)
+++ trunk/freenet/src/freenet/support/io/BaseFileBucket.java 2008-08-14
21:48:20 UTC (rev 21877)
@@ -14,8 +14,8 @@
import freenet.support.Fields;
import freenet.support.Logger;
import freenet.support.SimpleFieldSet;
-import freenet.support.StringArray;
import freenet.support.api.Bucket;
+import java.util.Arrays;
public abstract class BaseFileBucket implements Bucket,
SerializableToFieldSetBucket {
@@ -392,7 +392,7 @@
}
if(toClose != null) {
- Logger.error(this, "Streams open free()ing "+this+" :
"+StringArray.toString(toClose), new Exception("debug"));
+ Logger.error(this, "Streams open free()ing "+this+" :
"+Arrays.toString(toClose), new Exception("debug"));
for(int i=0;i<toClose.length;i++) {
try {
if(toClose[i] instanceof
FileBucketOutputStream) {
@@ -419,6 +419,7 @@
}
}
+ @Override
public synchronized String toString() {
return super.toString()+ ':'
+getFile().getPath()+":streams="+(streams == null ? 0 : streams.size());
}
