Author: nextgens
Date: 2006-11-16 22:49:45 +0000 (Thu, 16 Nov 2006)
New Revision: 10961
Modified:
trunk/freenet/src/freenet/client/ArchiveManager.java
trunk/freenet/src/freenet/client/ArchiveStoreContext.java
trunk/freenet/src/freenet/client/DefaultMIMETypes.java
trunk/freenet/src/freenet/client/FetchException.java
trunk/freenet/src/freenet/client/Metadata.java
trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
trunk/freenet/src/freenet/client/async/ClientGetter.java
trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
trunk/freenet/src/freenet/client/async/ClientRequester.java
trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java
trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
trunk/freenet/src/freenet/client/async/SingleFileInserter.java
trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
trunk/freenet/src/freenet/client/async/USKFetcherWrapper.java
trunk/freenet/src/freenet/client/async/USKInserter.java
trunk/freenet/src/freenet/client/events/BlockInsertErrorEvent.java
trunk/freenet/src/freenet/clients/http/Bookmark.java
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/clients/http/HTTPRequest.java
trunk/freenet/src/freenet/clients/http/NinjaSpider.java
trunk/freenet/src/freenet/clients/http/PageMaker.java
trunk/freenet/src/freenet/clients/http/PluginToadlet.java
trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/clients/http/Spider.java
trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
trunk/freenet/src/freenet/clients/http/SymlinkerToadlet.java
trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
trunk/freenet/src/freenet/config/FilePersistentConfig.java
trunk/freenet/src/freenet/crypt/DSA.java
trunk/freenet/src/freenet/crypt/DSAGroup.java
trunk/freenet/src/freenet/crypt/DSAGroupGenerator.java
trunk/freenet/src/freenet/crypt/DSASignature.java
trunk/freenet/src/freenet/crypt/DiffieHellman.java
trunk/freenet/src/freenet/crypt/StationToStationContext.java
trunk/freenet/src/freenet/crypt/ciphers/Rijndael_Algorithm.java
trunk/freenet/src/freenet/crypt/ciphers/Twofish_Algorithm.java
trunk/freenet/src/freenet/frost/message/FrostMessage.java
trunk/freenet/src/freenet/io/AddressIdentifier.java
trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java
trunk/freenet/src/freenet/io/comm/Message.java
trunk/freenet/src/freenet/io/comm/MessageType.java
trunk/freenet/src/freenet/io/comm/Peer.java
trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
trunk/freenet/src/freenet/keys/ClientCHK.java
trunk/freenet/src/freenet/keys/FreenetURI.java
trunk/freenet/src/freenet/keys/NodeCHK.java
trunk/freenet/src/freenet/keys/USK.java
trunk/freenet/src/freenet/node/FNPPacketMangler.java
trunk/freenet/src/freenet/node/InsertHandler.java
trunk/freenet/src/freenet/node/KeyTracker.java
trunk/freenet/src/freenet/node/LocationManager.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeClientCore.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/NodeIPDetector.java
trunk/freenet/src/freenet/node/PacketSender.java
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/PeerNodeStatus.java
trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java
trunk/freenet/src/freenet/node/RealNodeRoutingTest.java
trunk/freenet/src/freenet/node/RequestHandler.java
trunk/freenet/src/freenet/node/RequestSender.java
trunk/freenet/src/freenet/node/RequestStarterGroup.java
trunk/freenet/src/freenet/node/SSKInsertHandler.java
trunk/freenet/src/freenet/node/SendMessageOnErrorCallback.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
trunk/freenet/src/freenet/node/ThrottleWindowManager.java
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/node/fcp/AddPeer.java
trunk/freenet/src/freenet/node/fcp/ClientGet.java
trunk/freenet/src/freenet/node/fcp/ClientPutBase.java
trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
trunk/freenet/src/freenet/node/fcp/FCPClient.java
trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
trunk/freenet/src/freenet/node/fcp/FCPConnectionOutputHandler.java
trunk/freenet/src/freenet/node/fcp/FCPMessage.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
trunk/freenet/src/freenet/node/fcp/ModifyConfig.java
trunk/freenet/src/freenet/node/updater/NodeUpdater.java
trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
trunk/freenet/src/freenet/pluginmanager/PluginManager.java
trunk/freenet/src/freenet/pluginmanager/TestPlugin.java
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
trunk/freenet/src/freenet/support/Buffer.java
trunk/freenet/src/freenet/support/CPUInformation/CPUID.java
trunk/freenet/src/freenet/support/FileLoggerHook.java
trunk/freenet/src/freenet/support/HTMLNode.java
trunk/freenet/src/freenet/support/HexUtil.java
trunk/freenet/src/freenet/support/LRUHashtable.java
trunk/freenet/src/freenet/support/NumberedRecentItems.java
trunk/freenet/src/freenet/support/PromiscuousItemException.java
trunk/freenet/src/freenet/support/ShortBuffer.java
trunk/freenet/src/freenet/support/SimpleFieldSet.java
trunk/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java
trunk/freenet/src/freenet/support/SizeUtil.java
trunk/freenet/src/freenet/support/TimeUtil.java
trunk/freenet/src/freenet/support/URLEncoder.java
trunk/freenet/src/freenet/support/UpdatableSortedLinkedList.java
trunk/freenet/src/freenet/support/io/BucketTools.java
trunk/freenet/src/freenet/support/io/FileBucket.java
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
trunk/freenet/src/freenet/support/io/RandomAccessFileBucket.java
trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
trunk/freenet/src/freenet/support/io/TempFileBucket.java
trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
trunk/freenet/src/net/i2p/util/NativeBigInteger.java
Log:
Apply YetAnotherPatch from uniqueperson. I'm quite reluctent to apply such big
patches... but it's true we should spare our calls to Strings when not
necessary...
Modified: trunk/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveManager.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/ArchiveManager.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -131,7 +131,7 @@
* @throws ArchiveFailureException
*/
public synchronized Bucket getCached(FreenetURI key, String filename)
throws ArchiveFailureException {
- if(logMINOR) Logger.minor(this, "Fetch cached: "+key+"
"+filename);
+ if(logMINOR) Logger.minor(this, "Fetch cached: "+key+ ' '
+filename);
ArchiveKey k = new ArchiveKey(key, filename);
ArchiveStoreItem asi = (ArchiveStoreItem) storedData.get(k);
if(asi == null) return null;
@@ -350,7 +350,7 @@
throw new ArchiveFailureException("Invalid
archive: contains "+name+" as both file and dir");
}
map = (HashMap) o;
- addToDirectory(map, after, prefix + before + "/");
+ addToDirectory(map, after, prefix + before + '/');
}
}
@@ -365,7 +365,7 @@
*/
private void addErrorElement(ArchiveStoreContext ctx, FreenetURI key,
String name, String error) {
ErrorArchiveStoreItem element = new ErrorArchiveStoreItem(ctx,
key, name, error);
- if(logMINOR) Logger.minor(this, "Adding error element:
"+element+" for "+key+" "+name);
+ if(logMINOR) Logger.minor(this, "Adding error element:
"+element+" for "+key+ ' ' +name);
synchronized(storedData) {
storedData.push(element.key, element);
}
@@ -376,7 +376,7 @@
*/
private void addStoreElement(ArchiveStoreContext ctx, FreenetURI key,
String name, TempStoreElement temp) {
RealArchiveStoreItem element = new RealArchiveStoreItem(this,
ctx, key, name, temp);
- if(logMINOR) Logger.minor(this, "Adding store element:
"+element+" ( "+key+" "+name+" )");
+ if(logMINOR) Logger.minor(this, "Adding store element:
"+element+" ( "+key+ ' ' +name+" )");
synchronized(storedData) {
storedData.push(element.key, element);
trimStoredData();
Modified: trunk/freenet/src/freenet/client/ArchiveStoreContext.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveStoreContext.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/ArchiveStoreContext.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -55,7 +55,7 @@
// Fetch from cache
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this, "Checking cache: "+key+"
"+internalName);
+ Logger.minor(this, "Checking cache: "+key+ ' '
+internalName);
if((data = manager.getCached(key, internalName)) != null) {
return data;
}
Modified: trunk/freenet/src/freenet/client/DefaultMIMETypes.java
===================================================================
--- trunk/freenet/src/freenet/client/DefaultMIMETypes.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/DefaultMIMETypes.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -67,7 +67,7 @@
if(mimeTypesByExtension.containsKey(ext)) {
// No big deal
Short s = (Short)
mimeTypesByExtension.get(ext);
- Logger.normal(DefaultMIMETypes.class,
"Extension "+ext+" assigned to "+byNumber(s.shortValue())+" in preference to
"+number+":"+type);
+ Logger.normal(DefaultMIMETypes.class,
"Extension "+ext+" assigned to "+byNumber(s.shortValue())+" in preference to
"+number+ ':' +type);
} else {
// If only one, make it primary
if((outExtension == null) &&
(extensions.length == 1))
Modified: trunk/freenet/src/freenet/client/FetchException.java
===================================================================
--- trunk/freenet/src/freenet/client/FetchException.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/FetchException.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -47,7 +47,7 @@
newURI = null;
expectedSize = -1;
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this,
"FetchException("+getMessage(mode)+")", this);
+ Logger.minor(this, "FetchException("+getMessage(mode)+
')', this);
}
public FetchException(int m, long expectedSize, boolean finalizedSize,
String expectedMimeType) {
@@ -60,7 +60,7 @@
this.expectedSize = expectedSize;
this.expectedMimeType = expectedMimeType;
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this,
"FetchException("+getMessage(mode)+")", this);
+ Logger.minor(this, "FetchException("+getMessage(mode)+
')', this);
}
public FetchException(int m, long expectedSize, boolean finalizedSize,
String expectedMimeType, FreenetURI uri) {
@@ -73,7 +73,7 @@
this.expectedSize = expectedSize;
this.expectedMimeType = expectedMimeType;
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this,
"FetchException("+getMessage(mode)+")", this);
+ Logger.minor(this, "FetchException("+getMessage(mode)+
')', this);
}
public FetchException(MetadataParseException e) {
@@ -131,7 +131,7 @@
newURI = null;
expectedSize = -1;
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this,
"FetchException("+getMessage(mode)+")");
+ Logger.minor(this, "FetchException("+getMessage(mode)+
')');
}
public FetchException(int mode, String msg) {
@@ -232,17 +232,17 @@
StringBuffer sb = new StringBuffer(200);
sb.append("FetchException:");
sb.append(getShortMessage(mode));
- sb.append(":");
+ sb.append(':');
sb.append(newURI);
- sb.append(":");
+ sb.append(':');
sb.append(expectedSize);
- sb.append(":");
+ sb.append(':');
sb.append(expectedMimeType);
- sb.append(":");
+ sb.append(':');
sb.append(finalizedSizeAndMimeType);
- sb.append(":");
+ sb.append(':');
sb.append(errorCodes);
- sb.append(":");
+ sb.append(':');
sb.append(extraMessage);
return sb.toString();
}
Modified: trunk/freenet/src/freenet/client/Metadata.java
===================================================================
--- trunk/freenet/src/freenet/client/Metadata.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/client/Metadata.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -345,7 +345,7 @@
byte[] buf = new byte[len];
dis.readFully(buf);
nameInArchive = new String(buf, "UTF-8");
- if(logMINOR) Logger.minor(this, "Zip internal redirect:
"+nameInArchive+" ("+len+")");
+ if(logMINOR) Logger.minor(this, "Zip internal redirect:
"+nameInArchive+" ("+len+ ')');
}
}
Modified: trunk/freenet/src/freenet/client/StandardOnionFECCodec.java
===================================================================
--- trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/StandardOnionFECCodec.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -144,7 +144,7 @@
System.err.println("Failed to load
native FEC: "+t);
t.printStackTrace();
}
- Logger.error(this, "Failed to load native FEC:
"+t+" (k="+k+" n="+n+")", t);
+ Logger.error(this, "Failed to load native FEC:
"+t+" (k="+k+" n="+n+ ')', t);
fec = new PureCode(k,n);
if(t instanceof UnsatisfiedLinkError)
noNative = true;
@@ -268,7 +268,7 @@
if (idx < k)
throw new IllegalArgumentException(
- "Must have at least k packets
(k="+k+",idx="+idx+")");
+ "Must have at least k packets
(k="+k+",idx="+idx+ ')');
if(logMINOR) for (int i = 0; i < packetIndexes.length;
i++)
Logger.minor(this, "[" + i + "] = " +
packetIndexes[i]);
Modified: trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -61,7 +61,7 @@
protected boolean retry() {
retryCount++;
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this, "Attempting to retry... (max
"+maxRetries+", current "+retryCount+")");
+ Logger.minor(this, "Attempting to retry... (max
"+maxRetries+", current "+retryCount+ ')');
// We want 0, 1, ... maxRetries i.e. maxRetries+1 attempts
(maxRetries=0 => try once, no retries, maxRetries=1 = original try + 1 retry)
if((retryCount <= maxRetries) || (maxRetries == -1)) {
schedule();
Modified: trunk/freenet/src/freenet/client/async/ClientGetter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientGetter.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/async/ClientGetter.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -195,6 +195,6 @@
}
public String toString() {
- return super.toString()+":"+uri;
+ return super.toString()+ ':' +uri;
}
}
Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -146,7 +146,7 @@
allRequestsByClientRequest = new HashMap();
this.name = name;
- sc.register(name+"_priority_policy", PRIORITY_HARD,
name.hashCode(), true, false, "Priority policy of the "+name+"scheduler", "Set
the priority policy scheme used by the scheduler. Could be one of
["+PRIORITY_HARD+", "+PRIORITY_SOFT+"]",
+ sc.register(name+"_priority_policy", PRIORITY_HARD,
name.hashCode(), true, false, "Priority policy of the "+name+"scheduler", "Set
the priority policy scheme used by the scheduler. Could be one of
["+PRIORITY_HARD+", "+PRIORITY_SOFT+ ']',
new PrioritySchedulerCallback(this));
this.choosenPriorityScheduler =
sc.getString(name+"_priority_policy");
logMINOR = Logger.shouldLog(Logger.MINOR, this);
@@ -262,7 +262,7 @@
return priority;
}
- if(logMINOR) Logger.debug(this, "Priority "+priority+"
is null (fuzz = "+fuzz+")");
+ if(logMINOR) Logger.debug(this, "Priority "+priority+"
is null (fuzz = "+fuzz+ ')');
fuzz++;
}
@@ -293,18 +293,18 @@
}
}
if(req == null) {
- if(logMINOR) Logger.minor(this, "No
requests, adjusted retrycount "+rga.getNumber()+" ("+rga+")");
+ if(logMINOR) Logger.minor(this, "No
requests, adjusted retrycount "+rga.getNumber()+" ("+rga+ ')');
break;
} else if(req.getPriorityClass() !=
choosenPriorityClass) {
// Reinsert it : shouldn't happen if we
are calling reregisterAll,
// maybe we should ask people to report
that error if seen
- if(logMINOR) Logger.minor(this, "In
wrong priority class: "+req+" (req.prio="+req.getPriorityClass()+" but
chosen="+choosenPriorityClass+")");
+ if(logMINOR) Logger.minor(this, "In
wrong priority class: "+req+" (req.prio="+req.getPriorityClass()+" but
chosen="+choosenPriorityClass+ ')');
innerRegister(req);
continue;
}
if(logMINOR) Logger.minor(this, "removeFirst()
returning "+req+" ("+rga.getNumber()+", prio "+
- req.getPriorityClass()+",
retries "+req.getRetryCount()+", client "+req.getClient()+", client-req
"+req.getClientRequest()+")");
+ req.getPriorityClass()+",
retries "+req.getRetryCount()+", client "+req.getClient()+", client-req
"+req.getClientRequest()+ ')');
ClientRequester cr = req.getClientRequest();
HashSet v = (HashSet)
allRequestsByClientRequest.get(cr);
v.remove(req);
Modified: trunk/freenet/src/freenet/client/async/ClientRequester.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequester.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/async/ClientRequester.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -86,7 +86,7 @@
public void completedBlock(boolean dontNotify) {
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this, "Completed block ("+dontNotify+")");
+ Logger.minor(this, "Completed block ("+dontNotify+ ')');
synchronized(this) {
successfulBlocks++;
if(dontNotify) return;
Modified: trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/async/SimpleHealingQueue.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -83,7 +83,7 @@
runningInserters.remove(data);
}
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this, "Successfully inserted healing
block: "+sbi.getURINoEncode()+" for "+data+" ("+sbi.token+")");
+ Logger.minor(this, "Successfully inserted healing
block: "+sbi.getURINoEncode()+" for "+data+" ("+sbi.token+ ')');
data.free();
}
@@ -94,7 +94,7 @@
runningInserters.remove(data);
}
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this, "Failed to insert healing block:
"+sbi.getURINoEncode()+" : "+e+" for "+data+" ("+sbi.token+")", e);
+ Logger.minor(this, "Failed to insert healing block:
"+sbi.getURINoEncode()+" : "+e+" for "+data+" ("+sbi.token+ ')', e);
data.free();
}
Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -267,7 +267,7 @@
if(o instanceof HashMap) {
HashMap subMap = new HashMap();
putHandlersByName.put(name, subMap);
- makePutHandlers((HashMap)o, subMap,
ZipPrefix+name+"/");
+ makePutHandlers((HashMap)o, subMap,
ZipPrefix+name+ '/');
} else {
ManifestElement element = (ManifestElement) o;
String mimeType = element.mimeOverride;
@@ -643,7 +643,7 @@
Iterator i = manifestElements.keySet().iterator();
while(i.hasNext()) {
String name = (String) i.next();
- String fullName = prefix.length() == 0 ? name :
prefix+"/"+name;
+ String fullName = prefix.length() == 0 ? name : prefix+
'/' +name;
Object o = manifestElements.get(name);
if(o instanceof HashMap) {
flatten((HashMap)o, v, fullName);
Modified: trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -304,7 +304,7 @@
onSuccess(new
FetchResult(this.clientMetadata, out));
return;
} else {
- if(logMINOR) Logger.minor(this,
"Fetching archive (thisKey="+thisKey+")");
+ if(logMINOR) Logger.minor(this,
"Fetching archive (thisKey="+thisKey+ ')');
// Metadata cannot contain pointers to
files which don't exist.
// We enforce this in ArchiveHandler.
// Therefore, the archive needs to be
fetched.
Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -502,7 +502,7 @@
// Otherwise, wait until the data is
fetchable (to improve persistence).
if(!(dataFetchable || earlyEncode))
return;
}
- if(logMINOR) Logger.minor(this, "Putting
metadata on "+metadataPutter+" from "+sfi+"
("+((SplitFileInserter)sfi).getLength()+")");
+ if(logMINOR) Logger.minor(this, "Putting
metadata on "+metadataPutter+" from "+sfi+"
("+((SplitFileInserter)sfi).getLength()+ ')');
} catch (InserterException e1) {
cb.onFailure(e1, this);
return;
@@ -592,7 +592,7 @@
logMINOR = Logger.shouldLog(Logger.MINOR, this);
- if(logMINOR) Logger.minor(this,
"onFetchable("+state+")");
+ if(logMINOR) Logger.minor(this, "onFetchable("+state+
')');
boolean meta;
Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcher.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -208,7 +208,7 @@
}
if(allDone) {
if(allSegmentsFinished) {
- Logger.error(this, "Was already
finished! (segmentFinished("+segment+")");
+ Logger.error(this, "Was already
finished! (segmentFinished("+segment+ ')');
} else {
allSegmentsFinished = true;
finish = true;
Modified: trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/async/SplitFileInserterSegment.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -304,7 +304,7 @@
}
public void start() throws InserterException {
- if(logMINOR) Logger.minor(this, "Starting segment "+segNo+" of
"+parent+" ("+parent.dataLength+"): "+this+" ( finished="+finished+"
encoded="+encoded+" hasURIs="+hasURIs+")");
+ if(logMINOR) Logger.minor(this, "Starting segment "+segNo+" of
"+parent+" ("+parent.dataLength+"): "+this+" ( finished="+finished+"
encoded="+encoded+" hasURIs="+hasURIs+ ')');
boolean fin = true;
for(int i=0;i<dataBlockInserters.length;i++) {
@@ -322,7 +322,7 @@
if(!encoded) {
if(logMINOR) Logger.minor(this, "Segment "+segNo+" of
"+parent+" ("+parent.dataLength+") is not encoded");
if(splitfileAlgo != null) {
- if(logMINOR) Logger.minor(this, "Encoding
segment "+segNo+" of "+parent+" ("+parent.dataLength+")");
+ if(logMINOR) Logger.minor(this, "Encoding
segment "+segNo+" of "+parent+" ("+parent.dataLength+ ')');
// Encode blocks
Thread t = new Thread(new
EncodeBlocksRunnable(), "Blocks encoder for "+this);
t.setDaemon(true);
Modified: trunk/freenet/src/freenet/client/async/USKFetcherWrapper.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKFetcherWrapper.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/async/USKFetcherWrapper.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -49,6 +49,6 @@
}
public String toString() {
- return super.toString()+":"+usk;
+ return super.toString()+ ':' +usk;
}
}
Modified: trunk/freenet/src/freenet/client/async/USKInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKInserter.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/async/USKInserter.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -108,7 +108,7 @@
if(finished) return;
edition = edNo;
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this, "scheduling insert for
"+pubUSK.getURI()+" "+edition);
+ Logger.minor(this, "scheduling insert for
"+pubUSK.getURI()+ ' ' +edition);
sbi = new SingleBlockInserter(parent, data,
compressionCodec, privUSK.getInsertableSSK(edition).getInsertURI(),
ctx, this, isMetadata, sourceLength,
token, getCHKOnly, false, true /* we don't use it */, tokenObject);
}
@@ -203,12 +203,12 @@
public void onTransition(ClientPutState oldState, ClientPutState
newState) {
// Shouldn't happen
- Logger.error(this, "Got
onTransition("+oldState+","+newState+")");
+ Logger.error(this, "Got onTransition("+oldState+ ',' +newState+
')');
}
public void onMetadata(Metadata m, ClientPutState state) {
// Shouldn't happen
- Logger.error(this, "Got onMetadata("+m+","+state+")");
+ Logger.error(this, "Got onMetadata("+m+ ',' +state+ ')');
}
public void onBlockSetFinished(ClientPutState state) {
Modified: trunk/freenet/src/freenet/client/events/BlockInsertErrorEvent.java
===================================================================
--- trunk/freenet/src/freenet/client/events/BlockInsertErrorEvent.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/client/events/BlockInsertErrorEvent.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -20,7 +20,7 @@
}
public String getDescription() {
- return e.getMessage()+" for "+key+" ("+retryNumber+")";
+ return e.getMessage()+" for "+key+" ("+retryNumber+ ')';
}
public int getCode() {
Modified: trunk/freenet/src/freenet/clients/http/Bookmark.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Bookmark.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/Bookmark.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -48,6 +48,6 @@
}
public String toString() {
- return this.key.toString() + "=" + this.desc;
+ return this.key.toString() + '=' + this.desc;
}
}
\ No newline at end of file
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -54,17 +54,17 @@
for(int j=0; j<o.length; j++){
configName=o[j].getName();
- if(logMINOR) Logger.minor(this, "Setting
"+prefix+"."+configName);
+ if(logMINOR) Logger.minor(this, "Setting
"+prefix+ '.' +configName);
// we ignore unreconized parameters
- if(request.isPartSet(prefix+"."+configName)) {
- String value =
request.getPartAsString(prefix+"."+configName, MAX_PARAM_VALUE_SIZE);
+ if(request.isPartSet(prefix+ '.' +configName)) {
+ String value =
request.getPartAsString(prefix+ '.' +configName, MAX_PARAM_VALUE_SIZE);
if(!(o[j].getValueString().equals(value))){
- if(logMINOR) Logger.minor(this,
"Setting "+prefix+"."+configName+" to "+value);
+ if(logMINOR) Logger.minor(this,
"Setting "+prefix+ '.' +configName+" to "+value);
try{
o[j].setValue(value);
}catch(Exception e){
- errbuf.append(o[j].getName()).append("
").append(e).append("\n");
+ errbuf.append(o[j].getName()).append('
').append(e).append('\n');
Logger.error(this,
"Caught "+e, e);
}
}
@@ -110,7 +110,7 @@
HTMLNode navigationBar =
ctx.getPageMaker().getInfobox("navbar", "Configuration Navigation");
HTMLNode navigationContent =
ctx.getPageMaker().getContentNode(navigationBar).addChild("ul");
for(int i=0; i<sc.length;i++){
- navigationContent.addChild("li").addChild("a",
"href", "#"+sc[i].getPrefix(), sc[i].getPrefix());
+ navigationContent.addChild("li").addChild("a",
"href", '#' +sc[i].getPrefix(), sc[i].getPrefix());
}
contentNode.addChild(navigationBar);
}
@@ -140,7 +140,7 @@
continue;
}
if(o[j].getValueString().equals("true")
|| o[j].getValueString().equals("false")){
- HTMLNode selectNode =
configItemValueNode.addChild("select", "name", sc[i].getPrefix() + "." +
configName);
+ HTMLNode selectNode =
configItemValueNode.addChild("select", "name", sc[i].getPrefix() + '.' +
configName);
if(o[j].getValueString().equals("true")){
selectNode.addChild("option", new String[] { "value", "selected" }, new
String[] { "true", "selected" }, "true");
selectNode.addChild("option", "value", "false", "false");
@@ -149,7 +149,7 @@
selectNode.addChild("option", new String[] { "value", "selected" }, new
String[] { "false", "selected" }, "false");
}
}else{
-
configItemValueNode.addChild("input", new String[] { "type", "class", "alt",
"name", "value" }, new String[] { "text", "config", o[j].getShortDesc(),
sc[i].getPrefix() + "." + configName, o[j].getValueString() });
+
configItemValueNode.addChild("input", new String[] { "type", "class", "alt",
"name", "value" }, new String[] { "text", "config", o[j].getShortDesc(),
sc[i].getPrefix() + '.' + configName, o[j].getValueString() });
}
configItemNode.addChild("span",
"class", "configlongdesc", o[j].getLongDesc());
}
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -108,7 +108,7 @@
int numberOfNotConnected = numberOfTooNew + numberOfTooOld +
numberOfDisconnected + numberOfNeverConnected + numberOfDisabled +
numberOfBursting + numberOfListening + numberOfListenOnly;
String titleCountString = null;
if(advancedEnabled) {
- titleCountString = "(" + numberOfConnected + "/" +
numberOfRoutingBackedOff + "/" + numberOfTooNew + "/" + numberOfTooOld + "/" +
numberOfNotConnected + ")";
+ titleCountString = "(" + numberOfConnected + '/' +
numberOfRoutingBackedOff + '/' + numberOfTooNew + '/' + numberOfTooOld + '/' +
numberOfNotConnected + ')';
} else {
titleCountString = (numberOfNotConnected +
numberOfSimpleConnected)>0 ? String.valueOf(numberOfSimpleConnected) : "";
}
@@ -381,7 +381,7 @@
if
(peerNodeStatus.isConnected()) {
pingTime = " (" + (int)
peerNodeStatus.getAveragePingTime() + "ms)";
}
- peerRow.addChild("td", "class",
"peer-address").addChild("#", ((peerNodeStatus.getPeerAddress() != null) ?
(peerNodeStatus.getPeerAddress() + ":" + peerNodeStatus.getPeerPort()) :
("(unknown address)")) + pingTime);
+ peerRow.addChild("td", "class",
"peer-address").addChild("#", ((peerNodeStatus.getPeerAddress() != null) ?
(peerNodeStatus.getPeerAddress() + ':' + peerNodeStatus.getPeerPort()) :
("(unknown address)")) + pingTime);
}
// version column
@@ -405,8 +405,8 @@
if ((backoff > 0) && (backoff <
1000)) {
backoff = 1000;
}
- backoffCell.addChild("#", " " +
String.valueOf(backoff / 1000) + "/" +
String.valueOf(peerNodeStatus.getRoutingBackoffLength() / 1000));
- backoffCell.addChild("#",
(peerNodeStatus.getLastBackoffReason() == null) ? "" : ("/" +
(peerNodeStatus.getLastBackoffReason())));
+ backoffCell.addChild("#", ' ' +
String.valueOf(backoff / 1000) + '/' +
String.valueOf(peerNodeStatus.getRoutingBackoffLength() / 1000));
+ backoffCell.addChild("#",
(peerNodeStatus.getLastBackoffReason() == null) ? "" : ('/' +
(peerNodeStatus.getLastBackoffReason())));
// overload probability column
HTMLNode pRejectCell =
peerRow.addChild("td", "class", "peer-backoff"); // FIXME
@@ -554,7 +554,7 @@
MultiValueTable headers = new MultiValueTable();
headers.put("Location", "/darknet/");
ctx.sendReplyHeaders(302, "Found", headers, null, 0);
- if(logMINOR) Logger.minor(this, "No password ("+pass+"
should be "+core.formPassword+")");
+ if(logMINOR) Logger.minor(this, "No password ("+pass+"
should be "+core.formPassword+ ')');
return;
}
@@ -580,7 +580,7 @@
in = new BufferedReader(new
InputStreamReader(uc.getInputStream()));
String line;
while ( (line = in.readLine()) != null)
{
- ref.append( line ).append( "\n"
);
+ ref.append( line ).append('\n');
}
} catch (IOException e) {
this.sendErrorPage(ctx, 200, "Failed To
Add Node", "Unable to retrieve node reference from " + urltext + ". Please try
again.");
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -102,7 +102,7 @@
if (forceDownload) {
MultiValueTable headers = new MultiValueTable();
- headers.put("Content-Disposition", "attachment;
filename=\"" + key.getPreferredFilename() + "\"");
+ headers.put("Content-Disposition", "attachment;
filename=\"" + key.getPreferredFilename() + '"');
context.sendReplyHeaders(200, "OK", headers,
"application/x-msdownload", data.size());
context.writeData(data);
} else {
@@ -133,7 +133,7 @@
option.addChild("#", " to force your browser to
download the file to disk.");
option = optionList.addChild("li");
option.addChild("a", "href", basePath +
key.toString(false) + "?force=" + getForceValue(key, now)+extras, "Click here");
- option.addChild("#", " to open the file as " + mimeType
+ ".");
+ option.addChild("#", " to open the file as " + mimeType
+ '.');
option = optionList.addChild("li");
option.addChild("a", "href", "/", "Click here");
option.addChild("#", " to go to the FProxy home page.");
@@ -230,7 +230,7 @@
}
try {
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this, "FProxy fetching "+key+"
("+maxSize+")");
+ Logger.minor(this, "FProxy fetching "+key+"
("+maxSize+ ')');
FetchResult result = fetch(key, maxSize);
// Now, is it safe?
@@ -245,9 +245,9 @@
String msg = e.getMessage();
String extra = "";
if(e.mode == FetchException.NOT_ENOUGH_PATH_COMPONENTS)
{
- this.writePermanentRedirect(ctx, "Not enough
meta-strings", "/" + URLEncoder.encode(key.toString(false)) + "/");
+ this.writePermanentRedirect(ctx, "Not enough
meta-strings", '/' + URLEncoder.encode(key.toString(false)) + '/');
} else if(e.newURI != null) {
- this.writePermanentRedirect(ctx, msg,
"/"+e.newURI.toString());
+ this.writePermanentRedirect(ctx, msg, '/'
+e.newURI.toString());
} else if(e.mode == FetchException.TOO_BIG) {
HTMLNode pageNode =
ctx.getPageMaker().getPageNode("File information");
HTMLNode contentNode =
ctx.getPageMaker().getContentNode(pageNode);
@@ -258,7 +258,7 @@
HTMLNode fileInformationList =
infoboxContent.addChild("ul");
HTMLNode option =
fileInformationList.addChild("li");
option.addChild("#", "Filename: ");
- option.addChild("a", "href", "/" +
key.toString(false), getFilename(e, key, e.getExpectedMimeType()));
+ option.addChild("a", "href", '/' +
key.toString(false), getFilename(e, key, e.getExpectedMimeType()));
boolean finalized = e.finalizedSize();
if(e.expectedSize > 0) {
@@ -287,7 +287,7 @@
infoboxContent.addChild("#", "The Freenet key
you requested refers to a large file. Files of this size cannot generally be
sent directly to your browser since they take too long for your Freenet node to
retrieve. The following options are available:");
HTMLNode optionList =
infoboxContent.addChild("ul");
option = optionList.addChild("li");
- HTMLNode optionForm = option.addChild("form",
new String[] { "action", "method" }, new String[] { "/" + key.toString(false),
"get" });
+ HTMLNode optionForm = option.addChild("form",
new String[] { "action", "method" }, new String[] {'/' + key.toString(false),
"get" });
optionForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "hidden", "max-size",
String.valueOf(e.expectedSize == -1 ? Long.MAX_VALUE : e.expectedSize*2) });
optionForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "submit", "fetch", "Fetch anyway and
display file in browser" });
option = optionList.addChild("li");
@@ -430,16 +430,16 @@
if(ext == null)
ext = "bin";
if((dotIdx == -1) && (expectedMimeType != null)) {
- s += "." + ext;
+ s += '.' + ext;
return s;
}
if(dotIdx != -1) {
String oldExt = s.substring(dotIdx+1);
if(DefaultMIMETypes.isValidExt(expectedMimeType,
oldExt))
return s;
- return s + "." + ext;
+ return s + '.' + ext;
}
- return s + "." + ext;
+ return s + '.' + ext;
}
private String getFilename(FetchException e, FreenetURI uri) {
Modified: trunk/freenet/src/freenet/clients/http/HTTPRequest.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/HTTPRequest.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/HTTPRequest.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -97,7 +97,7 @@
this.parts = null;
this.bucketfactory = null;
if ((encodedQueryString!=null) &&
(encodedQueryString.length()>0)) {
- this.uri = new URI(path+"?"+encodedQueryString);
+ this.uri = new URI(path+ '?' +encodedQueryString);
} else {
this.uri = new URI(path);
}
@@ -224,7 +224,7 @@
} catch (URLEncodedFormatException e) {
// if we fail to decode the name or value we
fail spectacularly
String msg = "Failed to decode request
parameter " + name
- + " with value '" + value + "'";
+ + " with value '" + value +
'\'';
throw new RuntimeException(msg, e);
}
}
Modified: trunk/freenet/src/freenet/clients/http/NinjaSpider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/NinjaSpider.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -139,7 +139,7 @@
uri = new FreenetURI(uriStr);
}
} catch (MalformedURLException e) {
- Logger.error(this, "Spider: MalformedURLException:
"+uriStr+":"+e);
+ Logger.error(this, "Spider: MalformedURLException:
"+uriStr+ ':' +e);
return;
}
@@ -500,7 +500,7 @@
for(int k=0; k < positions.length ; k++) {
if(k!=0)
- positionList.append(",");
+ positionList.append(',');
positionList.append(positions[k].toString());
}
@@ -660,16 +660,16 @@
HTMLNode infobox = new HTMLNode("div", "class", "infobox
navbar");
infobox.addChild("div", "class", "infobox-header", "Page
navigation");
HTMLNode links = infobox.addChild("div", "class",
"infobox-content").addChild("ul");
- links.addChild("li").addChild("a", "href", "#running", "Running
(" + running + ")");
- links.addChild("li").addChild("a", "href", "#queued", "Queued
(" + queued + ")");
- links.addChild("li").addChild("a", "href", "#visited", "Visited
(" + visited + ")");
- links.addChild("li").addChild("a", "href", "#failed", "Failed
(" + failed + ")");
+ links.addChild("li").addChild("a", "href", "#running", "Running
(" + running + ')');
+ links.addChild("li").addChild("a", "href", "#queued", "Queued
(" + queued + ')');
+ links.addChild("li").addChild("a", "href", "#visited", "Visited
(" + visited + ')');
+ links.addChild("li").addChild("a", "href", "#failed", "Failed
(" + failed + ')');
return infobox;
}
private HTMLNode[] createList(String listName, String anchorName,
Collection collection, int maxCount) {
HTMLNode listBox = new HTMLNode("div", "class", "infobox");
- listBox.addChild("div", "class", "infobox-header", listName + "
(" + collection.size() + ")");
+ listBox.addChild("div", "class", "infobox-header", listName + "
(" + collection.size() + ')');
HTMLNode listContent = listBox.addChild("div", "class",
"infobox-content");
Iterator collectionItems = collection.iterator();
int itemCount = 0;
Modified: trunk/freenet/src/freenet/clients/http/PageMaker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PageMaker.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/PageMaker.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -131,7 +131,7 @@
public HTMLNode getInfobox(String category, HTMLNode header) {
if (header == null) throw new NullPointerException();
- HTMLNode infobox = new HTMLNode("div", "class", "infobox" +
((category == null) ? "" : (" " + category)));
+ HTMLNode infobox = new HTMLNode("div", "class", "infobox" +
((category == null) ? "" : (' ' + category)));
if (header != null) {
infobox.addChild("div", "class",
"infobox-header").addChild(header);
}
Modified: trunk/freenet/src/freenet/clients/http/PluginToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PluginToadlet.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/PluginToadlet.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -179,7 +179,7 @@
Plugin[] plugins = pluginManager.getPlugins();
for (int pluginIndex = 0, pluginCount = plugins.length;
pluginIndex < pluginCount; pluginIndex++) {
Plugin plugin = plugins[pluginIndex];
- String pluginName = plugin.getClass().getName() + "@" +
pluginIndex;
+ String pluginName = plugin.getClass().getName() + '@' +
pluginIndex;
if (pluginName.equals(internalPluginName)) {
return plugin;
}
@@ -209,7 +209,7 @@
headerRow.addChild("th", "colspan", "3");
for (int pluginIndex = 0, pluginCount = plugins.length;
pluginIndex < pluginCount; pluginIndex++) {
Plugin plugin = plugins[pluginIndex];
- String internalName = plugin.getClass().getName() + "@"
+ pluginIndex;
+ String internalName = plugin.getClass().getName() + '@'
+ pluginIndex;
HTMLNode tableRow = table.addChild("tr");
tableRow.addChild("td", plugin.getPluginName());
tableRow.addChild("td", internalName);
Modified: trunk/freenet/src/freenet/clients/http/PproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/PproxyToadlet.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/PproxyToadlet.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -77,7 +77,7 @@
HTMLNode infobox = contentNode.addChild("div", "class",
"infobox infobox-query");
infobox.addChild("div", "class", "infobox-header",
"Unload plugin?");
HTMLNode infoboxContent = infobox.addChild("div",
"class", "infobox-content");
- infoboxContent.addChild("#", "Are you sure you wish to
unload " + request.getPartAsString("unload", MAX_PLUGIN_NAME_LENGTH) + "?");
+ infoboxContent.addChild("#", "Are you sure you wish to
unload " + request.getPartAsString("unload", MAX_PLUGIN_NAME_LENGTH) + '?');
HTMLNode unloadForm = infoboxContent.addChild("form",
new String[] { "action", "method" }, new String[] { "/plugins/", "post" });
unloadForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "hidden", "formPassword", core.formPassword
});
unloadForm.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "submit", "cancel", "Cancel" });
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -233,7 +233,7 @@
break;
}
MultiValueTable responseHeaders = new MultiValueTable();
-
responseHeaders.put("Content-Disposition", "attachment; filename=\"" +
clientGet.getURI().getPreferredFilename() + "\"");
+
responseHeaders.put("Content-Disposition", "attachment; filename=\"" +
clientGet.getURI().getPreferredFilename() + '"');
writeReply(ctx, 200, "application/x-msdownload", "OK", responseHeaders,
dataBucket);
return;
}
@@ -411,8 +411,8 @@
Collections.sort(uncompletedDirUpload, identifierComparator);
HTMLNode pageNode = pageMaker.getPageNode("(" +
(uncompletedDirUpload.size() + uncompletedDownload.size()
- + uncompletedUpload.size()) + "/" +
(failedDirUpload.size() + failedDownload.size() + failedUpload.size()) + "/"
- + (completedDirUpload.size() +
completedDownloadToDisk.size() + completedDownloadToTemp.size()
+ + uncompletedUpload.size()) + '/' +
(failedDirUpload.size() + failedDownload.size() + failedUpload.size()) + '/'
+ + (completedDirUpload.size() + completedDownloadToDisk.size()
+ completedDownloadToTemp.size()
+ completedUpload.size()) + ") Queued Requests
of " + core.getMyName());
HTMLNode contentNode = pageMaker.getContentNode(pageNode);
@@ -487,7 +487,7 @@
if (!completedDownloadToTemp.isEmpty()) {
contentNode.addChild("a", "name",
"completedDownloadToTemp");
- HTMLNode completedDownloadsTempInfobox =
contentNode.addChild(pageMaker.getInfobox("completed_requests", "Completed:
Downloads to temporary directory (" + completedDownloadToTemp.size() + ")"));
+ HTMLNode completedDownloadsTempInfobox =
contentNode.addChild(pageMaker.getInfobox("completed_requests", "Completed:
Downloads to temporary directory (" + completedDownloadToTemp.size() + ')'));
HTMLNode completedDownloadsToTempContent =
pageMaker.getContentNode(completedDownloadsTempInfobox);
if (advancedEnabled) {
completedDownloadsToTempContent.addChild(createRequestTable(pageMaker,
completedDownloadToTemp, new int[] { LIST_IDENTIFIER, LIST_SIZE,
LIST_MIME_TYPE, LIST_DOWNLOAD, LIST_PERSISTENCE, LIST_KEY }));
@@ -498,7 +498,7 @@
if (!completedDownloadToDisk.isEmpty()) {
contentNode.addChild("a", "name",
"completedDownloadToDisk");
- HTMLNode completedToDiskInfobox =
contentNode.addChild(pageMaker.getInfobox("completed_requests", "Completed:
Downloads to download directory (" + completedDownloadToDisk.size() + ")"));
+ HTMLNode completedToDiskInfobox =
contentNode.addChild(pageMaker.getInfobox("completed_requests", "Completed:
Downloads to download directory (" + completedDownloadToDisk.size() + ')'));
HTMLNode completedToDiskInfoboxContent =
pageMaker.getContentNode(completedToDiskInfobox);
if (advancedEnabled) {
completedToDiskInfoboxContent.addChild(createRequestTable(pageMaker,
completedDownloadToDisk, new int[] { LIST_IDENTIFIER, LIST_FILENAME, LIST_SIZE,
LIST_MIME_TYPE, LIST_DOWNLOAD, LIST_PERSISTENCE, LIST_KEY }));
@@ -509,7 +509,7 @@
if (!completedUpload.isEmpty()) {
contentNode.addChild("a", "name", "completedUpload");
- HTMLNode completedUploadInfobox =
contentNode.addChild(pageMaker.getInfobox("completed_requests", "Completed:
Uploads (" + completedUpload.size() + ")"));
+ HTMLNode completedUploadInfobox =
contentNode.addChild(pageMaker.getInfobox("completed_requests", "Completed:
Uploads (" + completedUpload.size() + ')'));
HTMLNode completedUploadInfoboxContent =
pageMaker.getContentNode(completedUploadInfobox);
if (advancedEnabled) {
completedUploadInfoboxContent.addChild(createRequestTable(pageMaker,
completedUpload, new int[] { LIST_IDENTIFIER, LIST_FILENAME, LIST_SIZE,
LIST_MIME_TYPE, LIST_PERSISTENCE, LIST_KEY }));
@@ -520,7 +520,7 @@
if (!completedDirUpload.isEmpty()) {
contentNode.addChild("a", "name", "completedDirUpload");
- HTMLNode completedUploadDirInfobox =
contentNode.addChild(pageMaker.getInfobox("completed_requests", "Completed:
Directory Uploads (" + completedDirUpload.size() + ")"));
+ HTMLNode completedUploadDirInfobox =
contentNode.addChild(pageMaker.getInfobox("completed_requests", "Completed:
Directory Uploads (" + completedDirUpload.size() + ')'));
HTMLNode completedUploadDirContent =
pageMaker.getContentNode(completedUploadDirInfobox);
if (advancedEnabled) {
completedUploadDirContent.addChild(createRequestTable(pageMaker,
completedDirUpload, new int[] { LIST_IDENTIFIER, LIST_FILES, LIST_TOTAL_SIZE,
LIST_PERSISTENCE, LIST_KEY }));
@@ -531,7 +531,7 @@
if (!failedDownload.isEmpty()) {
contentNode.addChild("a", "name", "failedDownload");
- HTMLNode failedInfobox =
contentNode.addChild(pageMaker.getInfobox("failed_requests", "Failed: Downloads
(" + failedDownload.size() + ")"));
+ HTMLNode failedInfobox =
contentNode.addChild(pageMaker.getInfobox("failed_requests", "Failed: Downloads
(" + failedDownload.size() + ')'));
HTMLNode failedContent =
pageMaker.getContentNode(failedInfobox);
if (advancedEnabled) {
failedContent.addChild(createRequestTable(pageMaker, failedDownload, new int[]
{ LIST_IDENTIFIER, LIST_FILENAME, LIST_SIZE, LIST_MIME_TYPE, LIST_PROGRESS,
LIST_REASON, LIST_PERSISTENCE, LIST_KEY }));
@@ -542,7 +542,7 @@
if (!failedUpload.isEmpty()) {
contentNode.addChild("a", "name", "failedUpload");
- HTMLNode failedInfobox =
contentNode.addChild(pageMaker.getInfobox("failed_requests", "Failed: Uploads
(" + failedUpload.size() + ")"));
+ HTMLNode failedInfobox =
contentNode.addChild(pageMaker.getInfobox("failed_requests", "Failed: Uploads
(" + failedUpload.size() + ')'));
HTMLNode failedContent =
pageMaker.getContentNode(failedInfobox);
if (advancedEnabled) {
failedContent.addChild(createRequestTable(pageMaker, failedUpload, new int[] {
LIST_IDENTIFIER, LIST_FILENAME, LIST_SIZE, LIST_MIME_TYPE, LIST_PROGRESS,
LIST_REASON, LIST_PERSISTENCE, LIST_KEY }));
@@ -553,7 +553,7 @@
if (!failedDirUpload.isEmpty()) {
contentNode.addChild("a", "name", "failedDirUpload");
- HTMLNode failedInfobox =
contentNode.addChild(pageMaker.getInfobox("failed_requests", "Failed: Directory
Uploads (" + failedDirUpload.size() + ")"));
+ HTMLNode failedInfobox =
contentNode.addChild(pageMaker.getInfobox("failed_requests", "Failed: Directory
Uploads (" + failedDirUpload.size() + ')'));
HTMLNode failedContent =
pageMaker.getContentNode(failedInfobox);
if (advancedEnabled) {
failedContent.addChild(createRequestTable(pageMaker, failedDirUpload, new int[]
{ LIST_IDENTIFIER, LIST_FILES, LIST_TOTAL_SIZE, LIST_PROGRESS, LIST_REASON,
LIST_PERSISTENCE, LIST_KEY }));
@@ -564,7 +564,7 @@
if (!uncompletedDownload.isEmpty()) {
contentNode.addChild("a", "name",
"uncompletedDownload");
- HTMLNode uncompletedInfobox =
contentNode.addChild(pageMaker.getInfobox("requests_in_progress", "In Progress:
Downloads (" + uncompletedDownload.size() + ")"));
+ HTMLNode uncompletedInfobox =
contentNode.addChild(pageMaker.getInfobox("requests_in_progress", "In Progress:
Downloads (" + uncompletedDownload.size() + ')'));
HTMLNode uncompletedContent =
pageMaker.getContentNode(uncompletedInfobox);
if (advancedEnabled) {
uncompletedContent.addChild(createRequestTable(pageMaker, uncompletedDownload,
new int[] { LIST_IDENTIFIER, LIST_PRIORITY, LIST_SIZE, LIST_MIME_TYPE,
LIST_PROGRESS, LIST_PERSISTENCE, LIST_FILENAME, LIST_KEY }));
@@ -575,7 +575,7 @@
if (!uncompletedUpload.isEmpty()) {
contentNode.addChild("a", "name", "uncompletedUpload");
- HTMLNode uncompletedInfobox =
contentNode.addChild(pageMaker.getInfobox("requests_in_progress", "In Progress:
Uploads (" + uncompletedUpload.size() + ")"));
+ HTMLNode uncompletedInfobox =
contentNode.addChild(pageMaker.getInfobox("requests_in_progress", "In Progress:
Uploads (" + uncompletedUpload.size() + ')'));
HTMLNode uncompletedContent =
pageMaker.getContentNode(uncompletedInfobox);
if (advancedEnabled) {
uncompletedContent.addChild(createRequestTable(pageMaker, uncompletedUpload,
new int[] { LIST_IDENTIFIER, LIST_PRIORITY, LIST_SIZE, LIST_MIME_TYPE,
LIST_PROGRESS, LIST_PERSISTENCE, LIST_FILENAME, LIST_KEY }));
@@ -586,7 +586,7 @@
if (!uncompletedDirUpload.isEmpty()) {
contentNode.addChild("a", "name",
"uncompletedDirUpload");
- HTMLNode uncompletedInfobox =
contentNode.addChild(pageMaker.getInfobox("requests_in_progress", "In Progress:
DirUploads (" + uncompletedDirUpload.size() + ")"));
+ HTMLNode uncompletedInfobox =
contentNode.addChild(pageMaker.getInfobox("requests_in_progress", "In Progress:
DirUploads (" + uncompletedDirUpload.size() + ')'));
HTMLNode uncompletedContent =
pageMaker.getContentNode(uncompletedInfobox);
if (advancedEnabled) {
uncompletedContent.addChild(createRequestTable(pageMaker, uncompletedDirUpload,
new int[] { LIST_IDENTIFIER, LIST_FILES, LIST_PRIORITY, LIST_TOTAL_SIZE,
LIST_PROGRESS, LIST_PERSISTENCE, LIST_KEY }));
@@ -642,9 +642,9 @@
NumberFormat nf = NumberFormat.getInstance();
nf.setMaximumFractionDigits(1);
if (finalized) {
- progressBar.addChild("div", new String[] {
"class", "title" }, new String[] { "progress_fraction_finalized", "This
progress value is accurate" }, nf.format((int) ((fetched / (double) min) *
1000) / 10.0) + "%");
+ progressBar.addChild("div", new String[] {
"class", "title" }, new String[] { "progress_fraction_finalized", "This
progress value is accurate" }, nf.format((int) ((fetched / (double) min) *
1000) / 10.0) + '%');
} else {
- progressBar.addChild("div", new String[] {
"class", "title" }, new String[] { "progress_fraction_not_finalized", "This
progress value is likely to change as the file download process has not been
finalized" }, nf.format((int) ((fetched / (double) min) * 1000) / 10.0)+ "%");
+ progressBar.addChild("div", new String[] {
"class", "title" }, new String[] { "progress_fraction_not_finalized", "This
progress value is likely to change as the file download process has not been
finalized" }, nf.format((int) ((fetched / (double) min) * 1000) / 10.0)+ '%');
}
}
return progressCell;
@@ -761,7 +761,7 @@
private HTMLNode createKeyCell(FreenetURI uri) {
HTMLNode keyCell = new HTMLNode("td", "class", "request-key");
if (uri != null) {
- keyCell.addChild("span", "class",
"key_is").addChild("a", "href", "/" + uri.toString(false), uri.toShortString());
+ keyCell.addChild("span", "class",
"key_is").addChild("a", "href", '/' + uri.toString(false), uri.toShortString());
} else {
keyCell.addChild("span", "class", "key_unknown",
"unknown");
}
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -298,8 +298,8 @@
public void start() {
if(myThread != null) {
myThread.start();
- Logger.normal(this, "Starting FProxy on
"+bindTo+":"+port);
- System.out.println("Starting FProxy on
"+bindTo+":"+port);
+ Logger.normal(this, "Starting FProxy on "+bindTo+ ':'
+port);
+ System.out.println("Starting FProxy on "+bindTo+ ':'
+port);
}
}
Modified: trunk/freenet/src/freenet/clients/http/Spider.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/Spider.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/clients/http/Spider.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -84,7 +84,7 @@
uri = new FreenetURI(uriStr);
}
} catch (MalformedURLException e) {
- Logger.error(this, "Spider: MalformedURLException:
"+uriStr+":"+e);
+ Logger.error(this, "Spider: MalformedURLException:
"+uriStr+ ':' +e);
return;
}
@@ -266,8 +266,8 @@
HashMap urisToNumbers = new HashMap();
for (int i = 0; i < uris.length; i++) {
urisToNumbers.put(uris[i], new Integer(i));
- bw.write("!" + uris[i].toString(false) + "\n");
- bw.write("+" +
titlesOfURIs.get(uris[i].toString(false)) + "\n");
+ bw.write('!' + uris[i].toString(false) + '\n');
+ bw.write("+" +
titlesOfURIs.get(uris[i].toString(false)) + '\n');
}
for (int i = 0; i < words.length; i++) {
StringBuffer s = new StringBuffer();
@@ -397,10 +397,10 @@
private HTMLNode createNavbar(PageMaker pageMaker, int running, int
queued, int visited, int failed) {
HTMLNode navbar = pageMaker.getInfobox("navbar", "Page
Navigation");
HTMLNode list = pageMaker.getContentNode(navbar).addChild("ul");
- list.addChild("li").addChild("a", "href", "#running", "Running
(" + running + ")");
- list.addChild("li").addChild("a", "href", "#queued", "Queued ("
+ queued + ")");
- list.addChild("li").addChild("a", "href", "#visited", "Visited
(" + visited + ")");
- list.addChild("li").addChild("a", "href", "#failed", "Failed ("
+ failed + ")");
+ list.addChild("li").addChild("a", "href", "#running", "Running
(" + running + ')');
+ list.addChild("li").addChild("a", "href", "#queued", "Queued ("
+ queued + ')');
+ list.addChild("li").addChild("a", "href", "#visited", "Visited
(" + visited + ')');
+ list.addChild("li").addChild("a", "href", "#failed", "Failed ("
+ failed + ')');
return navbar;
}
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -382,11 +382,11 @@
storeSizeList.addChild("li",
"Cached keys:\u00a0" +
thousendPoint.format(cachedKeys) +
- "\u00a0(" + SizeUtil.formatSize(cachedSize) + ")");
+ "\u00a0(" + SizeUtil.formatSize(cachedSize) + ')');
storeSizeList.addChild("li",
"Stored keys:\u00a0" + thousendPoint.format(storeKeys)
+
- "\u00a0(" + SizeUtil.formatSize(storeSize) + ")");
+ "\u00a0(" + SizeUtil.formatSize(storeSize) + ')');
storeSizeList.addChild("li",
"Overall size:\u00a0" +
thousendPoint.format(overallKeys) +
Modified: trunk/freenet/src/freenet/clients/http/SymlinkerToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SymlinkerToadlet.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/SymlinkerToadlet.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -100,7 +100,7 @@
int i = 0;
while(it.hasNext()) {
String key = (String)it.next();
- retarr[i++] = key + "#" + linkMap.get(key);
+ retarr[i++] = key + '#' + linkMap.get(key);
}
}
return StringArrOption.arrayToString(retarr);
Modified: trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/WelcomeToadlet.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -65,7 +65,7 @@
String passwd = request.getPartAsString("formPassword", 32);
boolean noPassword = (passwd == null) ||
!passwd.equals(core.formPassword);
if(noPassword) {
- if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "No password ("+passwd+" should be "+core.formPassword+")");
+ if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "No password ("+passwd+" should be "+core.formPassword+ ')');
}
if(request.getPartAsString("updateconfirm", 32).length() > 0){
@@ -335,7 +335,7 @@
HTMLNode infobox =
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-success", "Insert
Succeeded"));
content =
ctx.getPageMaker().getContentNode(infobox);
content.addChild("#", "The key ");
- content.addChild("a", "href", "/" +
key.getKeyType() + "@" + key.getGuessableKey(), key.getKeyType() + "@" +
key.getGuessableKey());
+ content.addChild("a", "href", '/' +
key.getKeyType() + '@' + key.getGuessableKey(), key.getKeyType() + '@' +
key.getGuessableKey());
content.addChild("#", " has been inserted
successfully.");
} catch (InserterException e) {
HTMLNode infobox =
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-error", "Insert
Failed"));
@@ -469,7 +469,7 @@
HTMLNode bookmark =
bookmarkList.addChild("li", "style", "clear: right;"); /* TODO */
bookmark.addChild("input", new String[]
{ "type", "name", "value", "style" }, new String[] { "submit", "delete_" +
b.hashCode(), "Delete", "float: right;" });
bookmark.addChild("input", new String[]
{ "type", "name", "value", "style" }, new String[] { "submit", "edit_" +
b.hashCode(), "Edit", "float: right;" });
- bookmark.addChild("a", "href", "/" +
b.getKey(), b.getDesc());
+ bookmark.addChild("a", "href", '/' +
b.getKey(), b.getDesc());
}
manageForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "hidden", "formPassword",
core.formPassword });
manageForm.addChild("input", new String[] {
"type", "name", "value" }, new String[] { "hidden", "managebookmarks", "yes" });
@@ -546,7 +546,7 @@
HTMLNode bookmarkList = bookmarkContent.addChild("ul",
"id", "bookmarks");
while (e.hasMoreElements()) {
Bookmark b = (Bookmark)e.nextElement();
- bookmarkList.addChild("li").addChild("a",
"href", "/" + b.getKey(), b.getDesc());
+ bookmarkList.addChild("li").addChild("a",
"href", '/' + b.getKey(), b.getDesc());
}
}
bookmarkContent.addChild("div", "id",
"bookmarkedit").addChild("a", new String[] { "href", "class" }, new String[] {
"?managebookmarks", "interfacelink" }, "Edit my bookmarks");
Modified: trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSReadFilter.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -34,8 +34,8 @@
+ this
+ " on "
+ bucket
- + ","
- + charset);
+ + ','
+ + charset);
InputStream strm = bucket.getInputStream();
Bucket temp = bf.makeBucket(bucket.size());
OutputStream os = temp.getOutputStream();
@@ -50,7 +50,7 @@
HTMLNode explanation = new HTMLNode("p");
explanation.addChild("b", "Unknown character set!");
explanation.addChild("#", " The page you are about to
display has an unknown character set. This means that we are not able to filter
the page, and it may compromize your anonymity.");
- throw new DataFilterException("Warning: Unknown
character set ("+charset+")", "Warning: Unknown character set
("+HTMLEncoder.encode(charset)+")",
+ throw new DataFilterException("Warning: Unknown
character set ("+charset+ ')', "Warning: Unknown character set
("+HTMLEncoder.encode(charset)+ ')',
"<p><b>Unknown character set</b> The
page you are about to display has an unknown character set. "+
"This means that we are not able to
filter the page, and it may compromize your anonymity.", explanation);
}
Modified: trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -986,7 +986,7 @@
if(quote != ' ') out.append(quote);
out.append(unescapeData());
if(quote != ' ') out.append(quote);
- if(url) out.append(")");
+ if(url) out.append(')');
out.append(suffix);
return out.toString();
}
@@ -1412,7 +1412,7 @@
case 26:
{ String s = yytext();
s = s.substring("@media".length()).trim();
- w.write("@media "+s+" ");
+ w.write("@media "+s+ ' ');
if(debug) log("Matched @media: "+s);
}
case 43: break;
Modified:
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
===================================================================
---
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
2006-11-16 22:09:46 UTC (rev 10960)
+++
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -41,7 +41,7 @@
public GenericReadFilterCallback(FreenetURI uri, FoundURICallback cb) {
try {
- this.baseURI = new URI("/" + uri.toString(false));
+ this.baseURI = new URI('/' + uri.toString(false));
this.cb = cb;
} catch (URISyntaxException e) {
throw new Error(e);
@@ -140,7 +140,7 @@
}
if(GenericReadFilterCallback.allowedProtocols.contains(uri.getScheme()))
- return
"/?"+GenericReadFilterCallback.magicHTTPEscapeString+"="+uri;
+ return
"/?"+GenericReadFilterCallback.magicHTTPEscapeString+ '=' +uri;
else {
if(uri.getScheme() == null) {
throw new CommentException("Invalid freenet
URL: "+reason);
@@ -184,7 +184,7 @@
// Now what about the queries?
HTTPRequest req = new HTTPRequest(uri);
if(cb != null) cb.foundURI(furi);
- return finishProcess(req, overrideType, "/" +
furi.toString(false), uri, noRelative);
+ return finishProcess(req, overrideType, '/' +
furi.toString(false), uri, noRelative);
}
public String onBaseHref(String baseHref) {
Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -58,7 +58,7 @@
HTMLNode explanation = new HTMLNode("p");
explanation.addChild("b", "Unknown character set!");
explanation.addChild("#", " The page you are about to
display has an unknown character set. This means that we are not able to filter
the page, and it may compromize your anonymity.");
- throw new DataFilterException("Warning: Unknown
character set ("+charset+")", "Warning: Unknown character set
("+HTMLEncoder.encode(charset)+")",
+ throw new DataFilterException("Warning: Unknown
character set ("+charset+ ')', "Warning: Unknown character set
("+HTMLEncoder.encode(charset)+ ')',
"<p><b>Unknown character set</b> The
page you are about to display has an unknown character set. "+
"This means that we are not able to
filter the page, and it may compromize your anonymity.", explanation);
}
@@ -503,7 +503,7 @@
}
}
if (safe)
- err += element + " ";
+ err += element + ' ';
err += "-->";
// FIXME: Hmmm, why did we just do all
this, err is not
// used beyond this point... (avian)
Modified: trunk/freenet/src/freenet/config/FilePersistentConfig.java
===================================================================
--- trunk/freenet/src/freenet/config/FilePersistentConfig.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/config/FilePersistentConfig.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -114,7 +114,7 @@
Iterator i = origConfigFileContents.keyIterator();
while(i.hasNext()) {
String key = (String) i.next();
- Logger.error(this, "Unknown option: "+key+"
(value="+origConfigFileContents.get(key)+")");
+ Logger.error(this, "Unknown option: "+key+"
(value="+origConfigFileContents.get(key)+ ')');
}
origConfigFileContents = null;
}
@@ -191,7 +191,7 @@
String val, name;
synchronized(this) {
if(finishedInit)
- throw new
IllegalStateException("onRegister("+config+":"+o+") called after finishedInit()
!!");
+ throw new
IllegalStateException("onRegister("+config+ ':' +o+") called after
finishedInit() !!");
if(origConfigFileContents == null) return;
name =
config.prefix+SimpleFieldSet.MULTI_LEVEL_CHAR+o.name;
val = origConfigFileContents.get(name);
Modified: trunk/freenet/src/freenet/crypt/DSA.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSA.java 2006-11-16 22:09:46 UTC (rev
10960)
+++ trunk/freenet/src/freenet/crypt/DSA.java 2006-11-16 22:49:45 UTC (rev
10961)
@@ -163,11 +163,11 @@
}
System.out.println("Total time signing:
"+totalTimeSigning);
System.out.println("Total time verifying:
"+totalTimeVerifying);
- System.out.println("Total R size: "+totalRSize+" (max
"+maxRSize+")");
- System.out.println("Total S size: "+totalSSize+" (max
"+maxSSize+")");
+ System.out.println("Total R size: "+totalRSize+" (max
"+maxRSize+ ')');
+ System.out.println("Total S size: "+totalSSize+" (max
"+maxSSize+ ')');
System.out.println("Total R unsigned bitsize:
"+totalRUnsignedBitSize);
- System.out.println("Total pub key size:
"+totalPubKeySize+" (max "+maxPubKeySize+")");
- System.out.println("Total priv key size:
"+totalPrivKeySize+" (max "+maxPrivKeySize+")");
+ System.out.println("Total pub key size:
"+totalPubKeySize+" (max "+maxPubKeySize+ ')');
+ System.out.println("Total priv key size:
"+totalPrivKeySize+" (max "+maxPrivKeySize+ ')');
}
}
}
Modified: trunk/freenet/src/freenet/crypt/DSAGroup.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSAGroup.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/crypt/DSAGroup.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -63,7 +63,7 @@
// yea, i know, don't catch NPEs .. but _some_ JVMs don't
// throw the NFE like they are supposed to (*cough* kaffe)
throw new NumberFormatException(e + " while converting "
- + pAsHexString + "," + qAsHexString + " and "
+ + pAsHexString + ',' + qAsHexString + " and "
+ gAsHexString + " to integers");
}
}
Modified: trunk/freenet/src/freenet/crypt/DSAGroupGenerator.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSAGroupGenerator.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/crypt/DSAGroupGenerator.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -75,7 +75,7 @@
// 4: Check that q is prime, and 2q+1 is prime
// 5: If not, restart from step 1
- System.out.println("Maybe got prime: "+q.toString(16)+ "
("+q.bitLength()+")");
+ System.out.println("Maybe got prime: "+q.toString(16)+ "
("+q.bitLength()+ ')');
if(!isPrime(q))
return false;
@@ -136,8 +136,8 @@
private static void finish(RandomSource r, int hashLength,
NativeBigInteger p, NativeBigInteger q, byte[] seed, int counter) {
System.out.println("SEED: "+HexUtil.bytesToHex(seed));
System.out.println("COUNTER: "+counter);
- System.out.println("p: "+p.toString(16)+" ("+p.bitLength()+")");
- System.out.println("q: "+q.toString(16)+" ("+q.bitLength()+")");
+ System.out.println("p: "+p.toString(16)+" ("+p.bitLength()+ ')');
+ System.out.println("q: "+q.toString(16)+" ("+q.bitLength()+ ')');
// Now generate g (algorithm from appendix 4 of FIPS 186-2)
NativeBigInteger g;
do {
@@ -149,7 +149,7 @@
g = (NativeBigInteger) h.modPow(e, p);
} while (g.equals(BigInteger.ONE));
DSAGroup group = new DSAGroup(p, q, g);
- System.out.println("g: "+g.toHexString()+" ("+g.bitLength()+")");
+ System.out.println("g: "+g.toHexString()+" ("+g.bitLength()+ ')');
System.out.println("Group: "+group.verboseToString());
long totalSigTime = 0;
long totalVerifyTime = 0;
Modified: trunk/freenet/src/freenet/crypt/DSASignature.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSASignature.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/crypt/DSASignature.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -71,7 +71,7 @@
public String toString() {
if(toStringCached == null)
- toStringCached = HexUtil.biToHex(r) + "," +
HexUtil.biToHex(s);
+ toStringCached = HexUtil.biToHex(r) + ',' +
HexUtil.biToHex(s);
return toStringCached;
}
Modified: trunk/freenet/src/freenet/crypt/DiffieHellman.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DiffieHellman.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/crypt/DiffieHellman.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -106,7 +106,7 @@
NativeBigInteger[] params = getParams();
long time2 = System.currentTimeMillis();
if((time2 - time1) > 300) {
- Logger.error(null, "DiffieHellman.generateContext():
time2 is more than 300ms after time1 ("+(time2 - time1)+")");
+ Logger.error(null, "DiffieHellman.generateContext():
time2 is more than 300ms after time1 ("+(time2 - time1)+ ')');
}
return new DiffieHellmanContext(params[0], params[1], group);
}
Modified: trunk/freenet/src/freenet/crypt/StationToStationContext.java
===================================================================
--- trunk/freenet/src/freenet/crypt/StationToStationContext.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/crypt/StationToStationContext.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -94,7 +94,7 @@
MessageDigest md = SHA256.getMessageDigest();
- String message = "(" + myExponential + "," + hisExponential + ")";
+ String message = "(" + myExponential + ',' + hisExponential + ')';
DSASignature signature = DSA.sign(group, myPrivateKey, new
BigInteger(md.digest(message.getBytes())), random);
if(logMINOR)
@@ -125,7 +125,7 @@
ByteArrayInputStream is = new ByteArrayInputStream(data);
EncipherInputStream ei = new EncipherInputStream(is, getCipher());
- final String message = "(" + hisExponential + "," + myExponential + ")";
+ final String message = "(" + hisExponential + ',' + myExponential + ')';
MessageDigest md = SHA256.getMessageDigest();
try{
Modified: trunk/freenet/src/freenet/crypt/ciphers/Rijndael_Algorithm.java
===================================================================
--- trunk/freenet/src/freenet/crypt/ciphers/Rijndael_Algorithm.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/crypt/ciphers/Rijndael_Algorithm.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -42,9 +42,9 @@
static void debug (String s) { err.println(">>> "+NAME+": "+s); }
static void trace (boolean in, String s) {
- if (TRACE) err.println((in?"==> ":"<== ")+NAME+"."+s);
+ if (TRACE) err.println((in?"==> ":"<== ")+NAME+ '.' +s);
}
- static void trace (String s) { if (TRACE) err.println("<=> "+NAME+"."+s); }
+ static void trace (String s) { if (TRACE) err.println("<=> "+NAME+ '.'
+s); }
// Constants and variables
@@ -315,7 +315,7 @@
*/
public static final void
blockEncrypt (byte[] in, byte[] result, int inOffset, Object sessionKey) {
-if (RDEBUG) trace(IN, "blockEncrypt("+in+", "+inOffset+", "+sessionKey+")");
+if (RDEBUG) trace(IN, "blockEncrypt("+in+", "+inOffset+", "+sessionKey+ ')');
int[][] Ke = (int[][]) ((Object[]) sessionKey)[0]; // extract
encryption round keys
int ROUNDS = Ke.length - 1;
int[] Ker = Ke[0];
@@ -361,7 +361,7 @@
t1 = a1;
t2 = a2;
t3 = a3;
-if (RDEBUG && (debuglevel > 6))
System.out.println("CT"+r+"="+intToString(t0)+intToString(t1)+intToString(t2)+intToString(t3));
+if (RDEBUG && (debuglevel > 6)) System.out.println("CT"+r+ '='
+intToString(t0)+intToString(t1)+intToString(t2)+intToString(t3));
}
// last round is special
@@ -404,7 +404,7 @@
*/
public static final void
blockDecrypt (byte[] in, byte[] result, int inOffset, Object sessionKey) {
-if (RDEBUG) trace(IN, "blockDecrypt("+in+", "+inOffset+", "+sessionKey+")");
+if (RDEBUG) trace(IN, "blockDecrypt("+in+", "+inOffset+", "+sessionKey+ ')');
int[][] Kd = (int[][]) ((Object[]) sessionKey)[1]; // extract
decryption round keys
int ROUNDS = Kd.length - 1;
int[] Kdr = Kd[0];
@@ -450,7 +450,7 @@
t1 = a1;
t2 = a2;
t3 = a3;
-if (RDEBUG && (debuglevel > 6))
System.out.println("PT"+r+"="+intToString(t0)+intToString(t1)+intToString(t2)+intToString(t3));
+if (RDEBUG && (debuglevel > 6)) System.out.println("PT"+r+ '='
+intToString(t0)+intToString(t1)+intToString(t2)+intToString(t3));
}
// last round is special
@@ -511,7 +511,7 @@
//CPU will result in fewer cache misses. -- ejhuff 2003-10-12
public final static synchronized Object makeKey (byte[] k, int blockSize)
throws InvalidKeyException {
-if (RDEBUG) trace(IN, "makeKey("+k+", "+blockSize+")");
+if (RDEBUG) trace(IN, "makeKey("+k+", "+blockSize+ ')');
if (k == null)
throw new InvalidKeyException("Empty key");
if (!((k.length == 16) || (k.length == 24) || (k.length == 32)))
@@ -611,7 +611,7 @@
blockEncrypt(in, result, inOffset, sessionKey);
return;
}
-if (RDEBUG) trace(IN, "blockEncrypt("+in+", "+inOffset+", "+sessionKey+",
"+blockSize+")");
+if (RDEBUG) trace(IN, "blockEncrypt("+in+", "+inOffset+", "+sessionKey+",
"+blockSize+ ')');
Object[] sKey = (Object[]) sessionKey; // extract encryption round keys
int[][] Ke = (int[][]) sKey[0];
@@ -638,7 +638,7 @@
T3[(t[(i + s2) % BC] >>> 8) & 0xFF] ^
T4[ t[(i + s3) % BC] & 0xFF] ) ^ Ke[r][i];
System.arraycopy(a, 0, t, 0, BC);
-if (RDEBUG && (debuglevel > 6)) System.out.println("CT"+r+"="+toString(t));
+if (RDEBUG && (debuglevel > 6)) System.out.println("CT"+r+ '=' +toString(t));
}
for (i = 0; i < BC; i++) { // last round is special
tt = Ke[ROUNDS][i];
@@ -670,7 +670,7 @@
return;
}
-if (RDEBUG) trace(IN, "blockDecrypt("+in+", "+inOffset+", "+sessionKey+",
"+blockSize+")");
+if (RDEBUG) trace(IN, "blockDecrypt("+in+", "+inOffset+", "+sessionKey+",
"+blockSize+ ')');
Object[] sKey = (Object[]) sessionKey; // extract decryption round keys
int[][] Kd = (int[][]) sKey[1];
@@ -697,7 +697,7 @@
T7[(t[(i + s2) % BC] >>> 8) & 0xFF] ^
T8[ t[(i + s3) % BC] & 0xFF] ) ^ Kd[r][i];
System.arraycopy(a, 0, t, 0, BC);
-if (RDEBUG && (debuglevel > 6)) System.out.println("PT"+r+"="+toString(t));
+if (RDEBUG && (debuglevel > 6)) System.out.println("PT"+r+ '=' +toString(t));
}
for (i = 0; i < BC; i++) { // last round is special
tt = Kd[ROUNDS][i];
@@ -715,7 +715,7 @@
/** A basic symmetric encryption/decryption test for a given key size. */
private static boolean self_test (int keysize) {
-if (RDEBUG) trace(IN, "self_test("+keysize+")");
+if (RDEBUG) trace(IN, "self_test("+keysize+ ')');
boolean ok = false;
try {
byte[] kb = new byte[keysize];
Modified: trunk/freenet/src/freenet/crypt/ciphers/Twofish_Algorithm.java
===================================================================
--- trunk/freenet/src/freenet/crypt/ciphers/Twofish_Algorithm.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/crypt/ciphers/Twofish_Algorithm.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -49,9 +49,9 @@
static void debug (String s) { err.println(">>> "+NAME+": "+s); }
static void trace (boolean in, String s) {
- if (TRACE) err.println((in?"==> ":"<== ")+NAME+"."+s);
+ if (TRACE) err.println((in?"==> ":"<== ")+NAME+ '.' +s);
}
- static void trace (String s) { if (TRACE) err.println("<=> "+NAME+"."+s); }
+ static void trace (String s) { if (TRACE) err.println("<=> "+NAME+ '.' +s);
}
// Constants and variables
@@ -343,7 +343,7 @@
*/
public static final synchronized Object makeKey (byte[] k)
throws InvalidKeyException {
-if (TDEBUG) trace(IN, "makeKey("+k+")");
+if (TDEBUG) trace(IN, "makeKey("+k+ ')');
if (k == null)
throw new InvalidKeyException("Empty key");
int length = k.length;
@@ -459,7 +459,7 @@
*/
public static final void
blockEncrypt (byte[] in, byte[] result, int inOffset, Object sessionKey) {
-if (TDEBUG) trace(IN, "blockEncrypt("+in+", "+inOffset+", "+sessionKey+")");
+if (TDEBUG) trace(IN, "blockEncrypt("+in+", "+inOffset+", "+sessionKey+ ')');
Object[] sk = (Object[]) sessionKey; // extract S-box and session key
int[] sBox = (int[]) sk[0];
int[] sKey = (int[]) sk[1];
@@ -498,7 +498,7 @@
x2 = x2 >>> 1 | x2 << 31;
x3 = x3 << 1 | x3 >>> 31;
x3 ^= t0 + 2*t1 + sKey[k++];
-if (TDEBUG && (debuglevel > 6))
System.out.println("CT"+(R)+"="+intToString(x0)+intToString(x1)+intToString(x2)+intToString(x3));
+if (TDEBUG && (debuglevel > 6)) System.out.println("CT"+(R)+ '='
+intToString(x0)+intToString(x1)+intToString(x2)+intToString(x3));
t0 = Fe32_0( sBox, x2 );
t1 = Fe32_3( sBox, x3 );
@@ -506,7 +506,7 @@
x0 = x0 >>> 1 | x0 << 31;
x1 = x1 << 1 | x1 >>> 31;
x1 ^= t0 + 2*t1 + sKey[k++];
-if (TDEBUG && (debuglevel > 6))
System.out.println("CT"+(R+1)+"="+intToString(x0)+intToString(x1)+intToString(x2)+intToString(x3));
+if (TDEBUG && (debuglevel > 6)) System.out.println("CT"+(R+1)+ '='
+intToString(x0)+intToString(x1)+intToString(x2)+intToString(x3));
}
x2 ^= sKey[OUTPUT_WHITEN ];
x3 ^= sKey[OUTPUT_WHITEN + 1];
@@ -547,7 +547,7 @@
*/
public static final void
blockDecrypt (byte[] in, byte[] result, int inOffset, Object sessionKey) {
-if (TDEBUG) trace(IN, "blockDecrypt("+in+", "+inOffset+", "+sessionKey+")");
+if (TDEBUG) trace(IN, "blockDecrypt("+in+", "+inOffset+", "+sessionKey+ ')');
Object[] sk = (Object[]) sessionKey; // extract S-box and session key
int[] sBox = (int[]) sk[0];
int[] sKey = (int[]) sk[1];
@@ -586,7 +586,7 @@
x1 = x1 >>> 1 | x1 << 31;
x0 = x0 << 1 | x0 >>> 31;
x0 ^= t0 + t1 + sKey[k--];
-if (TDEBUG && (debuglevel > 6))
System.out.println("PT"+(ROUNDS-R)+"="+intToString(x2)+intToString(x3)+intToString(x0)+intToString(x1));
+if (TDEBUG && (debuglevel > 6)) System.out.println("PT"+(ROUNDS-R)+ '='
+intToString(x2)+intToString(x3)+intToString(x0)+intToString(x1));
t0 = Fe32_0( sBox, x0 );
t1 = Fe32_3( sBox, x1 );
@@ -594,7 +594,7 @@
x3 = x3 >>> 1 | x3 << 31;
x2 = x2 << 1 | x2 >>> 31;
x2 ^= t0 + t1 + sKey[k--];
-if (TDEBUG && (debuglevel > 6))
System.out.println("PT"+(ROUNDS-R-1)+"="+intToString(x2)+intToString(x3)+intToString(x0)+intToString(x1));
+if (TDEBUG && (debuglevel > 6)) System.out.println("PT"+(ROUNDS-R-1)+ '='
+intToString(x2)+intToString(x3)+intToString(x0)+intToString(x1));
}
x0 ^= sKey[INPUT_WHITEN ];
x1 ^= sKey[INPUT_WHITEN + 1];
@@ -732,7 +732,7 @@
/** A basic symmetric encryption/decryption test for a given key size. */
private static boolean self_test (int keysize) {
-if (TDEBUG) trace(IN, "self_test("+keysize+")");
+if (TDEBUG) trace(IN, "self_test("+keysize+ ')');
boolean ok = false;
try {
byte[] kb = new byte[keysize];
Modified: trunk/freenet/src/freenet/frost/message/FrostMessage.java
===================================================================
--- trunk/freenet/src/freenet/frost/message/FrostMessage.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/frost/message/FrostMessage.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -243,11 +243,11 @@
key = new FreenetURI(
new StringBuffer()
.append(board.getPrivateKey())
- .append("/")
+ .append('/')
.append(board.getName())
- .append("/")
+ .append('/')
.append(this.getDateStr(false))
- .append("-")
+ .append('-')
.append(index)
.append(".xml")
.toString());
@@ -256,11 +256,11 @@
new StringBuffer()
.append("frost|message|")
.append(this.getMessageBase())
- .append("|")
+ .append('|')
.append(this.getDateStr(false))
- .append("-")
+ .append('-')
.append(board.getName())
- .append("-")
+ .append('-')
.append(index)
.append(".xml")
.toString());
Modified: trunk/freenet/src/freenet/io/AddressIdentifier.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressIdentifier.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/io/AddressIdentifier.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -66,7 +66,7 @@
return AddressType.IPv4;
}
String wordRegex = "([0-9a-fA-F]{1,4})";
- String ipv6AddressRegex = wordRegex + "?:" + wordRegex + ":" +
wordRegex + ":" + wordRegex + ":" + wordRegex + ":" + wordRegex + ":" +
wordRegex + ":" + wordRegex;
+ String ipv6AddressRegex = wordRegex + "?:" + wordRegex + ':' +
wordRegex + ':' + wordRegex + ':' + wordRegex + ':' + wordRegex + ':' +
wordRegex + ':' + wordRegex;
if (Pattern.matches(ipv6AddressRegex, address)) {
return AddressType.IPv6;
}
Modified: trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/io/comm/FreenetInetAddress.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -60,7 +60,7 @@
// debugging log messages because AddressIdentifier doesn't appear to
handle all IPv6 literals correctly, such as "fe80::204:1234:dead:beef"
AddressIdentifier.AddressType addressType =
AddressIdentifier.getAddressType(host);
boolean logDEBUG = Logger.shouldLog(Logger.DEBUG, this);
- if(logDEBUG) Logger.debug(this, "Address type of '"+host+"' appears to
be '"+addressType+"'");
+ if(logDEBUG) Logger.debug(this, "Address type of '"+host+"' appears to
be '"+addressType+ '\'');
if(!addressType.toString().equals("Other")) {
try {
addr = InetAddress.getByName(host);
@@ -68,16 +68,16 @@
if(!allowUnknown) throw e;
addr = null;
}
- if(logDEBUG) Logger.debug(this, "host is '"+host+"' and
addr.getHostAddress() is '"+addr.getHostAddress()+"'");
+ if(logDEBUG) Logger.debug(this, "host is '"+host+"' and
addr.getHostAddress() is '"+addr.getHostAddress()+ '\'');
if(addr != null && addr.getHostAddress().equals(host)) {
- if(logDEBUG) Logger.debug(this, "'"+host+"' looks like an IP
address");
+ if(logDEBUG) Logger.debug(this, '\'' +host+"' looks like an IP
address");
host = null;
} else {
addr = null;
}
}
if( addr == null ) {
- if(logDEBUG) Logger.debug(this, "'"+host+"' does not look like
an IP address");
+ if(logDEBUG) Logger.debug(this, '\'' +host+"' does not look
like an IP address");
}
this._address = addr;
this.hostname = host;
@@ -198,7 +198,7 @@
*/
try {
InetAddress addr = InetAddress.getByName(hostname);
- if(logMINOR) Logger.minor(this, "Look up got
'"+addr+"'");
+ if(logMINOR) Logger.minor(this, "Look up got '"+addr+
'\'');
if( addr != null ) {
/*
* cache the answer since getHandshakeAddress()
Modified: trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -60,7 +60,7 @@
totalbytesout += (outbytes>0)?outbytes:0;
totalbytesin += (inbytes>0)?inbytes:0;
if(Logger.shouldLog(Logger.MINOR,
IOStatisticCollector.class))
- Logger.minor(IOStatisticCollector.class,
"Add("+key+","+inbytes+","+outbytes+" -> "+totalbytesin+" : "+totalbytesout);
+ Logger.minor(IOStatisticCollector.class,
"Add("+key+ ',' +inbytes+ ',' +outbytes+" -> "+totalbytesin+" :
"+totalbytesout);
}
}
@@ -138,8 +138,8 @@
int in = (int) ((tin*10.0) / (divby*(i+1)));
int out =(int) ((tout*10.0) /(divby*(i+1)));
- System.err.print("i:" + (in/10) + "." +
(in%10));
- System.err.print(" o:" + (out/10) + "." +
(out%10));
+ System.err.print("i:" + (in/10) + '.' +
(in%10));
+ System.err.print(" o:" + (out/10) + '.' +
(out%10));
System.err.print(" \t");
}
System.err.println();
Modified: trunk/freenet/src/freenet/io/comm/Message.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Message.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/io/comm/Message.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -187,10 +187,10 @@
for (Iterator i = _spec.getFields().keySet().iterator();
i.hasNext();) {
ret.append(comma);
String name = (String) i.next();
- ret.append(name).append("=").append(_payload.get(name));
+ ret.append(name).append('=').append(_payload.get(name));
comma = ", ";
}
- ret.append("}");
+ ret.append('}');
return ret.toString();
}
Modified: trunk/freenet/src/freenet/io/comm/MessageType.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageType.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/io/comm/MessageType.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -101,7 +101,7 @@
public static MessageType getSpec(Integer specID) {
if (!_specs.containsKey(specID)) {
- Logger.error(MessageType.class, "Unrecognised message
type received (" + specID + ")");
+ Logger.error(MessageType.class, "Unrecognised message
type received (" + specID + ')');
return null;
}
return (MessageType) _specs.get(specID);
Modified: trunk/freenet/src/freenet/io/comm/Peer.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Peer.java 2006-11-16 22:09:46 UTC (rev
10960)
+++ trunk/freenet/src/freenet/io/comm/Peer.java 2006-11-16 22:49:45 UTC (rev
10961)
@@ -177,7 +177,7 @@
}
public String toString() {
- return addr.toString() + ":" + _port;
+ return addr.toString() + ':' + _port;
}
public void writeToDataOutputStream(DataOutputStream dos) throws
IOException {
Modified: trunk/freenet/src/freenet/io/comm/UdpSocketManager.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/UdpSocketManager.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/io/comm/UdpSocketManager.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -326,10 +326,10 @@
boolean matched = false;
if ((!(m.getSpec().equals(DMT.packetTransmit))) && logMINOR) {
if ((m.getSpec().equals(DMT.ping) ||
m.getSpec().equals(DMT.pong)) && Logger.shouldLog(Logger.DEBUG, this)) {
- Logger.debug(this, "" +
(System.currentTimeMillis() % 60000) + " " + _sock.getLocalPort() + " <- "
+ Logger.debug(this, "" +
(System.currentTimeMillis() % 60000) + ' ' + _sock.getLocalPort() + " <- "
+ m.getSource() + " : " + m);
} else {
- Logger.minor(this, "" +
(System.currentTimeMillis() % 60000) + " " + _sock.getLocalPort() + " <- "
+ Logger.minor(this, "" +
(System.currentTimeMillis() % 60000) + ' ' + _sock.getLocalPort() + " <- "
+ m.getSource() + " : " + m);
}
}
@@ -522,10 +522,10 @@
}
if ((m.getSpec().equals(DMT.ping) ||
m.getSpec().equals(DMT.pong)) && logMINOR) {
if(Logger.shouldLog(Logger.DEBUG, this))
- Logger.debug(this, "" +
(System.currentTimeMillis() % 60000) + " " + _sock.getPort() + " -> " +
destination
+ Logger.debug(this, "" +
(System.currentTimeMillis() % 60000) + ' ' + _sock.getPort() + " -> " +
destination
+ " : " + m);
} else {
- if(logMINOR) Logger.minor(this, "" +
(System.currentTimeMillis() % 60000) + " " + _sock.getPort() + " -> " +
destination
+ if(logMINOR) Logger.minor(this, "" +
(System.currentTimeMillis() % 60000) + ' ' + _sock.getPort() + " -> " +
destination
+ " : " + m);
}
// byte[] blockToSend = m.encodeToPacket(lowLevelFilter,
destination);
Modified: trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java
===================================================================
--- trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/io/xfer/BlockTransmitter.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -254,10 +254,10 @@
_sendComplete = true;
_senderThread.notifyAll();
}
- Logger.error(this, "Terminating send
"+_uid+" to "+_destination+" from "+_usm.getPortNumber()+" as we haven't heard
from receiver in "+TimeUtil.formatTime((now - timeAllSent), 2, true)+".");
+ Logger.error(this, "Terminating send
"+_uid+" to "+_destination+" from "+_usm.getPortNumber()+" as we haven't heard
from receiver in "+TimeUtil.formatTime((now - timeAllSent), 2, true)+ '.');
return false;
} else {
- if(logMINOR) Logger.minor(this,
"Ignoring timeout: timeAllSent="+timeAllSent+" ("+(System.currentTimeMillis() -
timeAllSent)+"), getNumSent="+getNumSent()+"/"+_prb.getNumPackets());
+ if(logMINOR) Logger.minor(this,
"Ignoring timeout: timeAllSent="+timeAllSent+" ("+(System.currentTimeMillis() -
timeAllSent)+"), getNumSent="+getNumSent()+ '/' +_prb.getNumPackets());
continue;
}
} else if
(msg.getSpec().equals(DMT.missingPacketNotification)) {
Modified: trunk/freenet/src/freenet/keys/ClientCHK.java
===================================================================
--- trunk/freenet/src/freenet/keys/ClientCHK.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/keys/ClientCHK.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -115,9 +115,9 @@
}
public String toString() {
- return super.toString()+":"+Base64.encode(routingKey)+","+
-
Base64.encode(cryptoKey)+","+compressionAlgorithm+","+controlDocument+
- ","+cryptoAlgorithm;
+ return super.toString()+ ':' +Base64.encode(routingKey)+ ',' +
+ Base64.encode(cryptoKey)+ ',' +compressionAlgorithm+ ','
+controlDocument+
+ ',' +cryptoAlgorithm;
}
public Key getNodeKey() {
Modified: trunk/freenet/src/freenet/keys/FreenetURI.java
===================================================================
--- trunk/freenet/src/freenet/keys/FreenetURI.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/keys/FreenetURI.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -524,7 +524,7 @@
}
if (metaStr != null) {
for (int i = 0; i < metaStr.length; i++) {
- b.append("/").append(metaStr[i]);
+ b.append('/').append(metaStr[i]);
}
}
return b.toString();
@@ -549,7 +549,7 @@
}
if (metaStr != null) {
for (int i = 0; i < metaStr.length; i++) {
- b.append("/").append(metaStr[i]);
+ b.append('/').append(metaStr[i]);
}
}
return b.toString();
@@ -721,7 +721,7 @@
if(logMINOR) Logger.minor(this, "Sanitized name "+i+" =
"+s);
if(s.length() > 0) {
if(out.length() > 0)
- out.append("-");
+ out.append('-');
out.append(s);
}
}
Modified: trunk/freenet/src/freenet/keys/NodeCHK.java
===================================================================
--- trunk/freenet/src/freenet/keys/NodeCHK.java 2006-11-16 22:09:46 UTC (rev
10960)
+++ trunk/freenet/src/freenet/keys/NodeCHK.java 2006-11-16 22:49:45 UTC (rev
10961)
@@ -36,7 +36,7 @@
}
public String toString() {
- return super.toString() +
"@"+Base64.encode(routingKey)+":"+Integer.toHexString(hash);
+ return super.toString() + '@' +Base64.encode(routingKey)+ ':'
+Integer.toHexString(hash);
}
public final void write(DataOutput _index) throws IOException {
Modified: trunk/freenet/src/freenet/keys/USK.java
===================================================================
--- trunk/freenet/src/freenet/keys/USK.java 2006-11-16 22:09:46 UTC (rev
10960)
+++ trunk/freenet/src/freenet/keys/USK.java 2006-11-16 22:49:45 UTC (rev
10961)
@@ -126,6 +126,6 @@
}
public String toString() {
- return super.toString()+":"+getURI();
+ return super.toString()+ ':' +getURI();
}
}
Modified: trunk/freenet/src/freenet/node/FNPPacketMangler.java
===================================================================
--- trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/FNPPacketMangler.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -174,7 +174,7 @@
int byte1 = ((pcfb.decipher(buf[dataStart-2])) & 0xff);
int byte2 = ((pcfb.decipher(buf[dataStart-1])) & 0xff);
int dataLength = (byte1 << 8) + byte2;
- if(logMINOR) Logger.minor(this, "Data length: "+dataLength+" (1 =
"+byte1+" 2 = "+byte2+")");
+ if(logMINOR) Logger.minor(this, "Data length: "+dataLength+" (1 =
"+byte1+" 2 = "+byte2+ ')');
if(dataLength > length - (ivLength+hash.length+2)) {
if(logMINOR) Logger.minor(this, "Invalid data length
"+dataLength+" ("+(length - (ivLength+hash.length+2))+") in tryProcessAuth");
return false;
@@ -205,7 +205,7 @@
private void processDecryptedAuth(byte[] payload, PeerNode pn, Peer
replyTo) {
if(logMINOR) Logger.minor(this, "Processing decrypted auth packet from
"+replyTo+" for "+pn);
if(pn.isDisabled()) {
- if(logMINOR) Logger.minor(this, "Won't connect to a disabled
peer ("+pn+")");
+ if(logMINOR) Logger.minor(this, "Won't connect to a disabled
peer ("+pn+ ')');
return; // We don't connect to disabled peers
}
@@ -515,7 +515,7 @@
pcfb.blockDecipher(hash, 0, HASH_LENGTH);
int dataLength = payload.length - (ivLength + HASH_LENGTH + 3);
if(dataLength < 0) {
- Logger.error(this, "Decrypted data length: "+dataLength+" but
payload.length "+payload.length+" (others: "+(ivLength + HASH_LENGTH+3)+")");
+ Logger.error(this, "Decrypted data length: "+dataLength+" but
payload.length "+payload.length+" (others: "+(ivLength + HASH_LENGTH+3)+ ')');
return null;
}
byte[] data = new byte[dataLength];
@@ -607,7 +607,7 @@
if(logMINOR) Logger.minor(this, "Tracker == null");
return false;
}
- if(logMINOR) Logger.minor(this,"Entering tryProcess:
"+Fields.hashCode(buf)+","+offset+","+length+","+tracker);
+ if(logMINOR) Logger.minor(this,"Entering tryProcess:
"+Fields.hashCode(buf)+ ',' +offset+ ',' +length+ ',' +tracker);
/**
* E_pcbc_session(H(seq+random+data)) E_pcfb_session(seq+random+data)
*
@@ -653,7 +653,7 @@
int targetSeqNumber = tracker.highestReceivedIncomingSeqNumber();
if(logMINOR) Logger.minor(this, "Target seq: "+targetSeqNumber);
- if(logMINOR) Logger.minor(this, "Sequence number:
"+seqNumber+"="+Integer.toHexString(seqNumber));
+ if(logMINOR) Logger.minor(this, "Sequence number: "+seqNumber+ '='
+Integer.toHexString(seqNumber));
if(seqNumber == -1) {
// Ack/resendreq-only packet
@@ -889,7 +889,7 @@
if(!dontRequeue) {
requeueLogString = ", requeueing";
}
- if(logMINOR) Logger.minor(this, "processOutgoingOrRequeue
"+messages.length+" messages for "+pn+" ("+neverWaitForPacketNumber+")");
+ if(logMINOR) Logger.minor(this, "processOutgoingOrRequeue
"+messages.length+" messages for "+pn+" ("+neverWaitForPacketNumber+ ')');
byte[][] messageData = new byte[messages.length][];
int[] alreadyReported = new int[messages.length];
MessageItem[] newMsgs = new MessageItem[messages.length];
@@ -1090,7 +1090,7 @@
*/
private void innerProcessOutgoing(byte[][] messageData, int start, int
length, int bufferLength,
PeerNode pn, boolean neverWaitForPacketNumber,
AsyncMessageCallback[] callbacks, int alreadyReportedBytes) throws
NotConnectedException, WouldBlockException, PacketSequenceException {
- if(logMINOR) Logger.minor(this,
"innerProcessOutgoing(...,"+start+","+length+","+bufferLength+")");
+ if(logMINOR) Logger.minor(this, "innerProcessOutgoing(...,"+start+ ','
+length+ ',' +bufferLength+ ')');
byte[] buf = new byte[bufferLength];
buf[0] = (byte)length;
int loc = 1;
@@ -1236,7 +1236,7 @@
*/
public void processOutgoingPreformatted(byte[] buf, int offset, int
length, KeyTracker tracker, int packetNumber, AsyncMessageCallback[] callbacks,
int alreadyReportedBytes) throws KeyChangedException, NotConnectedException,
PacketSequenceException, WouldBlockException {
if(logMINOR) {
- String log =
"processOutgoingPreformatted("+Fields.hashCode(buf)+",
"+offset+","+length+","+tracker+","+packetNumber+",";
+ String log =
"processOutgoingPreformatted("+Fields.hashCode(buf)+", "+offset+ ',' +length+
',' +tracker+ ',' +packetNumber+ ',';
if(callbacks == null) log += "null";
else log += (""+callbacks.length+(callbacks.length >= 1 ?
String.valueOf(callbacks[0]) : ""));
Logger.minor(this, log);
Modified: trunk/freenet/src/freenet/node/InsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertHandler.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/InsertHandler.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -336,7 +336,7 @@
totalSent += sender.getTotalSentBytes();
totalReceived += sender.getTotalReceivedBytes();
}
- if(logMINOR) Logger.minor(this, "Remote CHK insert cost
"+totalSent+"/"+totalReceived+" bytes ("+code+")");
+ if(logMINOR) Logger.minor(this, "Remote CHK insert cost
"+totalSent+ '/' +totalReceived+" bytes ("+code+ ')');
node.remoteChkInsertBytesSentAverage.report(totalSent);
node.remoteChkInsertBytesReceivedAverage.report(totalReceived);
}
Modified: trunk/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyTracker.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/KeyTracker.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -155,7 +155,7 @@
long urgentTime;
public String toString() {
- return super.toString()+": packet "+packetNumber+"
urgent@"+urgentTime+"("+(System.currentTimeMillis()-urgentTime)+")";
+ return super.toString()+": packet "+packetNumber+"
urgent@"+urgentTime+ '(' +(System.currentTimeMillis()-urgentTime)+ ')';
}
}
@@ -343,7 +343,7 @@
public void onAcked() {
long t = Math.max(0, System.currentTimeMillis() -
createdTime);
pn.pingAverage.report(t);
- if(logMINOR) Logger.minor(this, "Reported round-trip
time of "+TimeUtil.formatTime(t, 2, true)+" on "+pn.getPeer()+" (avg
"+TimeUtil.formatTime((long)pn.pingAverage.currentValue(),2,true)+",
#"+packetNumber+")");
+ if(logMINOR) Logger.minor(this, "Reported round-trip
time of "+TimeUtil.formatTime(t, 2, true)+" on "+pn.getPeer()+" (avg
"+TimeUtil.formatTime((long)pn.pingAverage.currentValue(),2,true)+",
#"+packetNumber+ ')');
}
long urgentDelay() {
@@ -585,7 +585,7 @@
} else {
synchronized(this) {
String msg = "Asking me to resend packet "+seqNumber+
- " which we haven't sent yet or which they have
already acked (next="+nextPacketNumber+")";
+ " which we haven't sent yet or which they have
already acked (next="+nextPacketNumber+ ')';
// Probably just a bit late - caused by overload etc
if(logMINOR) Logger.minor(this, msg);
}
Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -593,14 +593,14 @@
for(int i=0;i<friendLocs.length;i++) {
sb.append(friendLocs[i]);
- sb.append(" ");
+ sb.append(' ');
}
sb.append("\nhis:\n");
for(int i=0;i<hisFriendLocs.length;i++) {
sb.append(hisFriendLocs[i]);
- sb.append(" ");
+ sb.append(' ');
}
if(logMINOR) Logger.minor(this, sb.toString());
@@ -868,7 +868,7 @@
return true;
}
item.lastMessageTime = System.currentTimeMillis();
- if(logMINOR) Logger.minor(this, "Forwarding SwapCommit
"+uid+","+item.outgoingID+" from "+m.getSource()+" to "+item.routedTo);
+ if(logMINOR) Logger.minor(this, "Forwarding SwapCommit "+uid+ ','
+item.outgoingID+" from "+m.getSource()+" to "+item.routedTo);
// Sending onwards - use outgoing ID
m.set(DMT.UID, item.outgoingID);
try {
@@ -885,7 +885,7 @@
*/
public boolean handleSwapComplete(Message m) {
long uid = m.getLong(DMT.UID);
- if(logMINOR) Logger.minor(this, "handleSwapComplete("+uid+")");
+ if(logMINOR) Logger.minor(this, "handleSwapComplete("+uid+ ')');
Long luid = new Long(uid);
RecentlyForwardedItem item = (RecentlyForwardedItem)
recentlyForwardedIDs.get(luid);
if(item == null) {
@@ -974,7 +974,7 @@
private final HashMap knownLocs = new HashMap();
void registerLocationLink(double d, double t) {
- if(logMINOR) Logger.minor(this, "Known Link: "+d+" "+t);
+ if(logMINOR) Logger.minor(this, "Known Link: "+d+ ' ' +t);
}
void registerKnownLocation(double d) {
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-11-16 22:09:46 UTC (rev
10960)
+++ trunk/freenet/src/freenet/node/Node.java 2006-11-16 22:49:45 UTC (rev
10961)
@@ -672,7 +672,7 @@
private static final long serialVersionUID = -1;
NodeInitException(int exitCode, String msg) {
- super(msg+" ("+exitCode+")");
+ super(msg+" ("+exitCode+ ')');
this.exitCode = exitCode;
}
}
@@ -815,8 +815,8 @@
port = u.getPortNumber();
break;
} catch (Exception e) {
- Logger.normal(this, "Could not use
port: "+bindto+":"+portNo+": "+e, e);
- System.err.println("Could not use port:
"+bindto+":"+portNo+": "+e);
+ Logger.normal(this, "Could not use
port: "+bindto+ ':' +portNo+": "+e, e);
+ System.err.println("Could not use port:
"+bindto+ ':' +portNo+": "+e);
e.printStackTrace();
continue;
}
@@ -832,8 +832,8 @@
}
usm = u;
- Logger.normal(this, "FNP port created on "+bindto+":"+port);
- System.out.println("FNP port created on "+bindto+":"+port);
+ Logger.normal(this, "FNP port created on "+bindto+ ':' +port);
+ System.out.println("FNP port created on "+bindto+ ':' +port);
portNumber = port;
Logger.normal(Node.class, "Creating node...");
@@ -1163,7 +1163,7 @@
chkDatastore =
BerkeleyDBFreenetStore.construct(lastVersion, storeDir, true, suffix,
maxStoreKeys,
CHKBlock.DATA_LENGTH,
CHKBlock.TOTAL_HEADERS_LENGTH, true, BerkeleyDBFreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook);
Logger.normal(this, "Initializing CHK Datacache");
- System.out.println("Initializing CHK Datacache
("+maxCacheKeys+":"+maxCacheKeys+" keys)");
+ System.out.println("Initializing CHK Datacache
("+maxCacheKeys+ ':' +maxCacheKeys+" keys)");
chkDatacache =
BerkeleyDBFreenetStore.construct(lastVersion, storeDir, false, suffix,
maxCacheKeys,
CHKBlock.DATA_LENGTH,
CHKBlock.TOTAL_HEADERS_LENGTH, true, BerkeleyDBFreenetStore.TYPE_CHK,
storeEnvironment, random, storeShutdownHook);
Logger.normal(this, "Initializing pubKey Datastore");
@@ -1232,7 +1232,7 @@
} catch (FileNotFoundException e1) {
// Ignore
} catch (IOException e1) {
- Logger.error(this, "Could not read
"+persistTarget+" ("+e+") and could not read "+persistTemp+" either ("+e1+")");
+ Logger.error(this, "Could not read
"+persistTarget+" ("+e+") and could not read "+persistTemp+" either ("+e1+ ')');
}
}
@@ -1354,8 +1354,8 @@
}
Logger.normal(this, "Freenet 0.7 Build
#"+Version.buildNumber()+" r"+Version.cvsRevision);
System.out.println("Freenet 0.7 Build
#"+Version.buildNumber()+" r"+Version.cvsRevision);
- Logger.normal(this, "FNP port is on "+bindto+":"+portNumber);
- System.out.println("FNP port is on "+bindto+":"+portNumber);
+ Logger.normal(this, "FNP port is on "+bindto+ ':' +portNumber);
+ System.out.println("FNP port is on "+bindto+ ':' +portNumber);
// Start services
// SubConfig pluginManagerConfig = new SubConfig("pluginmanager3",
config);
@@ -1541,13 +1541,13 @@
if(logMINOR) Logger.minor(this,
"Accepting request anyway (take one every 10 secs to keep bwlimitDelayTime
updated)");
} else {
pInstantRejectIncoming.report(1.0);
- return ">MAX_PING_TIME
("+TimeUtil.formatTime((long)pingTime, 2, true)+")";
+ return ">MAX_PING_TIME
("+TimeUtil.formatTime((long)pingTime, 2, true)+ ')';
}
} else if(pingTime > SUB_MAX_PING_TIME) {
double x = ((double)(pingTime -
SUB_MAX_PING_TIME)) / (MAX_PING_TIME - SUB_MAX_PING_TIME);
if(random.nextDouble() < x) {
pInstantRejectIncoming.report(1.0);
- return ">SUB_MAX_PING_TIME
("+TimeUtil.formatTime((long)pingTime, 2, true)+")";
+ return ">SUB_MAX_PING_TIME
("+TimeUtil.formatTime((long)pingTime, 2, true)+ ')';
}
}
@@ -1557,13 +1557,13 @@
if(logMINOR) Logger.minor(this,
"Accepting request anyway (take one every 10 secs to keep bwlimitDelayTime
updated)");
} else {
pInstantRejectIncoming.report(1.0);
- return ">MAX_THROTTLE_DELAY
("+TimeUtil.formatTime((long)bwlimitDelayTime, 2, true)+")";
+ return ">MAX_THROTTLE_DELAY
("+TimeUtil.formatTime((long)bwlimitDelayTime, 2, true)+ ')';
}
} else if(bwlimitDelayTime > SUB_MAX_THROTTLE_DELAY) {
double x = ((double)(bwlimitDelayTime -
SUB_MAX_THROTTLE_DELAY)) / (MAX_THROTTLE_DELAY - SUB_MAX_THROTTLE_DELAY);
if(random.nextDouble() < x) {
pInstantRejectIncoming.report(1.0);
- return ">SUB_MAX_THROTTLE_DELAY
("+TimeUtil.formatTime((long)bwlimitDelayTime, 2, true)+")";
+ return ">SUB_MAX_THROTTLE_DELAY
("+TimeUtil.formatTime((long)bwlimitDelayTime, 2, true)+ ')';
}
}
@@ -1601,15 +1601,15 @@
private void dumpByteCostAverages() {
Logger.minor(this, "Byte cost averages: REMOTE:"+
- " CHK insert
"+remoteChkInsertBytesSentAverage.currentValue()+"/"+remoteChkInsertBytesReceivedAverage.currentValue()+
- " SSK insert
"+remoteSskInsertBytesSentAverage.currentValue()+"/"+remoteSskInsertBytesReceivedAverage.currentValue()+
- " CHK fetch
"+remoteChkFetchBytesSentAverage.currentValue()+"/"+remoteChkFetchBytesReceivedAverage.currentValue()+
- " SSK fetch
"+remoteSskFetchBytesSentAverage.currentValue()+"/"+remoteSskFetchBytesReceivedAverage.currentValue());
+ " CHK insert
"+remoteChkInsertBytesSentAverage.currentValue()+ '/'
+remoteChkInsertBytesReceivedAverage.currentValue()+
+ " SSK insert
"+remoteSskInsertBytesSentAverage.currentValue()+ '/'
+remoteSskInsertBytesReceivedAverage.currentValue()+
+ " CHK fetch
"+remoteChkFetchBytesSentAverage.currentValue()+ '/'
+remoteChkFetchBytesReceivedAverage.currentValue()+
+ " SSK fetch
"+remoteSskFetchBytesSentAverage.currentValue()+ '/'
+remoteSskFetchBytesReceivedAverage.currentValue());
Logger.minor(this, "Byte cost averages: LOCAL"+
- " CHK insert
"+localChkInsertBytesSentAverage.currentValue()+"/"+localChkInsertBytesReceivedAverage.currentValue()+
- " SSK insert
"+localSskInsertBytesSentAverage.currentValue()+"/"+localSskInsertBytesReceivedAverage.currentValue()+
- " CHK fetch
"+localChkFetchBytesSentAverage.currentValue()+"/"+localChkFetchBytesReceivedAverage.currentValue()+
- " SSK fetch
"+localSskFetchBytesSentAverage.currentValue()+"/"+localSskFetchBytesReceivedAverage.currentValue());
+ " CHK insert
"+localChkInsertBytesSentAverage.currentValue()+ '/'
+localChkInsertBytesReceivedAverage.currentValue()+
+ " SSK insert
"+localSskInsertBytesSentAverage.currentValue()+ '/'
+localSskInsertBytesReceivedAverage.currentValue()+
+ " CHK fetch
"+localChkFetchBytesSentAverage.currentValue()+ '/'
+localChkFetchBytesReceivedAverage.currentValue()+
+ " SSK fetch
"+localSskFetchBytesSentAverage.currentValue()+ '/'
+localSskFetchBytesReceivedAverage.currentValue());
}
public SimpleFieldSet exportPrivateFieldSet() {
@@ -1922,7 +1922,7 @@
*/
public Object makeRequestSender(Key key, short htl, long uid, PeerNode
source, double closestLocation, boolean resetClosestLocation, boolean
localOnly, boolean cache, boolean ignoreStore) {
logMINOR = Logger.shouldLog(Logger.MINOR, this);
- if(logMINOR) Logger.minor(this,
"makeRequestSender("+key+","+htl+","+uid+","+source+") on "+portNumber);
+ if(logMINOR) Logger.minor(this, "makeRequestSender("+key+ ','
+htl+ ',' +uid+ ',' +source+") on "+portNumber);
// In store?
KeyBlock chk = null;
if(!ignoreStore) {
@@ -1933,7 +1933,7 @@
DSAPublicKey pubKey = k.getPubKey();
if(pubKey == null) {
pubKey = getKey(k.getPubKeyHash());
- if(logMINOR) Logger.minor(this,
"Fetched pubkey: "+pubKey+" "+(pubKey == null ? "" : pubKey.writeAsField()));
+ if(logMINOR) Logger.minor(this,
"Fetched pubkey: "+pubKey+ ' ' +(pubKey == null ? "" : pubKey.writeAsField()));
try {
k.setPubKey(pubKey);
} catch (SSKVerifyException e) {
@@ -1941,7 +1941,7 @@
}
}
if(pubKey != null) {
- if(logMINOR) Logger.minor(this, "Got
pubkey: "+pubKey+" "+pubKey.writeAsField());
+ if(logMINOR) Logger.minor(this, "Got
pubkey: "+pubKey+ ' ' +pubKey.writeAsField());
chk = fetch((NodeSSK)key, !cache);
} else {
if(logMINOR) Logger.minor(this, "Not
found because no pubkey: "+uid);
@@ -2006,7 +2006,7 @@
}
public String toString() {
- return key.toString()+":"+htl;
+ return key.toString()+ ':' +htl;
}
}
@@ -2093,10 +2093,10 @@
timeLastDumpedHits = now;
} else return;
Logger.minor(this, "Distribution of hits and misses over
stores:\n"+
- "CHK Datastore:
"+chkDatastore.hits()+"/"+(chkDatastore.hits()+chkDatastore.misses())+"/"+chkDatastore.keyCount()+
- "\nCHK Datacache:
"+chkDatacache.hits()+"/"+(chkDatacache.hits()+chkDatacache.misses())+"/"+chkDatacache.keyCount()+
- "\nSSK Datastore:
"+sskDatastore.hits()+"/"+(sskDatastore.hits()+sskDatastore.misses())+"/"+sskDatastore.keyCount()+
- "\nSSK Datacache:
"+sskDatacache.hits()+"/"+(sskDatacache.hits()+sskDatacache.misses())+"/"+sskDatacache.keyCount());
+ "CHK Datastore: "+chkDatastore.hits()+ '/'
+(chkDatastore.hits()+chkDatastore.misses())+ '/' +chkDatastore.keyCount()+
+ "\nCHK Datacache: "+chkDatacache.hits()+ '/'
+(chkDatacache.hits()+chkDatacache.misses())+ '/' +chkDatacache.keyCount()+
+ "\nSSK Datastore: "+sskDatastore.hits()+ '/'
+(sskDatastore.hits()+sskDatastore.misses())+ '/' +sskDatastore.keyCount()+
+ "\nSSK Datacache: "+sskDatacache.hits()+ '/'
+(sskDatacache.hits()+sskDatacache.misses())+ '/' +sskDatacache.keyCount());
}
public void store(CHKBlock block) {
@@ -2183,7 +2183,7 @@
KeyHTLPair kh = new KeyHTLPair(key, htl);
RequestSender rs = (RequestSender)
requestSenders.remove(kh);
if(rs != sender) {
- Logger.error(this, "Removed "+rs+" should be
"+sender+" for "+key+","+htl+" in removeRequestSender");
+ Logger.error(this, "Removed "+rs+" should be
"+sender+" for "+key+ ',' +htl+" in removeRequestSender");
}
requestSenders.notifyAll();
}
@@ -2197,7 +2197,7 @@
KeyHTLPair kh = new KeyHTLPair(key, htl);
AnyInsertSender is = (AnyInsertSender)
insertSenders.remove(kh);
if(is != sender) {
- Logger.error(this, "Removed "+is+" should be
"+sender+" for "+key+","+htl+" in removeInsertSender");
+ Logger.error(this, "Removed "+is+" should be
"+sender+" for "+key+ ',' +htl+" in removeInsertSender");
}
insertSenders.notifyAll();
}
@@ -2242,7 +2242,7 @@
public CHKInsertSender makeInsertSender(NodeCHK key, short htl, long
uid, PeerNode source,
byte[] headers, PartiallyReceivedBlock prb, boolean
fromStore, double closestLoc, boolean cache) {
logMINOR = Logger.shouldLog(Logger.MINOR, this);
- if(logMINOR) Logger.minor(this,
"makeInsertSender("+key+","+htl+","+uid+","+source+",...,"+fromStore);
+ if(logMINOR) Logger.minor(this, "makeInsertSender("+key+ ','
+htl+ ',' +uid+ ',' +source+",...,"+fromStore);
KeyHTLPair kh = new KeyHTLPair(key, htl);
CHKInsertSender is = null;
synchronized(insertSenders) {
@@ -2280,7 +2280,7 @@
}
if(cache)
cacheKey(key.getPubKeyHash(), key.getPubKey(),
!peers.isCloserLocation(block.getKey().toNormalizedDouble()));
- Logger.minor(this,
"makeInsertSender("+key+","+htl+","+uid+","+source+",...,"+fromStore);
+ Logger.minor(this, "makeInsertSender("+key+ ',' +htl+ ',' +uid+
',' +source+",...,"+fromStore);
KeyHTLPair kh = new KeyHTLPair(key, htl);
SSKInsertSender is = null;
synchronized(insertSenders) {
@@ -2315,7 +2315,7 @@
completed(uid);
synchronized(runningUIDs) {
if(!runningUIDs.remove(l))
- throw new IllegalStateException("Could not
unlock "+uid+"!");
+ throw new IllegalStateException("Could not
unlock "+uid+ '!');
}
}
@@ -2396,7 +2396,7 @@
sb.append("\ninserts=");
sb.append(getNumInserts());
- sb.append("\n");
+ sb.append('\n');
if (peers != null)
@@ -2577,7 +2577,7 @@
public void exit(String reason){
try {
this.park();
- System.out.println("Goodbye. from "+this+"
("+reason+")");
+ System.out.println("Goodbye. from "+this+" ("+reason+
')');
} finally {
System.exit(0);
}
@@ -3007,7 +3007,7 @@
} else {
nodeAveragePingAlertRelevant = false;
}
- if(logMINOR && Logger.shouldLog(Logger.DEBUG, this))
Logger.debug(this, "mUPMUAS: "+now+": "+getBwlimitDelayTime()+" >?
"+MAX_BWLIMIT_DELAY_TIME_ALERT_THRESHOLD+" since
"+firstBwlimitDelayTimeThresholdBreak+" ("+bwlimitDelayAlertRelevant+")
"+getNodeAveragePingTime()+" >? "+MAX_NODE_AVERAGE_PING_TIME_ALERT_THRESHOLD+"
since "+firstNodeAveragePingTimeThresholdBreak+"
("+nodeAveragePingAlertRelevant+")");
+ if(logMINOR && Logger.shouldLog(Logger.DEBUG, this))
Logger.debug(this, "mUPMUAS: "+now+": "+getBwlimitDelayTime()+" >?
"+MAX_BWLIMIT_DELAY_TIME_ALERT_THRESHOLD+" since
"+firstBwlimitDelayTimeThresholdBreak+" ("+bwlimitDelayAlertRelevant+")
"+getNodeAveragePingTime()+" >? "+MAX_NODE_AVERAGE_PING_TIME_ALERT_THRESHOLD+"
since "+firstNodeAveragePingTimeThresholdBreak+"
("+nodeAveragePingAlertRelevant+ ')');
nextPeerManagerUserAlertStatsUpdateTime = now +
peerManagerUserAlertStatsUpdateInterval;
}
}
Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -305,7 +305,7 @@
continue;
if(status != RequestSender.TIMED_OUT && status !=
RequestSender.GENERATED_REJECTED_OVERLOAD && status !=
RequestSender.INTERNAL_ERROR) {
- if(logMINOR) Logger.minor(this, "CHK fetch cost
"+rs.getTotalSentBytes()+"/"+rs.getTotalReceivedBytes()+" bytes ("+status+")");
+ if(logMINOR) Logger.minor(this, "CHK fetch cost
"+rs.getTotalSentBytes()+ '/' +rs.getTotalReceivedBytes()+" bytes ("+status+
')');
node.localChkFetchBytesSentAverage.report(rs.getTotalSentBytes());
node.localChkFetchBytesReceivedAverage.report(rs.getTotalReceivedBytes());
}
@@ -402,7 +402,7 @@
continue;
if(status != RequestSender.TIMED_OUT && status !=
RequestSender.GENERATED_REJECTED_OVERLOAD && status !=
RequestSender.INTERNAL_ERROR) {
- if(logMINOR) Logger.minor(this, "SSK fetch cost
"+rs.getTotalSentBytes()+"/"+rs.getTotalReceivedBytes()+" bytes ("+status+")");
+ if(logMINOR) Logger.minor(this, "SSK fetch cost
"+rs.getTotalSentBytes()+ '/' +rs.getTotalReceivedBytes()+" bytes ("+status+
')');
node.localSskFetchBytesSentAverage.report(rs.getTotalSentBytes());
node.localSskFetchBytesReceivedAverage.report(rs.getTotalReceivedBytes());
}
@@ -523,7 +523,7 @@
}
}
- if(logMINOR) Logger.minor(this, "Completed "+uid+"
overload="+hasReceivedRejectedOverload+" "+is.getStatusString());
+ if(logMINOR) Logger.minor(this, "Completed "+uid+"
overload="+hasReceivedRejectedOverload+ ' ' +is.getStatusString());
// Finished?
if(!hasReceivedRejectedOverload) {
@@ -545,7 +545,7 @@
&& status != CHKInsertSender.ROUTE_REALLY_NOT_FOUND) {
int sent = is.getTotalSentBytes();
int received = is.getTotalReceivedBytes();
- if(logMINOR) Logger.minor(this, "Local CHK insert cost
"+sent+"/"+received+" bytes ("+status+")");
+ if(logMINOR) Logger.minor(this, "Local CHK insert cost "+sent+
'/' +received+" bytes ("+status+ ')');
node.localChkInsertBytesSentAverage.report(sent);
node.localChkInsertBytesReceivedAverage.report(received);
}
@@ -631,7 +631,7 @@
}
}
- if(logMINOR) Logger.minor(this, "Completed "+uid+"
overload="+hasReceivedRejectedOverload+" "+is.getStatusString());
+ if(logMINOR) Logger.minor(this, "Completed "+uid+"
overload="+hasReceivedRejectedOverload+ ' ' +is.getStatusString());
// Finished?
if(!hasReceivedRejectedOverload) {
@@ -652,7 +652,7 @@
&& status != CHKInsertSender.ROUTE_REALLY_NOT_FOUND) {
int sent = is.getTotalSentBytes();
int received = is.getTotalReceivedBytes();
- if(logMINOR) Logger.minor(this, "Local SSK insert cost
"+sent+"/"+received+" bytes ("+status+")");
+ if(logMINOR) Logger.minor(this, "Local SSK insert cost "+sent+
'/' +received+" bytes ("+status+ ')');
node.localSskInsertBytesSentAverage.report(sent);
node.localSskInsertBytesReceivedAverage.report(received);
}
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -272,7 +272,7 @@
* @return False if we want the message put back on the queue.
*/
boolean handleRouted(Message m) {
- if(logMINOR) Logger.minor(this, "handleRouted("+m+")");
+ if(logMINOR) Logger.minor(this, "handleRouted("+m+ ')');
if((m.getSource() != null) && (!(m.getSource() instanceof PeerNode))) {
Logger.error(this, "Routed message but source "+m.getSource()+"
not a PeerNode!");
return true;
@@ -449,7 +449,7 @@
short htl = m.getShort(DMT.HTL);
short counter = m.getShort(DMT.COUNTER);
if(logMINOR)
- Logger.minor(this, "Probe request: "+id+" "+target+"
"+best+" "+nearest+" "+htl+" "+counter);
+ Logger.minor(this, "Probe request: "+id+ ' ' +target+ '
' +best+ ' ' +nearest+ ' ' +htl+ ' ' +counter);
synchronized(recentProbeContexts) {
if(recentProbeRequestIDs.contains(lid)) {
// Reject: Loop
@@ -522,7 +522,7 @@
ctx.htl = htl;
ctx.nearest = nearest;
if(logMINOR)
- Logger.minor(this, "oldDist ("+oldDist+") >
newDist ("+newDist+")");
+ Logger.minor(this, "oldDist ("+oldDist+") >
newDist ("+newDist+ ')');
} else if(Math.abs(oldDist - newDist) < Double.MIN_VALUE*2) {
// oldDist == newDist
if(!isNew) {
@@ -658,7 +658,7 @@
double nearest = m.getDouble(DMT.NEAREST_LOCATION);
short counter = m.getShort(DMT.COUNTER);
if(logMINOR)
- Logger.minor(this, "Probe reply: "+id+" "+target+"
"+best+" "+nearest);
+ Logger.minor(this, "Probe reply: "+id+ ' ' +target+ ' '
+best+ ' ' +nearest);
// Just propagate back to source
ProbeContext ctx;
synchronized(recentProbeContexts) {
@@ -677,7 +677,7 @@
try {
ctx.src.sendAsync(complete, null, 0, null);
} catch (NotConnectedException e) {
- Logger.error(this, "Not connected completing a
probe request from "+ctx.src+" (forwarding completion from "+src+")");
+ Logger.error(this, "Not connected completing a
probe request from "+ctx.src+" (forwarding completion from "+src+ ')');
}
} else {
if(ctx.cb != null)
@@ -696,7 +696,7 @@
short counter = m.getShort(DMT.COUNTER);
short reason = m.getShort(DMT.REASON);
if(logMINOR)
- Logger.minor(this, "Probe rejected: "+id+" "+target+"
"+best+" "+nearest+" "+htl+" "+counter+" "+reason);
+ Logger.minor(this, "Probe rejected: "+id+ ' ' +target+
' ' +best+ ' ' +nearest+ ' ' +htl+ ' ' +counter+ ' ' +reason);
ProbeContext ctx;
synchronized(recentProbeContexts) {
Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -188,14 +188,14 @@
if(best != null) {
if((bestPopularity > 2) ||
(detectedAddrs.length == 0)) {
if(!addresses.contains(best)) {
- Logger.normal(this,
"Adding best peer "+best+" ("+bestPopularity+")");
+ Logger.normal(this,
"Adding best peer "+best+" ("+bestPopularity+ ')');
addresses.add(best);
if(best.getFreenetAddress().isRealInternetAddress(false, false))
addedValidIP =
true;
}
if((secondBest != null) &&
(secondBestPopularity > 2)) {
if(!addresses.contains(secondBest)) {
-
Logger.normal(this, "Adding second best peer "+secondBest+" ("+secondBest+")");
+
Logger.normal(this, "Adding second best peer "+secondBest+" ("+secondBest+ ')');
addresses.add(secondBest);
if(secondBest.getFreenetAddress().isRealInternetAddress(false, false))
addedValidIP = true;
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -74,7 +74,7 @@
FileLoggerHook flh =
Node.logConfigHandler.getFileLoggerHook();
boolean redirected = flh != null &&
!flh.hasRedirectedStdOutErrNoLock();
if(!redirected)
- System.err.println("Restarting
node: PacketSender froze for 3 minutes! ("+diff+")");
+ System.err.println("Restarting
node: PacketSender froze for 3 minutes! ("+diff+ ')');
try {
if(node.isUsingWrapper()){
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -107,13 +107,13 @@
try {
pn = new PeerNode(fs, node, true);
} catch (FSParseException e2) {
- Logger.error(this, "Could not parse peer:
"+e2+"\n"+fs.toString(),e2);
+ Logger.error(this, "Could not parse peer: "+e2+ '\n'
+fs.toString(),e2);
continue;
} catch (PeerParseException e2) {
- Logger.error(this, "Could not parse peer:
"+e2+"\n"+fs.toString(),e2);
+ Logger.error(this, "Could not parse peer: "+e2+ '\n'
+fs.toString(),e2);
continue;
} catch (ReferenceSignatureVerificationException e2) {
- Logger.error(this, "Could not parse peer:
"+e2+"\n"+fs.toString(),e2);
+ Logger.error(this, "Could not parse peer: "+e2+ '\n'
+fs.toString(),e2);
continue;
}
addPeer(pn);
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -362,7 +362,7 @@
String testnet = fs.get("testnet");
testnetEnabled = testnet == null ? false :
(testnet.equalsIgnoreCase("true") || testnet.equalsIgnoreCase("yes"));
if(testnetEnabled != node.testnetEnabled) {
- String err = "Ignoring incompatible node "+detectedPeer+" -
peer.testnet="+testnetEnabled+"("+testnet+") but
node.testnet="+node.testnetEnabled;
+ String err = "Ignoring incompatible node "+detectedPeer+" -
peer.testnet="+testnetEnabled+ '(' +testnet+") but
node.testnet="+node.testnetEnabled;
Logger.error(this, err);
throw new PeerParseException(err);
}
@@ -387,7 +387,7 @@
throw new FSParseException(e1);
}
if(nominalPeer.isEmpty()) {
- Logger.normal(this, "No IP addresses found for identity
'"+Base64.encode(identity)+"', possibly at location
'"+Double.toString(currentLocation.getValue())+"' with name '"+getName()+"'");
+ Logger.normal(this, "No IP addresses found for identity
'"+Base64.encode(identity)+"', possibly at location
'"+Double.toString(currentLocation.getValue())+"' with name '"+getName()+ '\'');
detectedPeer = null;
} else {
detectedPeer = (Peer) nominalPeer.firstElement();
@@ -606,7 +606,7 @@
listeningHandshakeBurstSize =
Node.MIN_BURSTING_HANDSHAKE_BURST_SIZE
+
node.random.nextInt(Node.RANDOMIZED_BURSTING_HANDSHAKE_BURST_SIZE);
if(isBurstOnly) {
- Logger.minor(this, "First BurstOnly mode handshake in
"+(sendHandshakeTime - now)+"ms for "+getName()+" (count:
"+listeningHandshakeBurstCount+", size: "+listeningHandshakeBurstSize+")");
+ Logger.minor(this, "First BurstOnly mode handshake in
"+(sendHandshakeTime - now)+"ms for "+getName()+" (count:
"+listeningHandshakeBurstCount+", size: "+listeningHandshakeBurstSize+ ')');
}
// status may have changed from PEER_NODE_STATUS_DISCONNECTED to
PEER_NODE_STATUS_NEVER_CONNECTED
@@ -701,10 +701,10 @@
needSep = true;
continue;
}
- toOutputString.append("'");
+ toOutputString.append('\'');
// Actually do the DNS request for the member Peer of
localHandshakeIPs
toOutputString.append(localHandshakeIPs[i].getAddress(false));
- toOutputString.append("'");
+ toOutputString.append('\'');
needSep = true;
}
toOutputString.append(" ]");
@@ -721,12 +721,12 @@
// Don't do a DNS request on the first cycle through PeerNodes by
DNSRequest
// upon startup (I suspect the following won't do anything, but
just in case)
if(logMINOR)
- Logger.debug(this, "updateHandshakeIPs: calling
getAddress(false) on Peer '"+localHandshakeIPs[i]+"' for PeerNode
'"+getPeer()+"' named '"+getName()+"' ("+ignoreHostnames+")");
+ Logger.debug(this, "updateHandshakeIPs: calling
getAddress(false) on Peer '"+localHandshakeIPs[i]+"' for PeerNode
'"+getPeer()+"' named '"+getName()+"' ("+ignoreHostnames+ ')');
localHandshakeIPs[i].getAddress(false);
} else {
// Actually do the DNS request for the member Peer of
localHandshakeIPs
if(logMINOR)
- Logger.debug(this, "updateHandshakeIPs: calling
getHandshakeAddress() on Peer '"+localHandshakeIPs[i]+"' for PeerNode
'"+getPeer()+"' named '"+getName()+"' ("+ignoreHostnames+")");
+ Logger.debug(this, "updateHandshakeIPs: calling
getHandshakeAddress() on Peer '"+localHandshakeIPs[i]+"' for PeerNode
'"+getPeer()+"' named '"+getName()+"' ("+ignoreHostnames+ ')');
localHandshakeIPs[i].getHandshakeAddress();
}
}
@@ -751,7 +751,7 @@
lastAttemptedHandshakeIPUpdateTime = now;
}
}
- if(logMINOR) Logger.minor(this, "Updating handshake IPs for peer
'"+getPeer()+"' named '"+getName()+"' ("+ignoreHostnames+")");
+ if(logMINOR) Logger.minor(this, "Updating handshake IPs for peer
'"+getPeer()+"' named '"+getName()+"' ("+ignoreHostnames+ ')');
Peer[] localHandshakeIPs;
Peer[] myNominalPeer;
@@ -824,7 +824,7 @@
}
}
if(logMINOR) {
- Logger.minor(this, "3: detectedPeer = "+localDetectedPeer+"
("+localDetectedPeer.getAddress(false)+")");
+ Logger.minor(this, "3: detectedPeer = "+localDetectedPeer+"
("+localDetectedPeer.getAddress(false)+ ')');
Logger.minor(this, "3: maybeUpdateHandshakeIPs got a result of:
"+handshakeIPsToString());
}
}
@@ -1018,7 +1018,7 @@
if(!rateLimitLogging) {
String reasonWrapper = "";
if( 0 <= reason.length()) {
- reasonWrapper = " because of '"+reason+"'";
+ reasonWrapper = " because of '"+reason+ '\'';
}
Logger.normal(this, "Requeueing "+messages.length+"
messages"+reasonWrapper+" on "+this+rateLimitWrapper);
}
@@ -1137,7 +1137,7 @@
sendHandshakeTime = now +
Node.MIN_TIME_BETWEEN_HANDSHAKE_SENDS
+
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_HANDSHAKE_SENDS);
}
- if(logMINOR) Logger.minor(this, "Next BurstOnly
mode handshake in "+(sendHandshakeTime - now)+"ms for "+getName()+" (count:
"+listeningHandshakeBurstCount+", size: "+listeningHandshakeBurstSize+")", new
Exception("double-called debug"));
+ if(logMINOR) Logger.minor(this, "Next BurstOnly
mode handshake in "+(sendHandshakeTime - now)+"ms for "+getName()+" (count:
"+listeningHandshakeBurstCount+", size: "+listeningHandshakeBurstSize+ ')', new
Exception("double-called debug"));
}
}
setPeerNodeStatus(now); // Because of isBursting being set
above and it can't hurt others
@@ -1312,7 +1312,7 @@
* @return short version of toString()
*/
public synchronized String shortToString() {
- return
super.toString()+"@"+detectedPeer+"@"+HexUtil.bytesToHex(identity);
+ return super.toString()+ '@' +detectedPeer+ '@'
+HexUtil.bytesToHex(identity);
}
public String toString() {
@@ -1541,7 +1541,7 @@
sendAsync(locMsg, null, 0, null);
sendAsync(ipMsg, null, 0, null);
} catch (NotConnectedException e) {
- Logger.error(this, "Completed handshake with "+getPeer()+" but
disconnected ("+isConnected+":"+currentTracker+"!!!: "+e, e);
+ Logger.error(this, "Completed handshake with "+getPeer()+" but
disconnected ("+isConnected+ ':' +currentTracker+"!!!: "+e, e);
}
}
@@ -1632,7 +1632,7 @@
}
}
}
- if(logMINOR) Logger.minor(this, "Reference: "+new String(data, offset,
length)+"("+length+")");
+ if(logMINOR) Logger.minor(this, "Reference: "+new String(data, offset,
length)+ '(' +length+ ')');
// Now decode it
ByteArrayInputStream bais = new ByteArrayInputStream(data, offset+1,
length-1);
InputStreamReader isr;
@@ -1832,11 +1832,11 @@
}
if((getPeerNodeStatus() == Node.PEER_NODE_STATUS_NEVER_CONNECTED) &&
(getPeerAddedTime() > 1))
idle = (int) ((now - getPeerAddedTime()) / 1000);
- return
getName()+"\t"+getPeer()+"\t"+getIdentityString()+"\t"+getLocation().getValue()+"\t"+getPeerNodeStatusString()+"\t"+idle;
+ return getName()+ '\t' +getPeer()+ '\t' +getIdentityString()+ '\t'
+getLocation().getValue()+ '\t' +getPeerNodeStatusString()+ '\t' +idle;
}
public String getFreevizOutput() {
- return getStatus().toString()+"|"+ Base64.encode(identity);
+ return getStatus().toString()+ '|' + Base64.encode(identity);
}
public synchronized String getVersion(){
@@ -2087,7 +2087,7 @@
routingBackedOffUntil = now + x;
String reasonWrapper = "";
if( 0 <= reason.length()) {
- reasonWrapper = " because of
'"+reason+"'";
+ reasonWrapper = " because of '"+reason+
'\'';
}
if(logMINOR) Logger.minor(this, "Backing
off"+reasonWrapper+": routingBackoffLength="+routingBackoffLength+", until
"+x+"ms on "+peer);
} else {
@@ -2147,7 +2147,7 @@
lPingNo = new Long(pingNo);
Long lnow = new Long(now);
pingsSentTimes.push(lPingNo, lnow);
- if(logMINOR) Logger.minor(this, "Pushed "+lPingNo+"
"+lnow);
+ if(logMINOR) Logger.minor(this, "Pushed "+lPingNo+ ' '
+lnow);
while(pingsSentTimes.size() > MAX_PINGS) {
Long l = (Long) pingsSentTimes.popValue();
if(logMINOR) Logger.minor(this,
"pingsSentTimes.size()="+pingsSentTimes.size()+", l="+l);
@@ -2624,7 +2624,7 @@
gotError = true;
}
} catch (FSParseException e2) {
- Logger.error(this, "Could not parse extra peer
data: "+e2+"\n"+fs.toString(),e2);
+ Logger.error(this, "Could not parse extra peer
data: "+e2+ '\n' +fs.toString(),e2);
gotError = true;
}
} catch (EOFException e3) {
Modified: trunk/freenet/src/freenet/node/PeerNodeStatus.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNodeStatus.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/PeerNodeStatus.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -327,7 +327,7 @@
}
public String toString() {
- return statusName + " " + peerAddress + ":" + peerPort + " " +
name + " " + location + " " + version + " backoff: " + routingBackoffLength + "
(" + (Math.max(routingBackedOffUntil - System.currentTimeMillis(), 0)) + ")";
+ return statusName + ' ' + peerAddress + ':' + peerPort + ' ' +
name + ' ' + location + ' ' + version + " backoff: " + routingBackoffLength + "
(" + (Math.max(routingBackedOffUntil - System.currentTimeMillis(), 0)) + ')';
}
public int hashCode() {
Modified: trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/RealNodeRequestInsertTest.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -137,13 +137,13 @@
avg.report(0.0);
avg2.report(0.0);
double ratio = (double)successes /
((double)(failures+successes));
- Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" FAILED from "+randomNode.portNumber+" to "+randomNode2.portNumber+"
(long:"+ratio+", short:"+avg.currentValue()+", vague:"+avg2.currentValue()+")");
+ Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" FAILED from "+randomNode.portNumber+" to "+randomNode2.portNumber+"
(long:"+ratio+", short:"+avg.currentValue()+", vague:"+avg2.currentValue()+
')');
} else {
successes++;
avg.report(1.0);
avg2.report(1.0);
double ratio = (double)successes /
((double)(failures+successes));
- Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" success: "+hopsTaken+" "+randomNode.portNumber+" to
"+randomNode2.portNumber+" (long:"+ratio+", short:"+avg.currentValue()+",
vague:"+avg2.currentValue()+")");
+ Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" success: "+hopsTaken+ ' ' +randomNode.portNumber+" to
"+randomNode2.portNumber+" (long:"+ratio+", short:"+avg.currentValue()+",
vague:"+avg2.currentValue()+ ')');
}
} catch (Throwable t) {
Logger.error(RealNodeRoutingTest.class, "Caught "+t, t);
@@ -158,7 +158,7 @@
System.out.println();
int requestNumber = 0;
RunningAverage requestsAvg = new SimpleRunningAverage(100, 0.0);
- String baseString = "" + System.currentTimeMillis() + " ";
+ String baseString = "" + System.currentTimeMillis() + ' ';
while(true) {
try {
requestNumber++;
Modified: trunk/freenet/src/freenet/node/RealNodeRoutingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/RealNodeRoutingTest.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/RealNodeRoutingTest.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -130,13 +130,13 @@
avg.report(0.0);
avg2.report(0.0);
double ratio = (double)successes /
((double)(failures+successes));
- Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" FAILED from "+randomNode.portNumber+" to "+randomNode2.portNumber+"
(long:"+ratio+", short:"+avg.currentValue()+", vague:"+avg2.currentValue()+")");
+ Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" FAILED from "+randomNode.portNumber+" to "+randomNode2.portNumber+"
(long:"+ratio+", short:"+avg.currentValue()+", vague:"+avg2.currentValue()+
')');
} else {
successes++;
avg.report(1.0);
avg2.report(1.0);
double ratio = (double)successes /
((double)(failures+successes));
- Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" success: "+hopsTaken+" "+randomNode.portNumber+" to
"+randomNode2.portNumber+" (long:"+ratio+", short:"+avg.currentValue()+",
vague:"+avg2.currentValue()+")");
+ Logger.normal(RealNodeRoutingTest.class, "Routed ping
"+pings+" success: "+hopsTaken+ ' ' +randomNode.portNumber+" to
"+randomNode2.portNumber+" (long:"+ratio+", short:"+avg.currentValue()+",
vague:"+avg2.currentValue()+ ')');
}
} catch (Throwable t) {
Logger.error(RealNodeRoutingTest.class, "Caught "+t, t);
Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/RequestHandler.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -78,7 +78,7 @@
if(needsPubKey) {
DSAPublicKey key =
((NodeSSK)block.getKey()).getPubKey();
Message pk = DMT.createFNPSSKPubKey(uid, key.asBytes());
- if(logMINOR) Logger.minor(this, "Sending PK: "+key+"
"+key.writeAsField());
+ if(logMINOR) Logger.minor(this, "Sending PK: "+key+ ' '
+key.writeAsField());
source.send(pk, null);
}
status = RequestSender.SUCCESS; // for byte logging
@@ -193,11 +193,11 @@
int sent = rs.getTotalSentBytes() + sentBytes;
int rcvd = rs.getTotalReceivedBytes() + receivedBytes;
if(key instanceof NodeSSK) {
- if(logMINOR) Logger.minor(this, "Remote SSK fetch cost
"+sent+"/"+rcvd+" bytes ("+status+")");
+ if(logMINOR) Logger.minor(this, "Remote SSK fetch cost
"+sent+ '/' +rcvd+" bytes ("+status+ ')');
node.remoteSskFetchBytesSentAverage.report(sent);
node.remoteSskFetchBytesReceivedAverage.report(rcvd);
} else {
- if(logMINOR) Logger.minor(this, "Remote CHK fetch cost
"+sent+"/"+rcvd+" bytes ("+status+")");
+ if(logMINOR) Logger.minor(this, "Remote CHK fetch cost
"+sent+ '/' +rcvd+" bytes ("+status+ ')');
node.remoteChkFetchBytesSentAverage.report(sent);
node.remoteChkFetchBytesReceivedAverage.report(rcvd);
}
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -355,10 +355,10 @@
((NodeSSK)key).setPubKey(pubKey);
} catch (SSKVerifyException e) {
pubKey = null;
- Logger.error(this, "Invalid pubkey from
"+source+" on "+uid+" ("+e.getMessage()+")", e);
+ Logger.error(this, "Invalid pubkey from
"+source+" on "+uid+" ("+e.getMessage()+ ')', e);
break; // try next node
} catch (IOException e) {
- Logger.error(this, "Invalid pubkey from
"+source+" on "+uid+" ("+e+")");
+ Logger.error(this, "Invalid pubkey from
"+source+" on "+uid+" ("+e+ ')');
break; // try next node
}
if(sskData != null) {
@@ -517,7 +517,7 @@
}
private void finish(int code, PeerNode next) {
- if(logMINOR) Logger.minor(this, "finish("+code+")");
+ if(logMINOR) Logger.minor(this, "finish("+code+ ')');
if(status != NOT_FINISHED)
throw new IllegalStateException("finish() called with "+code+"
when was already "+status);
status = code;
Modified: trunk/freenet/src/freenet/node/RequestStarterGroup.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestStarterGroup.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/RequestStarterGroup.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -33,27 +33,27 @@
throttleWindow = new ThrottleWindowManager(2.0, fs == null ?
null : fs.subset("ThrottleWindow"));
chkRequestThrottle = new MyRequestThrottle(throttleWindow,
5000, "CHK Request", fs == null ? null : fs.subset("CHKRequestThrottle"));
- chkRequestStarter = new RequestStarter(core,
chkRequestThrottle, "CHK Request starter ("+portNumber+")",
node.requestOutputThrottle, node.requestInputThrottle,
node.localChkFetchBytesSentAverage, node.localChkFetchBytesReceivedAverage,
false);
+ chkRequestStarter = new RequestStarter(core,
chkRequestThrottle, "CHK Request starter ("+portNumber+ ')',
node.requestOutputThrottle, node.requestInputThrottle,
node.localChkFetchBytesSentAverage, node.localChkFetchBytesReceivedAverage,
false);
chkFetchScheduler = new ClientRequestScheduler(false, false,
random, chkRequestStarter, node, schedulerConfig, "CHKrequester");
chkRequestStarter.setScheduler(chkFetchScheduler);
chkRequestStarter.start();
//insertThrottle = new ChainedRequestThrottle(10000, 2.0F,
requestThrottle);
// FIXME reenable the above
chkInsertThrottle = new MyRequestThrottle(throttleWindow,
20000, "CHK Insert", fs == null ? null : fs.subset("CHKInsertThrottle"));
- chkInsertStarter = new RequestStarter(core, chkInsertThrottle,
"CHK Insert starter ("+portNumber+")", node.requestOutputThrottle,
node.requestInputThrottle, node.localChkInsertBytesSentAverage,
node.localChkInsertBytesReceivedAverage, true);
+ chkInsertStarter = new RequestStarter(core, chkInsertThrottle,
"CHK Insert starter ("+portNumber+ ')', node.requestOutputThrottle,
node.requestInputThrottle, node.localChkInsertBytesSentAverage,
node.localChkInsertBytesReceivedAverage, true);
chkPutScheduler = new ClientRequestScheduler(true, false,
random, chkInsertStarter, node, schedulerConfig, "CHKinserter");
chkInsertStarter.setScheduler(chkPutScheduler);
chkInsertStarter.start();
sskRequestThrottle = new MyRequestThrottle(throttleWindow,
5000, "SSK Request", fs == null ? null : fs.subset("SSKRequestThrottle"));
- sskRequestStarter = new RequestStarter(core,
sskRequestThrottle, "SSK Request starter ("+portNumber+")",
node.requestOutputThrottle, node.requestInputThrottle,
node.localSskFetchBytesSentAverage, node.localSskFetchBytesReceivedAverage,
false);
+ sskRequestStarter = new RequestStarter(core,
sskRequestThrottle, "SSK Request starter ("+portNumber+ ')',
node.requestOutputThrottle, node.requestInputThrottle,
node.localSskFetchBytesSentAverage, node.localSskFetchBytesReceivedAverage,
false);
sskFetchScheduler = new ClientRequestScheduler(false, true,
random, sskRequestStarter, node, schedulerConfig, "SSKrequester");
sskRequestStarter.setScheduler(sskFetchScheduler);
sskRequestStarter.start();
//insertThrottle = new ChainedRequestThrottle(10000, 2.0F,
requestThrottle);
// FIXME reenable the above
sskInsertThrottle = new MyRequestThrottle(throttleWindow,
20000, "SSK Insert", fs == null ? null : fs.subset("SSKInsertThrottle"));
- sskInsertStarter = new RequestStarter(core, sskInsertThrottle,
"SSK Insert starter ("+portNumber+")", node.requestOutputThrottle,
node.requestInputThrottle, node.localSskInsertBytesSentAverage,
node.localSskFetchBytesReceivedAverage, true);
+ sskInsertStarter = new RequestStarter(core, sskInsertThrottle,
"SSK Insert starter ("+portNumber+ ')', node.requestOutputThrottle,
node.requestInputThrottle, node.localSskInsertBytesSentAverage,
node.localSskFetchBytesReceivedAverage, true);
sskPutScheduler = new ClientRequestScheduler(true, true,
random, sskInsertStarter, node, schedulerConfig, "SSKinserter");
sskInsertStarter.setScheduler(sskPutScheduler);
sskInsertStarter.start();
Modified: trunk/freenet/src/freenet/node/SSKInsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertHandler.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/SSKInsertHandler.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -309,7 +309,7 @@
totalSent += sender.getTotalSentBytes();
totalReceived += sender.getTotalReceivedBytes();
}
- if(logMINOR) Logger.minor(this, "Remote SSK insert cost
"+totalSent+"/"+totalReceived+" bytes ("+code+")");
+ if(logMINOR) Logger.minor(this, "Remote SSK insert cost
"+totalSent+ '/' +totalReceived+" bytes ("+code+ ')');
node.remoteSskInsertBytesSentAverage.report(totalSent);
node.remoteSskInsertBytesReceivedAverage.report(totalReceived);
}
Modified: trunk/freenet/src/freenet/node/SendMessageOnErrorCallback.java
===================================================================
--- trunk/freenet/src/freenet/node/SendMessageOnErrorCallback.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/SendMessageOnErrorCallback.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -14,7 +14,7 @@
public class SendMessageOnErrorCallback implements AsyncMessageCallback {
public String toString() {
- return super.toString() + ": "+msg+" "+dest;
+ return super.toString() + ": "+msg+ ' ' +dest;
}
Message msg;
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -192,8 +192,8 @@
try {
line = reader.readLine();
} catch (IOException e) {
- outsb.append("Bye... (").append(e).append(")");
- System.err.println("Bye... ("+e+")");
+ outsb.append("Bye... (").append(e).append(')');
+ System.err.println("Bye... ("+e+ ')');
return true;
}
boolean getCHKOnly = false;
@@ -291,12 +291,12 @@
fnam =
"freenet-download-"+HexUtil.bytesToHex(BucketTools.hash(data), 0, 10);
String ext =
DefaultMIMETypes.getExtension(cm.getMIMEType());
if((ext != null) && !ext.equals(""))
- fnam += "." + ext;
+ fnam += '.' + ext;
}
File f = new File(downloadsDir, fnam);
if(f.exists()) {
outsb.append("File exists already: ").append(fnam);
- fnam = "freenet-"+System.currentTimeMillis()+"-"+fnam;
+ fnam = "freenet-"+System.currentTimeMillis()+ '-' +fnam;
}
FileOutputStream fos = null;
try {
@@ -846,7 +846,7 @@
private HashMap makeBucketsByName(String directory) {
if (!directory.endsWith("/"))
- directory = directory + "/";
+ directory = directory + '/';
File thisdir = new File(directory);
System.out.println("Listing dir: "+thisdir);
@@ -889,7 +889,7 @@
line = reader.readLine();
if(line == null) throw new EOFException();
} catch (IOException e1) {
- System.err.println("Bye... ("+e1+")");
+ System.err.println("Bye... ("+e1+ ')');
return null;
}
if((!isFieldSet) && line.equals(".")) break;
Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -77,8 +77,8 @@
if(TMCIEnabled){
new TextModeClientInterfaceServer(node, port, bind_ip,
allowedHosts).start();
- Logger.normal(core, "TMCI started on
"+bind_ip+":"+port);
- System.out.println("TMCI started on "+bind_ip+":"+port);
+ Logger.normal(core, "TMCI started on "+bind_ip+ ':'
+port);
+ System.out.println("TMCI started on "+bind_ip+ ':'
+port);
}
else{
Logger.normal(core, "Not starting TMCI as it's
disabled");
@@ -219,8 +219,8 @@
try {
networkInterface = new NetworkInterface(curPort,
tempBindTo, allowedHosts);
} catch (IOException e) {
- Logger.error(this, "Could not bind to TMCI port:
"+tempBindTo+":"+port);
- System.err.println("Could not bind to TMCI port:
"+tempBindTo+":"+port);
+ Logger.error(this, "Could not bind to TMCI port:
"+tempBindTo+ ':' +port);
+ System.err.println("Could not bind to TMCI port:
"+tempBindTo+ ':' +port);
return;
}
try {
Modified: trunk/freenet/src/freenet/node/ThrottleWindowManager.java
===================================================================
--- trunk/freenet/src/freenet/node/ThrottleWindowManager.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/ThrottleWindowManager.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -49,7 +49,7 @@
public synchronized String toString() {
return super.toString()+" w: "
+ _simulatedWindowSize + ", d:"
- + (((float) _droppedPackets / (float)
_totalPackets)) + "="+_droppedPackets+"/"+_totalPackets;
+ + (((float) _droppedPackets / (float)
_totalPackets)) + '=' +_droppedPackets+ '/' +_totalPackets;
}
public SimpleFieldSet exportFieldSet() {
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-11-16 22:09:46 UTC (rev
10960)
+++ trunk/freenet/src/freenet/node/Version.java 2006-11-16 22:49:45 UTC (rev
10961)
@@ -142,7 +142,7 @@
+ version
+ "(lastGoodBuild="
+ req
- + ")");
+ + ')');
return false;
}
} catch (NumberFormatException e) {
@@ -162,7 +162,7 @@
+ version
+
"(lastGoodStableBuild="
+ lastGoodStableBuild
- + ")");
+ + ')');
return false;
}
} catch (NumberFormatException e) {
@@ -213,7 +213,7 @@
+ version
+ "(lastGoodVersion="
+ lastGoodVersion
- + ")");
+ + ')');
return false;
}
} catch (NumberFormatException e) {
@@ -233,7 +233,7 @@
+ version
+
"(lastGoodStableBuild="
+ lastGoodStableBuild
- + ")");
+ + ')');
return false;
}
} catch (NumberFormatException e) {
@@ -364,14 +364,14 @@
System.out.println(
"Freenet: "
+ nodeName
- + " "
- + nodeVersion
+ + ' '
+ + nodeVersion
+ " (protocol "
+ protocolVersion
+ ") build "
+ buildNumber
+ " (last good build: "
+ lastGoodBuild()
- + ")");
+ + ')');
}
}
Modified: trunk/freenet/src/freenet/node/fcp/AddPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/AddPeer.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/fcp/AddPeer.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -52,7 +52,7 @@
String line;
while((line = in.readLine()) != null) {
line = line.trim();
- ref.append( line ).append( "\n" );
+ ref.append( line ).append('\n');
}
in.close();
} catch (MalformedURLException e) {
@@ -62,10 +62,10 @@
}
ref = new StringBuffer(ref.toString().trim());
if(ref == null) {
- throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from URL <"+urlString+">", null);
+ throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from URL <"+urlString+ '>', null);
}
if(ref.equals("")) {
- throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from URL <"+urlString+">", null);
+ throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from URL <"+urlString+ '>', null);
}
try {
fs = new SimpleFieldSet(ref.toString(), true);
@@ -83,7 +83,7 @@
String line;
while((line = in.readLine()) != null) {
line = line.trim();
- ref.append( line ).append( "\n" );
+ ref.append( line ).append('\n');
}
in.close();
} catch (FileNotFoundException e) {
@@ -93,10 +93,10 @@
}
ref = new StringBuffer(ref.toString().trim());
if(ref == null) {
- throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from file <"+fileString+">", null);
+ throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from file <"+fileString+ '>', null);
}
if(ref.equals("")) {
- throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from file <"+fileString+">", null);
+ throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from file <"+fileString+ '>', null);
}
try {
fs = new SimpleFieldSet(ref.toString(), true);
Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -302,7 +302,7 @@
AllDataMessage adm = null;
synchronized(this) {
if(succeeded) {
- Logger.error(this, "onSuccess called twice for
"+this+" ("+identifier+")");
+ Logger.error(this, "onSuccess called twice for
"+this+" ("+identifier+ ')');
return; // We might be called twice; ignore it
if so.
}
if(returnType == ClientGetMessage.RETURN_TYPE_DIRECT) {
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutBase.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutBase.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutBase.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -129,7 +129,7 @@
public void onGeneratedURI(FreenetURI uri, BaseClientPutter state) {
synchronized(this) {
if((generatedURI != null) && !uri.equals(generatedURI))
- Logger.error(this,
"onGeneratedURI("+uri+","+state+") but already set generatedURI to
"+generatedURI);
+ Logger.error(this, "onGeneratedURI("+uri+ ','
+state+") but already set generatedURI to "+generatedURI);
generatedURI = uri;
}
trySendGeneratedURIMessage(null);
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutDiskDirMessage.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -80,7 +80,7 @@
ret.put(f.getName(), new
ManifestElement(f.getName(), prefix + f.getName(), bucket, null, f.length()));
} else if(filelist[i].isDirectory()) {
- HashMap subdir = makeBucketsByName(new
File(thisdir, filelist[i].getName()), prefix + filelist[i].getName() + "/" );
+ HashMap subdir = makeBucketsByName(new
File(thisdir, filelist[i].getName()), prefix + filelist[i].getName() + '/');
ret.put(filelist[i].getName(), subdir);
} else if(!allowUnreadableFiles) {
throw new
MessageInvalidException(ProtocolErrorMessage.FILE_NOT_FOUND, "Not directory and
not file: "+filelist[i], identifier);
Modified: trunk/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPClient.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/fcp/FCPClient.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -161,7 +161,7 @@
public void removeByIdentifier(String identifier, boolean kill) throws
MessageInvalidException {
ClientRequest req;
boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
- if(logMINOR) Logger.minor(this,
"removeByIdentifier("+identifier+","+kill+")");
+ if(logMINOR) Logger.minor(this,
"removeByIdentifier("+identifier+ ',' +kill+ ')');
synchronized(this) {
req = (ClientRequest)
clientRequestsByIdentifier.get(identifier);
if(req == null)
@@ -269,6 +269,6 @@
}
public String toString() {
- return super.toString()+":"+name;
+ return super.toString()+ ':' +name;
}
}
Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -140,7 +140,7 @@
public void startClientPut(ClientPutMessage message) {
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this, "Starting insert
ID=\""+message.identifier+"\"");
+ Logger.minor(this, "Starting insert
ID=\""+message.identifier+ '"');
String id = message.identifier;
ClientPut cp = null;
boolean success;
Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionOutputHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionOutputHandler.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionOutputHandler.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -20,7 +20,7 @@
}
void start() {
- Thread t = new Thread(this, "FCP output handler for
"+handler.sock.getRemoteSocketAddress()+":"+handler.sock.getPort());
+ Thread t = new Thread(this, "FCP output handler for
"+handler.sock.getRemoteSocketAddress()+ ':' +handler.sock.getPort());
t.setDaemon(true);
t.start();
}
Modified: trunk/freenet/src/freenet/node/fcp/FCPMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPMessage.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/fcp/FCPMessage.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -14,7 +14,7 @@
SimpleFieldSet sfs = getFieldSet();
sfs.setEndMarker(getEndString());
String msg = sfs.toString();
- os.write((getName()+"\n").getBytes("UTF-8"));
+ os.write((getName()+ '\n').getBytes("UTF-8"));
os.write(msg.getBytes("UTF-8"));
}
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -113,14 +113,14 @@
loadPersistentRequests();
}
- Logger.normal(this, "Starting FCP server on
"+bindTo+":"+port+".");
- System.out.println("Starting FCP server on
"+bindTo+":"+port+".");
+ Logger.normal(this, "Starting FCP server on "+bindTo+
':' +port+ '.');
+ System.out.println("Starting FCP server on "+bindTo+
':' +port+ '.');
NetworkInterface tempNetworkInterface = null;
try {
tempNetworkInterface = new
NetworkInterface(port, bindTo, allowedHosts);
} catch (BindException be) {
- Logger.error(this, "Couldn't bind to FCP Port
"+bindTo+":"+port+". FCP Server not started.");
- System.out.println("Couldn't bind to FCP Port
"+bindTo+":"+port+". FCP Server not started.");
+ Logger.error(this, "Couldn't bind to FCP Port
"+bindTo+ ':' +port+". FCP Server not started.");
+ System.out.println("Couldn't bind to FCP Port
"+bindTo+ ':' +port+". FCP Server not started.");
}
this.networkInterface = tempNetworkInterface;
@@ -502,7 +502,7 @@
GZIPOutputStream gos = new
GZIPOutputStream(bos);
OutputStreamWriter osw = new
OutputStreamWriter(gos);
BufferedWriter w = new
BufferedWriter(osw);
-
w.write(Integer.toString(persistentRequests.length)+"\n");
+
w.write(Integer.toString(persistentRequests.length)+ '\n');
for(int
i=0;i<persistentRequests.length;i++)
persistentRequests[i].write(w);
w.close();
@@ -637,7 +637,7 @@
} catch (IdentifierCollisionException e1) {
// FIXME maybe use DateFormat
try {
-
innerMakePersistentGlobalRequest(fetchURI, persistence, returnType, "FProxy
("+System.currentTimeMillis()+")", returnFilename, returnTempFilename);
+
innerMakePersistentGlobalRequest(fetchURI, persistence, returnType, "FProxy
("+System.currentTimeMillis()+ ')', returnFilename, returnTempFilename);
return;
} catch (IdentifierCollisionException
e2) {
while(true) {
@@ -666,14 +666,14 @@
!expectedMimeType.equals(DefaultMIMETypes.DEFAULT_MIME_TYPE)) {
ext = DefaultMIMETypes.getExtension(expectedMimeType);
} else ext = null;
- String extAdd = (ext == null ? "" : "." + ext);
+ String extAdd = (ext == null ? "" : '.' + ext);
String preferred = uri.getPreferredFilename();
File f = new File(core.getDownloadDir(), preferred + extAdd);
File f1 = new File(core.getDownloadDir(), preferred +
".freenet-tmp");
int x = 0;
while(f.exists() || f1.exists()) {
- f = new File(core.getDownloadDir(), preferred + "-" + x
+ extAdd);
- f1 = new File(core.getDownloadDir(), preferred + "-" +
x + extAdd + ".freenet-tmp");
+ f = new File(core.getDownloadDir(), preferred + '-' + x
+ extAdd);
+ f1 = new File(core.getDownloadDir(), preferred + '-' +
x + extAdd + ".freenet-tmp");
}
return f;
}
Modified: trunk/freenet/src/freenet/node/fcp/ModifyConfig.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyConfig.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/fcp/ModifyConfig.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -41,14 +41,14 @@
for(int j=0; j<o.length; j++){
configName=o[j].getName();
- if(logMINOR) Logger.minor(this, "Setting
"+prefix+"."+configName);
+ if(logMINOR) Logger.minor(this, "Setting
"+prefix+ '.' +configName);
// we ignore unreconized parameters
- if(fs.get(prefix+"."+configName) != null) {
-
if(!(o[j].getValueString().equals(fs.get(prefix+"."+configName)))){
- if(logMINOR) Logger.minor(this,
"Setting "+prefix+"."+configName+" to "+fs.get(prefix+"."+configName));
+ if(fs.get(prefix+ '.' +configName) != null) {
+
if(!(o[j].getValueString().equals(fs.get(prefix+ '.' +configName)))){
+ if(logMINOR) Logger.minor(this,
"Setting "+prefix+ '.' +configName+" to "+fs.get(prefix+ '.' +configName));
try{
-
o[j].setValue(fs.get(prefix+"."+configName));
+
o[j].setValue(fs.get(prefix+ '.' +configName));
}catch(Exception e){
// Bad values silently
fail from an FCP perspective, but the FCP client can tell if a change took by
comparing ConfigData messages before and after
Logger.error(this,
"Caught "+e, e);
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -166,7 +166,7 @@
alert.set(availableVersion,fetchedVersion,result !=
null && result.asBucket() != null && result.asBucket().size() > 0);
alert.isValid(true);
- Logger.normal(this,"Starting the update process
("+availableVersion+")");
+ Logger.normal(this,"Starting the update process
("+availableVersion+ ')');
System.err.println("Starting the update process: found
the update ("+availableVersion+"), now fetching it.");
// We fetch it
try{
@@ -325,7 +325,7 @@
return;
}
- System.out.println("################## New jar written!
"+fetchedVersion+ " " +fNew.getAbsolutePath());
+ System.out.println("################## New jar written!
"+fetchedVersion+ ' ' +fNew.getAbsolutePath());
if(!nastyRestart) {
// Easy way.
@@ -478,7 +478,7 @@
int errorCode = e.getMode();
if(!state.getURI().equals(revocationURI)){
- if(logMINOR) Logger.minor(this,
"onFailure("+e+","+state+")");
+ if(logMINOR) Logger.minor(this, "onFailure("+e+ ','
+state+ ')');
synchronized(this) {
this.cg = null;
isFetching=false;
Modified: trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/useralerts/N2NTMUserAlert.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -30,7 +30,7 @@
}
public String getTitle() {
- return "Node To Node Text Message "+fileNumber+" from
"+sourcePeerNode.getName()+" ("+sourcePeerNode.getPeer()+")";
+ return "Node To Node Text Message "+fileNumber+" from
"+sourcePeerNode.getName()+" ("+sourcePeerNode.getPeer()+ ')';
}
public String getText() {
Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -75,7 +75,7 @@
static final String NO_PEERS_LOG_ONTO_IRC =
" log on to irc.freenode.net channel #freenet-refs and ask
around for somebody to connect to";
static final String NO_PEERS_TESTNET = NO_PEERS_START +
- ", but since this is a testnet node, we suggest that you " +
NO_PEERS_LOG_ONTO_IRC + ".";
+ ", but since this is a testnet node, we suggest that you " +
NO_PEERS_LOG_ONTO_IRC + '.';
static final String NO_PEERS_DARKNET = NO_PEERS_START +
". You could " + NO_PEERS_LOG_ONTO_IRC + ", but remember that
you are vulnerable to " +
"those you are directly connected to. (This is especially true
in this early alpha of Freenet 0.7...)\n" +
Modified:
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
===================================================================
---
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2006-11-16 22:09:46 UTC (rev 10960)
+++
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -27,7 +27,7 @@
}
public String getTitle() {
- return "A new stable version of Freenet is available
("+version+")";
+ return "A new stable version of Freenet is available
("+version+ ')';
}
public String getText() {
@@ -35,7 +35,7 @@
if(updater.inFinalCheck()) {
return s + "Your node is currently doing a final check
to verify the security of the update"+
(version == readyVersion ? "" : (" to "+readyVersion)) +
- ".
("+updater.getRevocationDNFCounter()+"/"+NodeUpdater.REVOCATION_DNF_MIN+")";
+ ". ("+updater.getRevocationDNFCounter()+ '/'
+NodeUpdater.REVOCATION_DNF_MIN+ ')';
} else {
s+="Updating to "+version+" is advised. ";
if(isReady) s += " <form action=\"/\"
method=\"post\"><input type=\"submit\" name=\"update\" value=\"Update to
"+readyVersion+" Now\" /></form>";
@@ -49,13 +49,13 @@
HTMLNode alertNode = new HTMLNode("div");
alertNode.addChild("#", "It seems that your node isn't running
the latest version of the software.");
if (updater.inFinalCheck()) {
- alertNode.addChild("#", " Your node is currently doing
a final check to verify the security of the update " + (version == readyVersion
? "" : (" to " + readyVersion)) + ". (Finished checks: " +
updater.getRevocationDNFCounter() + " of " + NodeUpdater.REVOCATION_DNF_MIN +
")");
+ alertNode.addChild("#", " Your node is currently doing
a final check to verify the security of the update " + (version == readyVersion
? "" : (" to " + readyVersion)) + ". (Finished checks: " +
updater.getRevocationDNFCounter() + " of " + NodeUpdater.REVOCATION_DNF_MIN +
')');
} else {
if (isReady) {
alertNode.addChild("#", " Updating to " +
version + " is advised.");
alertNode.addChild("form", new String[] {
"action", "method" }, new String[] { "/", "post" }).addChild("input", new
String[] { "type", "name", "value" }, new String[] { "submit", "update",
"Update to " + readyVersion + " now" });
if(readyVersion < version)
- alertNode.addChild("#", "The node is
currently fetching version "+version+" but you can update to "+readyVersion+"
now, or wait for the node to fetch "+version+".");
+ alertNode.addChild("#", "The node is
currently fetching version "+version+" but you can update to "+readyVersion+"
now, or wait for the node to fetch "+version+ '.');
} else {
if(updater.isAutoUpdateAllowed)
alertNode.addChild("#", " Your node is
currently fetching the update over Freenet and will automatically restart when
it's ready (as configured).");
Modified: trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -25,7 +25,7 @@
thread = ps;
this.plug = plug;
this.filename = filename;
- threadName = "p" + className.replaceAll("^class ", "") + "_" +
ps.hashCode();
+ threadName = 'p' + className.replaceAll("^class ", "") + '_' +
ps.hashCode();
start = System.currentTimeMillis();
ps.setName(threadName);
fedPluginThread = true;
Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -122,7 +122,7 @@
}
Logger.normal(this, "Plugin loaded: " + filename);
} catch (PluginNotFoundException e) {
- Logger.normal(this, "Loading plugin failed (" +
filename + ")", e);
+ Logger.normal(this, "Loading plugin failed (" +
filename + ')', e);
} catch (UnsupportedClassVersionError e) {
Logger.error(this, "Could not load plugin "+filename+"
: "+e, e);
System.err.println("Could not load plugin "+filename+"
: "+e);
@@ -144,7 +144,7 @@
synchronized (toadletList) {
toadletList.put(pl.getClass().getName(), pl);
}
- Logger.normal(this, "Added HTTP handler for
/plugins/"+pl.getClass().getName()+"/");
+ Logger.normal(this, "Added HTTP handler for
/plugins/"+pl.getClass().getName()+ '/');
}
public void removePlugin(Thread t) {
@@ -160,7 +160,7 @@
try {
toadletList.remove(pi.getPluginClassName());
Logger.normal(this,
"Removed HTTP handler for /plugins/"+
-
pi.getPluginClassName()+"/");
+
pi.getPluginClassName()+ '/');
} catch (Throwable ex) {
Logger.error(this,
"removing Plugin", ex);
}
@@ -185,7 +185,7 @@
for (int i = 0 ; i < targets.length ; i++) {
toadletList.remove(targets[i]);
Logger.normal(this, "Removed HTTP
symlink: " + targets[i] +
- " =>
/plugins/"+pi.getPluginClassName()+"/");
+ " =>
/plugins/"+pi.getPluginClassName()+ '/');
}
} catch (Throwable ex) {
Logger.error(this, "removing Toadlet-link", ex);
@@ -206,7 +206,7 @@
toadletList.remove(targets[i]);
pi.removePluginToadletSymlink(targets[i]);
Logger.normal(this, "Removed HTTP
symlink: " + targets[i] +
- " =>
/plugins/"+pi.getPluginClassName()+"/");
+ " =>
/plugins/"+pi.getPluginClassName()+ '/');
}
} catch (Throwable ex) {
Logger.error(this, "removing Toadlet-link: " +
rm, ex);
Modified: trunk/freenet/src/freenet/pluginmanager/TestPlugin.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/TestPlugin.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/pluginmanager/TestPlugin.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -29,7 +29,7 @@
"This is from within the plugin. I've fetched some data
for you.\n"+
"The key is: " + key + ", and the data inside:\n"+
"-----------------------------------------------------------\n"+
- new String(fr.asByteArray()).trim() + "\n" +
+ new String(fr.asByteArray()).trim() + '\n' +
"-----------------------------------------------------------\n"+
"Length: " + fr.size() + ", Mime-Type: " +
fr.getMimeType();
} catch (Exception e) {
Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -114,10 +114,10 @@
File oldStoreFile = new File(oldDir, "store");
// Location of new store file
- String newStoreFileName = newTypeName(type) + suffix + "."+
(isStore ? "store" : "cache");
+ String newStoreFileName = newTypeName(type) + suffix + '.' +
(isStore ? "store" : "cache");
File newStoreFile = new File(baseStoreDir, newStoreFileName);
- String newDBPrefix = newTypeName(type)+"-"+(isStore ? "store" :
"cache")+"-";
+ String newDBPrefix = newTypeName(type)+ '-' +(isStore ? "store"
: "cache")+ '-';
File newFixSecondaryFile = new File(baseStoreDir,
"recreate_secondary_db-"+newStoreFileName);
@@ -392,7 +392,7 @@
// Try to rename the old directory
File f = new File(baseStoreDir,
"lost+found-"+oldDirName);
while(f.exists()) {
- f = new File(baseStoreDir,
"lost+found-"+oldDirName+"-"+Long.toHexString(random.nextLong()));
+ f = new File(baseStoreDir,
"lost+found-"+oldDirName+ '-' +Long.toHexString(random.nextLong()));
}
if(!oldDir.renameTo(f)) {
System.err.println("Unable to rename old store
directory "+oldDir+" to "+f+" (would have deleted it but it has user files or
is not deletable)");
@@ -666,7 +666,7 @@
long realSize = countCHKBlocksFromFile();
- System.err.println("Shrinking from "+chkBlocksInStore+" to
"+maxChkBlocks+" (from db "+countCHKBlocksFromDatabase()+" from file
"+countCHKBlocksFromFile()+")");
+ System.err.println("Shrinking from "+chkBlocksInStore+" to
"+maxChkBlocks+" (from db "+countCHKBlocksFromDatabase()+" from file
"+countCHKBlocksFromFile()+ ')');
try {
c = chkDB_accessTime.openCursor(null,null);
@@ -726,7 +726,7 @@
}
x++;
if(x % 1024 == 0) {
- System.out.println("Reading
store prior to shrink: "+(x*100/realSize)+ "% ( "+x+"/"+realSize+")");
+ System.out.println("Reading
store prior to shrink: "+(x*100/realSize)+ "% ( "+x+ '/' +realSize+ ')');
}
if(x == Integer.MAX_VALUE) {
System.err.println("Key number
"+x+" - ignoring store after "+(x*(dataBlockSize+headerBlockSize)+" bytes"));
@@ -852,7 +852,7 @@
if((i+1) % 2048 == 0) {
t.commit();
t = environment.beginTransaction(null,null);
- System.out.println("Moving blocks:
"+(i*100/wantedMove.size())+ "% ( "+i+"/"+wantedMove.size()+")");
+ System.out.println("Moving blocks:
"+(i*100/wantedMove.size())+ "% ( "+i+ '/' +wantedMove.size()+ ')');
}
//System.err.println("Moved "+wantedBlock+" to "+unwantedBlock);
}
@@ -891,8 +891,8 @@
if(maxBlocks >= curBlocks)
return;
}
- System.err.println("Shrinking store: "+curBlocks+" ->
"+maxBlocks+" (from db "+countCHKBlocksFromDatabase()+" from file
"+countCHKBlocksFromFile()+")");
- Logger.error(this, "Shrinking store: "+curBlocks+" ->
"+maxBlocks+" (from db "+countCHKBlocksFromDatabase()+" from file
"+countCHKBlocksFromFile()+")");
+ System.err.println("Shrinking store: "+curBlocks+" ->
"+maxBlocks+" (from db "+countCHKBlocksFromDatabase()+" from file
"+countCHKBlocksFromFile()+ ')');
+ Logger.error(this, "Shrinking store: "+curBlocks+" ->
"+maxBlocks+" (from db "+countCHKBlocksFromDatabase()+" from file
"+countCHKBlocksFromFile()+ ')');
WrapperManager.signalStarting((int)Math.min(0,(curBlocks-maxBlocks)*100)+5*60*1000);
// 10 per second plus 5 minutes
while(true) {
t = environment.beginTransaction(null,null);
@@ -1085,7 +1085,7 @@
Logger.error(this, err,
e);
System.err.println(err);
e.printStackTrace();
- addFreeBlock(l, true,
"bogus key ("+type+")");
+ addFreeBlock(l, true,
"bogus key ("+type+ ')');
routingkey = null;
continue;
}
@@ -1105,7 +1105,7 @@
chkDB.put(t,routingkeyDBE,blockDBE);
t.commit();
if(l % 1024 == 0)
- System.out.println("Key
"+l+"/"+(chkStore.length()/(dataBlockSize+headerBlockSize))+" OK");
+ System.out.println("Key "+l+
'/' +(chkStore.length()/(dataBlockSize+headerBlockSize))+" OK");
t = null;
} finally {
l++;
@@ -1155,7 +1155,7 @@
int x = 0;
while(true) {
StoreBlock storeBlock = (StoreBlock)
storeBlockTupleBinding.entryToObject(blockDBE);
- if(logMINOR) Logger.minor(this, "Found another key
("+(x++)+") ("+storeBlock.offset+")");
+ if(logMINOR) Logger.minor(this, "Found another key
("+(x++)+") ("+storeBlock.offset+ ')');
Long l = new Long(storeBlock.offset);
if(s.contains(l)) {
if(logMINOR) Logger.minor(this,
"Deleting (block number conflict).");
@@ -1234,7 +1234,7 @@
Logger.error(this, "Environment
does not support files bigger than 2 GB?");
System.out.println("Environment
does not support files bigger than 2 GB? (exception to follow)");
}
- Logger.error(this, "Caught IOException
on chkStore.seek("+seekTarget+")");
+ Logger.error(this, "Caught IOException
on chkStore.seek("+seekTarget+ ')');
throw ioe;
}
chkStore.readFully(header);
@@ -1269,7 +1269,7 @@
}catch(CHKVerifyException ex){
Logger.error(this, "CHKBlock: Does not verify ("+ex+"),
setting accessTime to 0 for : "+chk);
- System.err.println("Does not verify (CHK block
"+storeBlock.offset+")");
+ System.err.println("Does not verify (CHK block
"+storeBlock.offset+ ')');
c.close();
c = null;
chkDB.delete(t, routingkeyDBE);
@@ -1452,7 +1452,7 @@
DSAPublicKey block = null;
byte[] data = new byte[dataBlockSize];
- if(logMINOR) Logger.minor(this, "Reading from store...
"+storeBlock.offset+" ("+storeBlock.recentlyUsed+")");
+ if(logMINOR) Logger.minor(this, "Reading from store...
"+storeBlock.offset+" ("+storeBlock.recentlyUsed+ ')');
synchronized(chkStore) {
chkStore.seek(storeBlock.offset*(long)(dataBlockSize+headerBlockSize));
chkStore.readFully(data);
@@ -1527,13 +1527,13 @@
private void addFreeBlock(long offset, boolean loud, String reason) {
if(freeBlocks.push(offset)) {
if(loud) {
- System.err.println("Freed block "+offset+"
("+reason+")");
- Logger.normal(this, "Freed block "+offset+"
("+reason+")");
+ System.err.println("Freed block "+offset+"
("+reason+ ')');
+ Logger.normal(this, "Freed block "+offset+"
("+reason+ ')');
} else {
- if(logMINOR) Logger.minor(this, "Freed block
"+offset+" ("+reason+")");
+ if(logMINOR) Logger.minor(this, "Freed block
"+offset+" ("+reason+ ')');
}
} else {
- if(logMINOR) Logger.minor(this, "Already freed block
"+offset+" ("+reason+")");
+ if(logMINOR) Logger.minor(this, "Already freed block
"+offset+" ("+reason+ ')');
}
}
@@ -1719,7 +1719,7 @@
Logger.error(this, "Environment does
not support files bigger than 2 GB?");
System.out.println("Environment does
not support files bigger than 2 GB? (exception to follow)");
}
- Logger.error(this, "Caught IOException on
chkStore.seek("+byteOffset+")");
+ Logger.error(this, "Caught IOException on
chkStore.seek("+byteOffset+ ')');
throw ioe;
}
chkStore.write(header);
Modified: trunk/freenet/src/freenet/support/Buffer.java
===================================================================
--- trunk/freenet/src/freenet/support/Buffer.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/support/Buffer.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -108,10 +108,10 @@
public String toString() {
if (this._length > 50) {
- return "Buffer {"+this._length+"}";
+ return "Buffer {"+this._length+ '}';
} else {
StringBuffer b = new StringBuffer(this._length*3);
- b.append("{").append(this._length).append(":");
+ b.append('{').append(this._length).append(':');
for (int x=0; x<this._length; x++) {
b.append(byteAt(x));
b.append(' ');
Modified: trunk/freenet/src/freenet/support/CPUInformation/CPUID.java
===================================================================
--- trunk/freenet/src/freenet/support/CPUInformation/CPUID.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/CPUInformation/CPUID.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -129,7 +129,7 @@
return new AMDInfoImpl();
if(getCPUVendorID().equals("GenuineIntel"))
return new IntelInfoImpl();
- throw new UnknownCPUException("Unknown CPU type:
'"+getCPUVendorID()+"'");
+ throw new UnknownCPUException("Unknown CPU type:
'"+getCPUVendorID()+ '\'');
}
protected abstract static class CPUIDCPUInfo
@@ -517,7 +517,7 @@
private static final String getResourceName()
{
String pname = CPUID.class.getPackage().getName().replace('.','/');
- return
pname+"/"+getLibraryPrefix()+getLibraryMiddlePart()+"."+getLibrarySuffix();
+ return pname+ '/' +getLibraryPrefix()+getLibraryMiddlePart()+ '.'
+getLibrarySuffix();
}
private static final String getLibraryPrefix()
@@ -542,7 +542,7 @@
return "jcpuid-x86-freebsd"; // The convention on
freebsd...
if(isMacOS)
return "jcpuid-x86-osx"; // The convention on Mac OS
X...
- throw new RuntimeException("Dont know jcpuid library name for
os type '"+System.getProperty("os.name")+"'");
+ throw new RuntimeException("Dont know jcpuid library name for
os type '"+System.getProperty("os.name")+ '\'');
}
private static final String getLibrarySuffix()
Modified: trunk/freenet/src/freenet/support/FileLoggerHook.java
===================================================================
--- trunk/freenet/src/freenet/support/FileLoggerHook.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/FileLoggerHook.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -515,7 +515,7 @@
}
name = name.substring(prefix.length());
if((name.length() == 0) || (name.charAt(0) !=
'-')) {
- if(logMINOR) Logger.minor(this,
"Deleting unrecognized: "+name+" ("+f.getPath()+")");
+ if(logMINOR) Logger.minor(this,
"Deleting unrecognized: "+name+" ("+f.getPath()+ ')');
f.delete();
continue;
} else
@@ -941,7 +941,7 @@
try {
dis.readFully(buf, 0, toRead);
} catch (IOException e) {
- Logger.error(this, "Could not read bytes
"+written+" to "+(written + toRead)+" from file "+toReturn.filename+" which is
supposed to be "+size+" bytes ("+toReturn.filename.length()+")");
+ Logger.error(this, "Could not read bytes
"+written+" to "+(written + toRead)+" from file "+toReturn.filename+" which is
supposed to be "+size+" bytes ("+toReturn.filename.length()+ ')');
return;
}
os.write(buf, 0, toRead);
Modified: trunk/freenet/src/freenet/support/HTMLNode.java
===================================================================
--- trunk/freenet/src/freenet/support/HTMLNode.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/support/HTMLNode.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -142,32 +142,32 @@
tagBuffer.append(content);
return tagBuffer;
}
- tagBuffer.append("<").append(name);
+ tagBuffer.append('<').append(name);
Set attributeSet = attributes.entrySet();
for (Iterator attributeIterator = attributeSet.iterator();
attributeIterator.hasNext();) {
Map.Entry attributeEntry = (Map.Entry)
attributeIterator.next();
String attributeName = (String) attributeEntry.getKey();
String attributeValue = (String)
attributeEntry.getValue();
- tagBuffer.append("
").append(HTMLEncoder.encode(attributeName)).append("=\"").append(HTMLEncoder.encode(attributeValue)).append("\"");
+ tagBuffer.append('
').append(HTMLEncoder.encode(attributeName)).append("=\"").append(HTMLEncoder.encode(attributeValue)).append('"');
}
if (children.size() == 0) {
if (name.equals("textarea") || name.equals("div") ||
name.equals("a")) {
- tagBuffer.append("></").append(name).append(">");
+ tagBuffer.append("></").append(name).append('>');
} else {
tagBuffer.append(" />");
}
} else {
- tagBuffer.append(">");
+ tagBuffer.append('>');
if(name.equals("div") || name.equals("form") ||
name.equals("input") || name.equals("script") || name.equals("table") ||
name.equals("tr") || name.equals("td")) {
- tagBuffer.append("\n");
+ tagBuffer.append('\n');
}
for (int childIndex = 0, childCount = children.size();
childIndex < childCount; childIndex++) {
HTMLNode childNode = (HTMLNode)
children.get(childIndex);
childNode.generate(tagBuffer);
}
- tagBuffer.append("</").append(name).append(">");
+ tagBuffer.append("</").append(name).append('>');
if(name.equals("div") || name.equals("form") ||
name.equals("input") || name.equals("li") || name.equals("option") ||
name.equals("script") || name.equals("table") || name.equals("tr") ||
name.equals("td")) {
- tagBuffer.append("\n");
+ tagBuffer.append('\n');
}
}
return tagBuffer;
Modified: trunk/freenet/src/freenet/support/HexUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/HexUtil.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/support/HexUtil.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -85,10 +85,10 @@
throw new IndexOutOfBoundsException(
"Output buffer too small for input ("
+ out.length
- + "<"
- + off
+ + '<'
+ + off
+ slen / 2
- + ")");
+ + ')');
}
// Safe to assume the string is even length
@@ -125,7 +125,7 @@
b[i] = (byte)s;
}
if(logDEBUG) Logger.debug(HexUtil.class, "bytes: "+bytesAlloc+"
returned from bitsToBytes("
- +ba+","+size+"): "+bytesToHex(b)+" for
"+sb.toString());
+ +ba+ ',' +size+"): "+bytesToHex(b)+" for
"+sb.toString());
return b;
}
Modified: trunk/freenet/src/freenet/support/LRUHashtable.java
===================================================================
--- trunk/freenet/src/freenet/support/LRUHashtable.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/support/LRUHashtable.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -31,7 +31,7 @@
list.remove(insert);
}
if(Logger.shouldLog(Logger.MINOR, this))
- Logger.minor(this, "Pushed "+insert+" ( "+key+" "+value+" )");
+ Logger.minor(this, "Pushed "+insert+" ( "+key+ ' ' +value+" )");
list.unshift(insert);
}
@@ -117,7 +117,7 @@
}
public String toString() {
- return super.toString()+": "+obj+" "+value;
+ return super.toString()+": "+obj+ ' ' +value;
}
}
}
Modified: trunk/freenet/src/freenet/support/NumberedRecentItems.java
===================================================================
--- trunk/freenet/src/freenet/support/NumberedRecentItems.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/NumberedRecentItems.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -90,7 +90,7 @@
if((item != null) && (num < 0))
throw new IllegalStateException("getNumber() must return
positive numbers");
if((num < prevNum) || ((num != -1) && (num == prevNum))) {
- throw new IllegalStateException("Must be higher than prev:
"+num+" "+prevNum);
+ throw new IllegalStateException("Must be higher than prev:
"+num+ ' ' +prevNum);
}
prevNum = num;
}
Modified: trunk/freenet/src/freenet/support/PromiscuousItemException.java
===================================================================
--- trunk/freenet/src/freenet/support/PromiscuousItemException.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/PromiscuousItemException.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -20,6 +20,6 @@
}
public PromiscuousItemException(Item item, DoublyLinkedList parent) {
- super(item.toString()+":"+parent);
+ super(item.toString()+ ':' +parent);
}
}
Modified: trunk/freenet/src/freenet/support/ShortBuffer.java
===================================================================
--- trunk/freenet/src/freenet/support/ShortBuffer.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/support/ShortBuffer.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -110,10 +110,10 @@
public String toString() {
if (this._length > 50) {
- return "Buffer {"+this._length+"}";
+ return "Buffer {"+this._length+ '}';
} else {
StringBuffer b = new StringBuffer(this._length*3);
- b.append("{").append(this._length).append(":");
+ b.append('{').append(this._length).append(':');
for (int x=0; x<this._length; x++) {
b.append(byteAt(x));
b.append(' ');
Modified: trunk/freenet/src/freenet/support/SimpleFieldSet.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleFieldSet.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/SimpleFieldSet.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -184,7 +184,7 @@
if(x == null) {
values.put(key, value);
} else {
- values.put(key,
((String)values.get(key))+";"+value);
+ values.put(key, ((String)values.get(key))+ ';'
+value);
}
} else {
String before = key.substring(0, idx);
@@ -238,7 +238,7 @@
Map.Entry entry = (Map.Entry) i.next();
String key = (String) entry.getKey();
String value = (String) entry.getValue();
- w.write(prefix+key+"="+value+"\n");
+ w.write(prefix+key+ '=' +value+ '\n');
}
if(subsets != null) {
for(Iterator i = subsets.entrySet().iterator();i.hasNext();) {
@@ -253,7 +253,7 @@
if(endMarker == null)
w.write("End\n");
else
- w.write(endMarker+"\n");
+ w.write(endMarker+ '\n');
}
}
@@ -288,7 +288,7 @@
if(endMarker == null)
w.write("End\n");
else
- w.write(endMarker+"\n");
+ w.write(endMarker+ '\n');
}
}
Modified: trunk/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/SimpleReadOnlyArrayBucket.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -38,7 +38,7 @@
}
public String getName() {
- return "SimpleReadOnlyArrayBucket: len="+length+"
"+super.toString();
+ return "SimpleReadOnlyArrayBucket: len="+length+ ' '
+super.toString();
}
public long size() {
Modified: trunk/freenet/src/freenet/support/SizeUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/SizeUtil.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/support/SizeUtil.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -31,7 +31,7 @@
else if((o.indexOf('.') > -1) && (o.indexOf('E') == -1)
&& (o.length() > 4))
o = o.substring(0, 4);
if(i < SizeUtil.suffixes.length) // handle the case
where the mantissa is Infinity
- o += " " + SizeUtil.suffixes[i];
+ o += ' ' + SizeUtil.suffixes[i];
return o;
}
}
Modified: trunk/freenet/src/freenet/support/TimeUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/TimeUtil.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/support/TimeUtil.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -32,14 +32,14 @@
//
int weeks = (int)(l / ((long)7*24*60*60*1000));
if (weeks > 0) {
- sb.append(weeks).append("w");
+ sb.append(weeks).append('w');
termCount++;
l = l - ((long)weeks * ((long)7*24*60*60*1000));
}
//
int days = (int)(l / ((long)24*60*60*1000));
if (days > 0) {
- sb.append(days).append("d");
+ sb.append(days).append('d');
termCount++;
l = l - ((long)days * ((long)24*60*60*1000));
}
@@ -49,7 +49,7 @@
//
int hours = (int)(l / ((long)60*60*1000));
if (hours > 0) {
- sb.append(hours).append("h");
+ sb.append(hours).append('h');
termCount++;
l = l - ((long)hours * ((long)60*60*1000));
}
@@ -59,7 +59,7 @@
//
int minutes = (int)(l / ((long)60*1000));
if (minutes > 0) {
- sb.append(minutes).append("m");
+ sb.append(minutes).append('m');
termCount++;
l = l - ((long)minutes * ((long)60*1000));
}
@@ -70,14 +70,14 @@
if (l > 0) {
double fractionalSeconds = ((double) l) /
((double) 1000.0);
DecimalFormat fix3 = new DecimalFormat("0.000");
- sb.append(fix3.format(fractionalSeconds)).append("s");
+ sb.append(fix3.format(fractionalSeconds)).append('s');
termCount++;
l = l - ((long)fractionalSeconds * (long)1000);
}
} else {
int seconds = (int)(l / (long)1000);
if (seconds > 0) {
- sb.append(seconds).append("s");
+ sb.append(seconds).append('s');
termCount++;
l = l - ((long)seconds * (long)1000);
}
Modified: trunk/freenet/src/freenet/support/URLEncoder.java
===================================================================
--- trunk/freenet/src/freenet/support/URLEncoder.java 2006-11-16 22:09:46 UTC
(rev 10960)
+++ trunk/freenet/src/freenet/support/URLEncoder.java 2006-11-16 22:49:45 UTC
(rev 10961)
@@ -28,7 +28,7 @@
if (c < 16) {
enc.append("%0");
} else {
- enc.append("%");
+ enc.append('%');
}
enc.append(Integer.toHexString(c));
}
Modified: trunk/freenet/src/freenet/support/UpdatableSortedLinkedList.java
===================================================================
--- trunk/freenet/src/freenet/support/UpdatableSortedLinkedList.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/UpdatableSortedLinkedList.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -51,7 +51,7 @@
checkList();
return;
}
- if(logMINOR) Logger.minor(this, "Not matching "+cur+" "+prev);
+ if(logMINOR) Logger.minor(this, "Not matching "+cur+ ' ' +prev);
prev = cur;
}
throw new IllegalStateException("impossible");
@@ -69,7 +69,7 @@
UpdatableSortedLinkedListItem i =
(UpdatableSortedLinkedListItem) e.nextElement();
// Sanity check for infinite looping
if(realLength > 100*1000)
- Logger.normal(this, "["+realLength+"] = "+i+"
(prev="+i.getPrev()+")");
+ Logger.normal(this, "["+realLength+"] = "+i+"
(prev="+i.getPrev()+ ')');
realLength++;
}
if(statedLength != realLength) {
Modified: trunk/freenet/src/freenet/support/io/BucketTools.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BucketTools.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/io/BucketTools.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -363,7 +363,7 @@
if((bytesRead < bucketLength) && (bucketLength > 0))
throw new EOFException();
if((bytesRead != bucketLength) && (bucketLength > 0))
- throw new IOException("Read "+bytesRead+" but
bucket length "+bucketLength+"!");
+ throw new IOException("Read "+bytesRead+" but
bucket length "+bucketLength+ '!');
return md.digest();
} finally {
if(is != null) is.close();
@@ -388,7 +388,7 @@
if(bytes <= 0) {
if(truncateLength == Long.MAX_VALUE)
break;
- throw new IOException("Could not move
required quantity of data: "+bytes+" (moved "+moved+" of "+truncateLength+")");
+ throw new IOException("Could not move
required quantity of data: "+bytes+" (moved "+moved+" of "+truncateLength+ ')');
}
os.write(buf, 0, bytes);
moved += bytes;
@@ -414,7 +414,7 @@
if(bytes <= 0) {
if(truncateLength == Long.MAX_VALUE)
break;
- throw new IOException("Could not move
required quantity of data: "+bytes+" (moved "+moved+" of "+truncateLength+")");
+ throw new IOException("Could not move
required quantity of data: "+bytes+" (moved "+moved+" of "+truncateLength+ ')');
}
os.write(buf, 0, bytes);
moved += bytes;
Modified: trunk/freenet/src/freenet/support/io/FileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/FileBucket.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/io/FileBucket.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -72,8 +72,8 @@
file =
new File(
tempDir,
- "t"
- + Integer.toHexString(
+ 't'
+ + Integer.toHexString(
Math.abs(random.nextInt())));
// Useful for finding temp file leaks.
//System.err.println("-- FileBucket.ctr(1) -- " +
@@ -342,7 +342,7 @@
}
public synchronized String toString() {
- return super.toString()+":"+file.getPath();
+ return super.toString()+ ':' +file.getPath();
}
public synchronized SimpleFieldSet toFieldSet() {
Modified:
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -309,7 +309,7 @@
}
public String toString() {
- return super.toString()+":"+bucket.toString();
+ return super.toString()+ ':' +bucket.toString();
}
public synchronized long size() {
Modified: trunk/freenet/src/freenet/support/io/RandomAccessFileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/RandomAccessFileBucket.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/io/RandomAccessFileBucket.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -110,7 +110,7 @@
public String getName() {
return file.getAbsolutePath() + " [" + offset + ", " +
- (offset + len - 1) + "]";
+ (offset + len - 1) + ']';
}
public synchronized void resetWrite() {
@@ -225,7 +225,7 @@
raf = new RandomAccessFile(file, "r");
raf.seek(offset);
println(" -- Created new InputStream [" + offset +
- ", " + (offset + len -1) + "]" );
+ ", " + (offset + len -1) + ']');
}
////////////////////////////////////////////////////////////
@@ -352,7 +352,7 @@
raf = new RandomAccessFile(file, "rw");
raf.seek(offset + localOffset);
println(" -- Created new OutputStream [" + offset + ", "
- + (offset + len -1) + "]" );
+ + (offset + len -1) + ']');
}
////////////////////////////////////////////////////////////
Modified: trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -58,7 +58,7 @@
}
public String getName() {
- return "ROFS:"+file.getAbsolutePath()+":"+startAt+":"+length;
+ return "ROFS:"+file.getAbsolutePath()+ ':' +startAt+ ':'
+length;
}
public long size() {
Modified: trunk/freenet/src/freenet/support/io/TempFileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TempFileBucket.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/io/TempFileBucket.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -64,7 +64,7 @@
if (logDebug)
Logger.debug(
this,
- "Initializing TempFileBucket(" + f +
"," + hook + ")");
+ "Initializing TempFileBucket(" + f +
',' + hook + ')');
}
}
@@ -325,14 +325,14 @@
+ l
+ " (real length: "
+ length
- + ")");
+ + ')');
hook.enlargeFile(fakeLength, l);
}
fakeLength = l;
}
public synchronized String toString(){
- return "TempFileBucket (File:
'"+getFile().getAbsolutePath()+"', streams: "+streams.size()+", hook:
"+hook+")";
+ return "TempFileBucket (File:
'"+getFile().getAbsolutePath()+"', streams: "+streams.size()+", hook: "+hook+
')';
}
class HookedFileBucketInputStream extends FileBucketInputStream {
@@ -360,9 +360,9 @@
this,
"Created HookedFileBucketOutputStream("
+ s
- + ","
- + restartCount
- + ")");
+ + ','
+ + restartCount
+ + ')');
}
public void close() throws IOException {
Modified: trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
===================================================================
--- trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
2006-11-16 22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
2006-11-16 22:49:45 UTC (rev 10961)
@@ -128,7 +128,7 @@
}
public synchronized String toString() {
- return super.toString() + " ("+extraToString()+")"+
+ return super.toString() + " ("+extraToString()+ ')' +
", init="+defaultValue+", index="+index+",
totalReported="+
totalReported;
}
Modified: trunk/freenet/src/net/i2p/util/NativeBigInteger.java
===================================================================
--- trunk/freenet/src/net/i2p/util/NativeBigInteger.java 2006-11-16
22:09:46 UTC (rev 10960)
+++ trunk/freenet/src/net/i2p/util/NativeBigInteger.java 2006-11-16
22:49:45 UTC (rev 10961)
@@ -566,7 +566,7 @@
String suff = getLibrarySuffix();
if((pref == null) || (middle == null) || (suff == null))
return null;
- return pname+"/"+pref+middle+"."+suff;
+ return pname+ '/' +pref+middle+ '.' +suff;
}
private static final String getMiddleName(boolean optimized){
@@ -577,7 +577,7 @@
if(sCPUType == null)
return null;
else
- sAppend = "-"+sCPUType;
+ sAppend = '-' +sCPUType;
}else
sAppend = "-none";
@@ -593,7 +593,7 @@
return "jbigi-freebsd"+sAppend; // The convention on
freebsd...
if(isMacOS)
return "jbigi-osx"+sAppend; // The convention on Mac OS
X...
- throw new RuntimeException("Dont know jbigi library name for os
type '"+System.getProperty("os.name")+"'");
+ throw new RuntimeException("Dont know jbigi library name for os
type '"+System.getProperty("os.name")+ '\'');
}
private static final String getLibrarySuffix()
{
