Author: toad
Date: 2006-11-09 19:56:46 +0000 (Thu, 09 Nov 2006)
New Revision: 10847
Modified:
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
trunk/freenet/src/freenet/config/StringArrOption.java
trunk/freenet/src/freenet/crypt/SHA256.java
trunk/freenet/src/freenet/crypt/StationToStationContext.java
trunk/freenet/src/freenet/io/comm/Message.java
trunk/freenet/src/freenet/keys/FreenetURI.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/fcp/ModifyConfig.java
trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
trunk/freenet/src/freenet/pluginmanager/PluginManager.java
trunk/freenet/src/freenet/support/Buffer.java
trunk/freenet/src/freenet/support/HTMLNode.java
trunk/freenet/src/freenet/support/ShortBuffer.java
trunk/freenet/src/freenet/support/TimeUtil.java
Log:
Lots of trivial optimisations from UniquePerson.
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2006-11-09
19:33:53 UTC (rev 10846)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2006-11-09
19:56:46 UTC (rev 10847)
@@ -49,7 +49,7 @@
for(int i=0; i<sc.length ; i++){
Option[] o = sc[i].getOptions();
- String prefix = new String(sc[i].getPrefix());
+ String prefix = sc[i].getPrefix();
String configName;
for(int j=0; j<o.length; j++){
@@ -64,7 +64,7 @@
try{
o[j].setValue(value);
}catch(Exception e){
-
errbuf.append(o[j].getName()+" "+e+"\n");
+ errbuf.append(o[j].getName()).append("
").append(e).append("\n");
Logger.error(this,
"Caught "+e, e);
}
}
Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2006-11-09 19:33:53 UTC (rev 10846)
+++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2006-11-09 19:56:46 UTC (rev 10847)
@@ -309,7 +309,7 @@
boolean killText = false; // has to be set on or off explicitly
by tags
boolean killStyle = false;
int styleScriptRecurseCount = 0;
- String currentStyleScriptChunk = new String();
+ String currentStyleScriptChunk = "";
StringBuffer writeAfterTag = new StringBuffer(1024);
}
@@ -1938,7 +1938,7 @@
try {
return sanitizeURI(suri, overrideType, overrideCharset,
cb);
} catch (CommentException e) {
- pc.writeAfterTag.append("<!--
"+HTMLEncoder.encode(e.toString())+" -->");
+ pc.writeAfterTag.append("<!--
").append(HTMLEncoder.encode(e.toString())).append(" -->");
return null;
}
}
Modified: trunk/freenet/src/freenet/config/StringArrOption.java
===================================================================
--- trunk/freenet/src/freenet/config/StringArrOption.java 2006-11-09
19:33:53 UTC (rev 10846)
+++ trunk/freenet/src/freenet/config/StringArrOption.java 2006-11-09
19:56:46 UTC (rev 10847)
@@ -52,7 +52,7 @@
return null;
StringBuffer sb = new StringBuffer();
for (int i = 0 ; i < arr.length ; i++)
- sb.append(arr[i] + delimiter);
+ sb.append(arr[i]).append(delimiter);
return sb.toString();
}
Modified: trunk/freenet/src/freenet/crypt/SHA256.java
===================================================================
--- trunk/freenet/src/freenet/crypt/SHA256.java 2006-11-09 19:33:53 UTC (rev
10846)
+++ trunk/freenet/src/freenet/crypt/SHA256.java 2006-11-09 19:56:46 UTC (rev
10847)
@@ -241,8 +241,7 @@
* @param offset index of first of the n elements
**/
public void extract(int [] digest, int offset) {
- for( int i=0; i<context.length; i++ )
- digest[i+offset]=context[i];
+ System.arraycopy(context, 0, digest, offset, context.length);
}
/**
Modified: trunk/freenet/src/freenet/crypt/StationToStationContext.java
===================================================================
--- trunk/freenet/src/freenet/crypt/StationToStationContext.java
2006-11-09 19:33:53 UTC (rev 10846)
+++ trunk/freenet/src/freenet/crypt/StationToStationContext.java
2006-11-09 19:56:46 UTC (rev 10847)
@@ -94,7 +94,7 @@
MessageDigest md = SHA256.getMessageDigest();
- String message = new String("("+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 = new
String("("+hisExponential+","+myExponential+")");
+ final String message = "(" + hisExponential + "," + myExponential + ")";
MessageDigest md = SHA256.getMessageDigest();
try{
Modified: trunk/freenet/src/freenet/io/comm/Message.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Message.java 2006-11-09 19:33:53 UTC
(rev 10846)
+++ trunk/freenet/src/freenet/io/comm/Message.java 2006-11-09 19:56:46 UTC
(rev 10847)
@@ -183,11 +183,11 @@
public String toString() {
StringBuffer ret = new StringBuffer(1000);
String comma = "";
- ret.append(_spec.getName() + " {");
+ ret.append(_spec.getName()).append(" {");
for (Iterator i = _spec.getFields().keySet().iterator();
i.hasNext();) {
ret.append(comma);
String name = (String) i.next();
- ret.append(name + "=" + _payload.get(name) );
+ ret.append(name).append("=").append(_payload.get(name));
comma = ", ";
}
ret.append("}");
Modified: trunk/freenet/src/freenet/keys/FreenetURI.java
===================================================================
--- trunk/freenet/src/freenet/keys/FreenetURI.java 2006-11-09 19:33:53 UTC
(rev 10846)
+++ trunk/freenet/src/freenet/keys/FreenetURI.java 2006-11-09 19:56:46 UTC
(rev 10847)
@@ -129,9 +129,8 @@
keyType = uri.keyType;
docName = uri.docName;
metaStr = new String[uri.metaStr.length];
- for(int i=0;i<metaStr.length;i++)
- metaStr[i] = uri.metaStr[i];
- if(uri.routingKey != null) {
+ System.arraycopy(uri.metaStr, 0, metaStr, 0, metaStr.length);
+ if(uri.routingKey != null) {
routingKey = new byte[uri.routingKey.length];
System.arraycopy(uri.routingKey, 0, routingKey, 0,
routingKey.length);
} else {
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-11-09 19:33:53 UTC (rev
10846)
+++ trunk/freenet/src/freenet/node/Node.java 2006-11-09 19:56:46 UTC (rev
10847)
@@ -2846,7 +2846,7 @@
* Handle a node to node text message SimpleFieldSet
*/
public void handleNodeToNodeTextMessageSimpleFieldSet(SimpleFieldSet
fs, PeerNode source, int fileNumber) {
- int type = new Integer(fs.get("type")).intValue();
+ int type = Integer.parseInt(fs.get("type"));
if(type == Node.N2N_TEXT_MESSAGE_TYPE_USERALERT) {
String source_nodename = null;
String target_nodename = null;
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-11-09 19:33:53 UTC
(rev 10846)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-11-09 19:56:46 UTC
(rev 10847)
@@ -414,7 +414,7 @@
boolean failed = false;
if(signature == null || peerCryptoGroup == null
|| peerPubKey == null ||
(failed =
!DSA.verify(peerPubKey, new DSASignature(signature), new
BigInteger(md.digest(fs.toOrderedString().getBytes("UTF-8")))))){
- String errCause = new String();
+ String errCause = "";
if(signature == null) errCause += " (No
signature)";
if(peerCryptoGroup == null) errCause +=
" (No peer crypto group)";
if(peerPubKey == null) errCause += "
(No peer public key)";
@@ -613,7 +613,7 @@
setPeerNodeStatus(now);
// Setup the private darknet comment note
- privateDarknetComment = new String();
+ privateDarknetComment = "";
privateDarknetCommentFileNumber = -1;
// Setup the extraPeerDataFileNumbers
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-11-09
19:33:53 UTC (rev 10846)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-11-09
19:56:46 UTC (rev 10847)
@@ -129,7 +129,7 @@
sb.append("Trivial Text Mode Client Interface\r\n");
sb.append("---------------------------------------\r\n");
- sb.append("Freenet 0.7 Build #"+Version.buildNumber()+"
r"+Version.cvsRevision+"\r\n");
+ sb.append("Freenet 0.7 Build
#").append(Version.buildNumber()).append(" r" + Version.cvsRevision + "\r\n");
sb.append("Enter one of the following commands:\r\n");
sb.append("GET:<Freenet key> - Fetch a key\r\n");
sb.append("PUT:\\r\\n<text, until a . on a line by itself> - Insert
the document and return the key.\r\n");
@@ -192,7 +192,7 @@
try {
line = reader.readLine();
} catch (IOException e) {
- outsb.append("Bye... ("+e+")");
+ outsb.append("Bye... (").append(e).append(")");
System.err.println("Bye... ("+e+")");
return true;
}
@@ -214,18 +214,18 @@
uri = new FreenetURI(key);
Logger.normal(this, "Key: "+uri);
} catch (MalformedURLException e2) {
- outsb.append("Malformed URI: "+key+" : "+e2);
+ outsb.append("Malformed URI: ").append(key).append(" :
").append(e2);
return false;
}
try {
FetchResult result = client.fetch(uri);
ClientMetadata cm = result.getMetadata();
- outsb.append("Content MIME type:
"+cm.getMIMEType());
+ outsb.append("Content MIME type: ").append(cm.getMIMEType());
Bucket data = result.asBucket();
// FIXME limit it above
if(data.size() > 32*1024) {
System.err.println("Data is more than
32K: "+data.size());
- outsb.append("Data is more than 32K:
"+data.size());
+ outsb.append("Data is more than 32K:
").append(data.size());
return false;
}
byte[] dataBytes =
BucketTools.toByteArray(data);
@@ -244,12 +244,12 @@
outsb.append("Data:\r\n");
outsb.append(new String(dataBytes));
} catch (FetchException e) {
- outsb.append("Error: "+e.getMessage()+"\r\n");
+ outsb.append("Error: ").append(e.getMessage()).append("\r\n");
if((e.getMode() == FetchException.SPLITFILE_ERROR) &&
(e.errorCodes != null)) {
outsb.append(e.errorCodes.toVerboseString());
}
if(e.newURI != null)
- outsb.append("Permanent redirect: "+e.newURI+"\r\n");
+ outsb.append("Permanent redirect:
").append(e.newURI).append("\r\n");
}
} else if(uline.startsWith("GETFILE:")) {
// Should have a key next
@@ -263,14 +263,14 @@
try {
uri = new FreenetURI(key);
} catch (MalformedURLException e2) {
- outsb.append("Malformed URI: "+key+" : "+e2);
+ outsb.append("Malformed URI: ").append(key).append(" :
").append(e2);
return false;
}
try {
long startTime = System.currentTimeMillis();
FetchResult result = client.fetch(uri);
ClientMetadata cm = result.getMetadata();
- outsb.append("Content MIME type:
"+cm.getMIMEType());
+ outsb.append("Content MIME type: ").append(cm.getMIMEType());
Bucket data = result.asBucket();
// Now calculate filename
String fnam = uri.getDocName();
@@ -283,7 +283,7 @@
}
File f = new File(downloadsDir, fnam);
if(f.exists()) {
- outsb.append("File exists already: "+fnam);
+ outsb.append("File exists already: ").append(fnam);
fnam = "freenet-"+System.currentTimeMillis()+"-"+fnam;
}
FileOutputStream fos = null;
@@ -291,9 +291,9 @@
fos = new FileOutputStream(f);
BucketTools.copyTo(data, fos, Long.MAX_VALUE);
fos.close();
- outsb.append("Written to "+fnam);
+ outsb.append("Written to ").append(fnam);
} catch (IOException e) {
- outsb.append("Could not write file: caught "+e);
+ outsb.append("Could not write file: caught ").append(e);
e.printStackTrace();
} finally {
if(fos != null) try {
@@ -305,14 +305,14 @@
long endTime = System.currentTimeMillis();
long sz = data.size();
double rate = 1000.0 * sz / (endTime-startTime);
- outsb.append("Download rate: "+rate+" bytes / second");
+ outsb.append("Download rate: ").append(rate).append(" bytes /
second");
} catch (FetchException e) {
- outsb.append("Error: "+e.getMessage());
+ outsb.append("Error: ").append(e.getMessage());
if((e.getMode() == FetchException.SPLITFILE_ERROR) &&
(e.errorCodes != null)) {
outsb.append(e.errorCodes.toVerboseString());
}
if(e.newURI != null)
- outsb.append("Permanent redirect: "+e.newURI+"\r\n");
+ outsb.append("Permanent redirect:
").append(e.newURI).append("\r\n");
}
} else if(uline.startsWith("UPDATE")) {
outsb.append("starting the update process");
@@ -379,17 +379,17 @@
try {
uri = client.insert(block, getCHKOnly, null);
} catch (InserterException e) {
- outsb.append("Error: "+e.getMessage());
+ outsb.append("Error: ").append(e.getMessage());
if(e.uri != null)
- outsb.append("URI would have been: "+e.uri);
+ outsb.append("URI would have been: ").append(e.uri);
int mode = e.getMode();
if((mode == InserterException.FATAL_ERRORS_IN_BLOCKS) || (mode
== InserterException.TOO_MANY_RETRIES_IN_BLOCKS)) {
- outsb.append("Splitfile-specific
error:\n"+e.errorCodes.toVerboseString());
+ outsb.append("Splitfile-specific
error:\n").append(e.errorCodes.toVerboseString());
}
return false;
}
-
- outsb.append("URI: "+uri);
+
+ outsb.append("URI: ").append(uri);
////////////////////////////////////////////////////////////////////////////////
} else if(uline.startsWith("PUTDIR:") ||
(uline.startsWith("PUTSSKDIR")) || (getCHKOnly =
uline.startsWith("GETCHKDIR:"))) {
// TODO: Check for errors?
@@ -450,14 +450,14 @@
uri = client.insertManifest(insertURI,
bucketsByName, defaultFile);
uri = uri.addMetaStrings(new String[] { "" });
outsb.append("=======================================================");
- outsb.append("URI: "+uri);
+ outsb.append("URI: ").append(uri);
outsb.append("=======================================================");
} catch (InserterException e) {
- outsb.append("Finished insert but: "+e.getMessage());
+ outsb.append("Finished insert but: ").append(e.getMessage());
if(e.uri != null) {
uri = e.uri;
uri = uri.addMetaStrings(new String[] { "" });
- outsb.append("URI would have been: "+uri);
+ outsb.append("URI would have been: ").append(uri);
}
if(e.errorCodes != null) {
outsb.append("Splitfile errors breakdown:");
@@ -484,7 +484,7 @@
mimeType = splittedLine[1];
}
File f = new File(line);
- outsb.append("Attempting to read file "+line);
+ outsb.append("Attempting to read file ").append(line);
long startTime = System.currentTimeMillis();
try {
if(!(f.exists() && f.canRead())) {
@@ -492,7 +492,7 @@
}
// Guess MIME type
- outsb.append("Using MIME type: "+mimeType + "\r\n");
+ outsb.append("Using MIME type:
").append(mimeType).append("\r\n");
if(mimeType.equals(DefaultMIMETypes.DEFAULT_MIME_TYPE))
mimeType = ""; // don't need to override it
@@ -504,40 +504,40 @@
// FIXME depends on CHK's still being renamable
//uri = uri.setDocName(f.getName());
-
- outsb.append("URI: "+uri+"\r\n");
+
+ outsb.append("URI: ").append(uri).append("\r\n");
long endTime = System.currentTimeMillis();
long sz = f.length();
double rate = 1000.0 * sz / (endTime-startTime);
- outsb.append("Upload rate: "+rate+" bytes / second\r\n");
+ outsb.append("Upload rate: ").append(rate).append(" bytes /
second\r\n");
} catch (FileNotFoundException e1) {
outsb.append("File not found");
} catch (InserterException e) {
- outsb.append("Finished insert but: "+e.getMessage());
+ outsb.append("Finished insert but: ").append(e.getMessage());
if(e.uri != null) {
- outsb.append("URI would have been: "+e.uri);
+ outsb.append("URI would have been: ").append(e.uri);
long endTime = System.currentTimeMillis();
long sz = f.length();
double rate = 1000.0 * sz / (endTime-startTime);
- outsb.append("Upload rate: "+rate+" bytes / second");
+ outsb.append("Upload rate: ").append(rate).append(" bytes
/ second");
}
if(e.errorCodes != null) {
outsb.append("Splitfile errors breakdown:");
outsb.append(e.errorCodes.toVerboseString());
}
} catch (Throwable t) {
- outsb.append("Insert threw: "+t);
+ outsb.append("Insert threw: ").append(t);
t.printStackTrace();
}
} else if(uline.startsWith("MAKESSK")) {
InsertableClientSSK key = InsertableClientSSK.createRandom(r,
"");
- outsb.append("Insert URI:
"+key.getInsertURI().toString(false)+"\r\n");
- outsb.append("Request URI:
"+key.getURI().toString(false)+"\r\n");
+ outsb.append("Insert URI:
").append(key.getInsertURI().toString(false)).append("\r\n");
+ outsb.append("Request URI:
").append(key.getURI().toString(false)).append("\r\n");
FreenetURI insertURI =
key.getInsertURI().setDocName("testsite");
String fixedInsertURI = insertURI.toString(false);
- outsb.append("Note that you MUST add a filename to the end of
the above URLs e.g.:\r\n"+fixedInsertURI+"\r\n");
- outsb.append("Normally you will then do PUTSSKDIR:<insert
URI>#<directory to upload>, for
example:\r\nPUTSSKDIR:"+fixedInsertURI+"#directoryToUpload/"+"\r\n");
- outsb.append("This will then produce a manifest site containing
all the files, the default document can be accessed
at\r\n"+key.getURI().toString(false)+"testsite/");
+ outsb.append("Note that you MUST add a filename to the end of the
above URLs e.g.:\r\n").append(fixedInsertURI).append("\r\n");
+ outsb.append("Normally you will then do PUTSSKDIR:<insert
URI>#<directory to upload>, for
example:\r\nPUTSSKDIR:").append(fixedInsertURI).append("#directoryToUpload/" +
"\r\n");
+ outsb.append("This will then produce a manifest site containing
all the files, the default document can be accessed
at\r\n").append(key.getURI().toString(false)).append("testsite/");
} else if(uline.startsWith("PUTSSK:")) {
String cmd = line.substring("PUTSSK:".length());
cmd = cmd.trim();
@@ -549,18 +549,18 @@
String[] split = cmd.split(";");
String insertURI = split[0];
String targetURI = split[1];
- outsb.append("Insert URI: "+insertURI);
- outsb.append("Target URI: "+targetURI);
+ outsb.append("Insert URI: ").append(insertURI);
+ outsb.append("Target URI: ").append(targetURI);
FreenetURI insert = new FreenetURI(insertURI);
FreenetURI target = new FreenetURI(targetURI);
try {
FreenetURI result =
client.insertRedirect(insert, target);
- outsb.append("Successfully inserted to fetch
URI: "+result);
+ outsb.append("Successfully inserted to fetch URI:
").append(result);
} catch (InserterException e) {
- outsb.append("Finished insert but: "+e.getMessage());
+ outsb.append("Finished insert but: ").append(e.getMessage());
Logger.normal(this, "Error: "+e, e);
if(e.uri != null) {
- outsb.append("URI would have been: "+e.uri);
+ outsb.append("URI would have been: ").append(e.uri);
}
}
@@ -569,7 +569,7 @@
outsb.append(fs.toString());
outsb.append(n.getStatus());
if(Version.buildNumber()<Version.highestSeenBuild){
- outsb.append("The latest version is :
"+Version.highestSeenBuild);
+ outsb.append("The latest version is :
").append(Version.highestSeenBuild);
}
} else if(uline.startsWith("ADDPEER:") ||
uline.startsWith("CONNECT:")) {
String key = null;
@@ -587,7 +587,7 @@
if(key.length() > 0) {
// Filename
BufferedReader in;
- outsb.append("Trying to add peer to node by noderef in
"+key+"\r\n");
+ outsb.append("Trying to add peer to node by noderef in
").append(key).append("\r\n");
File f = new File(key);
if (f.isFile()) {
outsb.append("Given string seems to be a file,
loading...\r\n");
@@ -609,13 +609,13 @@
addPeer(content);
} else if(uline.startsWith("NAME:")) {
- outsb.append("Node name currently: "+n.getName());
+ outsb.append("Node name currently: ").append(n.getName());
String key = line.substring("NAME:".length());
while((key.length() > 0) && (key.charAt(0) == ' '))
key = key.substring(1);
while((key.length() > 0) && (key.charAt(key.length()-1) == ' '))
key = key.substring(0, key.length()-2);
- outsb.append("New name: "+key);
+ outsb.append("New name: ").append(key);
try{
n.setName(key);
@@ -633,9 +633,9 @@
return false;
}
if(disablePeer(nodeIdentifier)) {
- outsb.append("disable succeeded for "+nodeIdentifier);
+ outsb.append("disable succeeded for ").append(nodeIdentifier);
} else {
- outsb.append("disable failed for "+nodeIdentifier);
+ outsb.append("disable failed for ").append(nodeIdentifier);
}
outsb.append("\r\n");
} else if(uline.startsWith("ENABLEPEER:")) {
@@ -646,9 +646,9 @@
return false;
}
if(enablePeer(nodeIdentifier)) {
- outsb.append("enable succeeded for "+nodeIdentifier);
+ outsb.append("enable succeeded for ").append(nodeIdentifier);
} else {
- outsb.append("enable failed for "+nodeIdentifier);
+ outsb.append("enable failed for ").append(nodeIdentifier);
}
outsb.append("\r\n");
} else if(uline.startsWith("SETPEERLISTENONLY:")) {
@@ -665,7 +665,7 @@
return false;
}
pn.setListenOnly(true);
- outsb.append("set ListenOnly suceeded for
"+nodeIdentifier+"\r\n");
+ outsb.append("set ListenOnly suceeded for
").append(nodeIdentifier).append("\r\n");
} else if(uline.startsWith("UNSETPEERLISTENONLY:")) {
String nodeIdentifier =
(line.substring("UNSETPEERLISTENONLY:".length())).trim();
if(!havePeer(nodeIdentifier)) {
@@ -680,13 +680,13 @@
return false;
}
pn.setListenOnly(false);
- outsb.append("unset ListenOnly suceeded for
"+nodeIdentifier+"\r\n");
+ outsb.append("unset ListenOnly suceeded for
").append(nodeIdentifier).append("\r\n");
} else if(uline.startsWith("HAVEPEER:")) {
String nodeIdentifier =
(line.substring("HAVEPEER:".length())).trim();
if(havePeer(nodeIdentifier)) {
- outsb.append("true for "+nodeIdentifier);
+ outsb.append("true for ").append(nodeIdentifier);
} else {
- outsb.append("false for "+nodeIdentifier);
+ outsb.append("false for ").append(nodeIdentifier);
}
outsb.append("\r\n");
} else if(uline.startsWith("REMOVEPEER:") ||
uline.startsWith("DISCONNECT:")) {
@@ -697,9 +697,9 @@
nodeIdentifier = line.substring("REMOVEPEER:".length());
}
if(removePeer(nodeIdentifier)) {
- outsb.append("peer removed for "+nodeIdentifier);
+ outsb.append("peer removed for ").append(nodeIdentifier);
} else {
- outsb.append("peer removal failed for "+nodeIdentifier);
+ outsb.append("peer removal failed for
").append(nodeIdentifier);
}
outsb.append("\r\n");
} else if(uline.startsWith("PEER:")) {
Modified: trunk/freenet/src/freenet/node/fcp/ModifyConfig.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ModifyConfig.java 2006-11-09
19:33:53 UTC (rev 10846)
+++ trunk/freenet/src/freenet/node/fcp/ModifyConfig.java 2006-11-09
19:56:46 UTC (rev 10847)
@@ -36,7 +36,7 @@
for(int i=0; i<sc.length ; i++){
Option[] o = sc[i].getOptions();
- String prefix = new String(sc[i].getPrefix());
+ String prefix = sc[i].getPrefix();
String configName;
for(int j=0; j<o.length; j++){
Modified: trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
2006-11-09 19:33:53 UTC (rev 10846)
+++ trunk/freenet/src/freenet/pluginmanager/PluginInfoWrapper.java
2006-11-09 19:56:46 UTC (rev 10847)
@@ -47,7 +47,7 @@
}
public String getPluginClassName(){
- return plug.getClass().getName().toString();
+ return plug.getClass().getName();
}
public String[] getPluginToadletSymlinks(){
Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2006-11-09
19:33:53 UTC (rev 10846)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2006-11-09
19:56:46 UTC (rev 10847)
@@ -92,7 +92,7 @@
if (it.hasNext())
out.append(StringArrOption.encode(((PluginInfoWrapper)it.next()).getFilename()));
while (it.hasNext())
- out.append(StringArrOption.delimiter +
StringArrOption.encode(((PluginInfoWrapper)it.next()).getFilename()));
+
out.append(StringArrOption.delimiter).append(StringArrOption.encode(((PluginInfoWrapper)
it.next()).getFilename()));
}catch (NullPointerException e){
Logger.error(this, "error while loading plugins:
disabling them:"+e);
return "";
Modified: trunk/freenet/src/freenet/support/Buffer.java
===================================================================
--- trunk/freenet/src/freenet/support/Buffer.java 2006-11-09 19:33:53 UTC
(rev 10846)
+++ trunk/freenet/src/freenet/support/Buffer.java 2006-11-09 19:56:46 UTC
(rev 10847)
@@ -111,7 +111,7 @@
return "Buffer {"+this._length+"}";
} else {
StringBuffer b = new StringBuffer(this._length*3);
- b.append("{"+this._length+":");
+ 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/HTMLNode.java
===================================================================
--- trunk/freenet/src/freenet/support/HTMLNode.java 2006-11-09 19:33:53 UTC
(rev 10846)
+++ trunk/freenet/src/freenet/support/HTMLNode.java 2006-11-09 19:56:46 UTC
(rev 10847)
@@ -152,7 +152,7 @@
}
if (children.size() == 0) {
if (name.equals("textarea") || name.equals("div") ||
name.equals("a")) {
- tagBuffer.append("></" + name + ">");
+ tagBuffer.append("></").append(name).append(">");
} else {
tagBuffer.append(" />");
}
Modified: trunk/freenet/src/freenet/support/ShortBuffer.java
===================================================================
--- trunk/freenet/src/freenet/support/ShortBuffer.java 2006-11-09 19:33:53 UTC
(rev 10846)
+++ trunk/freenet/src/freenet/support/ShortBuffer.java 2006-11-09 19:56:46 UTC
(rev 10847)
@@ -113,7 +113,7 @@
return "Buffer {"+this._length+"}";
} else {
StringBuffer b = new StringBuffer(this._length*3);
- b.append("{"+this._length+":");
+ 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/TimeUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/TimeUtil.java 2006-11-09 19:33:53 UTC
(rev 10846)
+++ trunk/freenet/src/freenet/support/TimeUtil.java 2006-11-09 19:56:46 UTC
(rev 10847)
@@ -32,14 +32,14 @@
//
int weeks = (int)(l / ((long)7*24*60*60*1000));
if (weeks > 0) {
- sb.append(weeks + "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 + "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 + "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 + "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) + "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 + "s");
+ sb.append(seconds).append("s");
termCount++;
l = l - ((long)seconds * (long)1000);
}
