Author: nextgens
Date: 2008-09-04 19:38:52 +0000 (Thu, 04 Sep 2008)
New Revision: 22437
Modified:
trunk/freenet/src/freenet/client/FailureCodeTracker.java
trunk/freenet/src/freenet/client/FetchException.java
trunk/freenet/src/freenet/client/events/SplitfileProgressEvent.java
trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
trunk/freenet/src/freenet/clients/http/QueueToadlet.java
trunk/freenet/src/freenet/clients/http/ToadletContextImpl.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/clients/http/filter/JPEGFilter.java
trunk/freenet/src/freenet/clients/http/filter/KnownUnsafeContentTypeException.java
trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
trunk/freenet/src/freenet/crypt/CryptoKey.java
trunk/freenet/src/freenet/crypt/DHGroup.java
trunk/freenet/src/freenet/crypt/DiffieHellmanLightContext.java
trunk/freenet/src/freenet/crypt/SHA1.java
trunk/freenet/src/freenet/frost/message/FrostMessage.java
trunk/freenet/src/freenet/io/AllowedHosts.java
trunk/freenet/src/freenet/io/Inet4AddressMatcher.java
trunk/freenet/src/freenet/io/Inet6AddressMatcher.java
trunk/freenet/src/freenet/io/comm/Message.java
trunk/freenet/src/freenet/keys/FreenetURI.java
trunk/freenet/src/freenet/node/Announcer.java
trunk/freenet/src/freenet/node/DarknetPeerNode.java
trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeDispatcher.java
trunk/freenet/src/freenet/node/RequestStarterGroup.java
trunk/freenet/src/freenet/node/TextModeClientInterface.java
trunk/freenet/src/freenet/node/fcp/AddPeer.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
trunk/freenet/src/freenet/pluginmanager/PluginManager.java
trunk/freenet/src/freenet/support/BitArray.java
trunk/freenet/src/freenet/support/Buffer.java
trunk/freenet/src/freenet/support/CPUInformation/CPUID.java
trunk/freenet/src/freenet/support/HTMLDecoder.java
trunk/freenet/src/freenet/support/HTMLNode.java
trunk/freenet/src/freenet/support/HexUtil.java
trunk/freenet/src/freenet/support/ReceivedPacketNumbers.java
trunk/freenet/src/freenet/support/Serializer.java
trunk/freenet/src/freenet/support/ShortBuffer.java
trunk/freenet/src/freenet/support/StringCounter.java
trunk/freenet/src/freenet/support/TimeUtil.java
trunk/freenet/src/freenet/support/URIPreEncoder.java
trunk/freenet/src/freenet/support/URLEncoder.java
trunk/freenet/src/freenet/support/io/ArrayBucket.java
trunk/freenet/src/freenet/support/io/FileUtil.java
trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
trunk/freenet/test/DatastoreTest.java
trunk/freenet/test/PreNodeTest.java
trunk/freenet/test/PreQuasiNodeTest.java
trunk/freenet/test/QuasiNodeTest.java
trunk/freenet/test/freenet/config/ConfigTest.java
trunk/freenet/test/freenet/support/BitArrayTest.java
trunk/freenet/test/freenet/support/HTMLEncoderDecoderTest.java
Log:
StringBuffer=>StringBuilder; untested
Modified: trunk/freenet/src/freenet/client/FailureCodeTracker.java
===================================================================
--- trunk/freenet/src/freenet/client/FailureCodeTracker.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/client/FailureCodeTracker.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -76,7 +76,7 @@
}
public synchronized String toVerboseString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
Collection values = map.keySet();
Iterator i = values.iterator();
while(i.hasNext()) {
@@ -92,7 +92,7 @@
}
public synchronized String toString() {
- StringBuffer sb = new StringBuffer(super.toString());
+ StringBuilder sb = new StringBuilder(super.toString());
sb.append(':');
if(map.size() == 0) sb.append("empty");
else if(map.size() == 1) {
Modified: trunk/freenet/src/freenet/client/FetchException.java
===================================================================
--- trunk/freenet/src/freenet/client/FetchException.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/client/FetchException.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -214,7 +214,7 @@
}
public String toString() {
- StringBuffer sb = new StringBuffer(200);
+ StringBuilder sb = new StringBuilder(200);
sb.append("FetchException:");
sb.append(getShortMessage(mode));
sb.append(':');
Modified: trunk/freenet/src/freenet/client/events/SplitfileProgressEvent.java
===================================================================
--- trunk/freenet/src/freenet/client/events/SplitfileProgressEvent.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/client/events/SplitfileProgressEvent.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -29,7 +29,7 @@
}
public String getDescription() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("Completed ");
if((minSuccessfulBlocks == 0) && (fetchedBlocks == 0))
minSuccessfulBlocks = 1;
Modified: trunk/freenet/src/freenet/clients/http/ConfigToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/clients/http/ConfigToadlet.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -229,7 +229,7 @@
}
SubConfig[] sc = config.getConfigs();
- StringBuffer errbuf = new StringBuffer();
+ StringBuilder errbuf = new StringBuilder();
if(!ctx.isAllowedFullAccess()) {
super.sendErrorPage(ctx, 403,
L10n.getString("Toadlet.unauthorizedTitle"),
L10n.getString("Toadlet.unauthorized"));
Modified: trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/clients/http/ConnectionsToadlet.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -325,7 +325,7 @@
// BEGIN PEER TABLE
if(fProxyJavascriptEnabled) {
- StringBuffer jsBuf = new StringBuffer();
+ StringBuilder jsBuf = new StringBuilder();
// FIXME: There's probably some icky Javascript
in here (this is the first thing that worked for me); feel free to fix up to
Javascript guru standards
jsBuf.append( " function peerNoteChange() {\n"
);
jsBuf.append( " var theobj =
document.getElementById( \"action\" );\n" );
@@ -518,7 +518,7 @@
if(!isOpennet())
privateComment =
request.getPartAsString("peerPrivateNote", 250).trim();
- StringBuffer ref = new StringBuffer(1024);
+ StringBuilder ref = new StringBuilder(1024);
if (urltext.length() > 0) {
// fetch reference from a URL
BufferedReader in = null;
@@ -542,13 +542,13 @@
} else if (reftext.length() > 0) {
// read from post data or file upload
// this slightly scary looking regexp chops any
extra characters off the beginning or ends of lines and removes extra line
breaks
- ref = new
StringBuffer(reftext.replaceAll(".*?((?:[\\w,\\.]+\\=[^\r\n]+?)|(?:End))[
\\t]*(?:\\r?\\n)+", "$1\n"));
+ ref = new
StringBuilder(reftext.replaceAll(".*?((?:[\\w,\\.]+\\=[^\r\n]+?)|(?:End))[
\\t]*(?:\\r?\\n)+", "$1\n"));
} else {
this.sendErrorPage(ctx, 200,
l10n("failedToAddNodeTitle"), l10n("noRefOrURL"));
request.freeParts();
return;
}
- ref = new StringBuffer(ref.toString().trim());
+ ref = new StringBuilder(ref.toString().trim());
request.freeParts();
// we have a node reference in ref
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -589,7 +589,7 @@
private String getLink(FreenetURI uri, String requestedMimeType, long
maxSize, String force,
boolean forceDownload) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("/");
sb.append(uri.toACIIString());
char c = '?';
Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -169,7 +169,7 @@
ClientRequest[] reqs = fcp.getGlobalRequests();
if(logMINOR) Logger.minor(this, "Request count:
"+reqs.length);
- StringBuffer failedIdentifiers = new
StringBuffer();
+ StringBuilder failedIdentifiers = new
StringBuilder();
for(int i=0; i<reqs.length ; i++){
String identifier =
reqs[i].getIdentifier();
Modified: trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -179,7 +179,7 @@
mvt.put("connection", "close");
else
mvt.put("connection", "keep-alive");
- StringBuffer buf = new StringBuffer(1024);
+ StringBuilder buf = new StringBuilder(1024);
buf.append("HTTP/1.1 ");
buf.append(replyCode);
buf.append(' ');
@@ -215,7 +215,7 @@
* send something as close to the spec as possible in case of broken
clients...
*/
private static String fixKey(String key) {
- StringBuffer sb = new StringBuffer(key.length());
+ StringBuilder sb = new StringBuilder(key.length());
char prev = 0;
for(int i=0;i<key.length();i++) {
char c = key.charAt(i);
Modified: trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/clients/http/filter/CSSTokenizerFilter.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -965,11 +965,11 @@
quote = q;
s = s.substring(1);
} else quote = ' ';
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
int x = 0;
boolean justEscaping = false;
boolean stillEscaping = false;
- StringBuffer hexEscape = new StringBuffer();
+ StringBuilder hexEscape = new StringBuilder();
while(x < s.length()) {
char c = s.charAt(x);
x++;
@@ -1006,7 +1006,7 @@
buffer.append(c);
}
stillEscaping = false;
- hexEscape = new StringBuffer();
+ hexEscape = new StringBuilder();
} else {
int d =
Integer.parseInt(hexEscape.toString(),
16);
@@ -1024,7 +1024,7 @@
}
buffer.append(c);
stillEscaping = false;
- hexEscape = new StringBuffer();
+ hexEscape = new StringBuilder();
}
} else {
if(quote != ' ' && c == quote) {
@@ -1048,7 +1048,7 @@
}
public String toString() {
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
if(url) out.append("url(");
if(quote != ' ') out.append(quote);
out.append(unescapeData());
@@ -1059,7 +1059,7 @@
}
public String unescapeData() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for(int i=0;i<data.length();i++) {
char c = data.charAt(i);
if(c == quote || c == '\n') {
@@ -1072,7 +1072,7 @@
}
String commentEncode(String s) {
- StringBuffer sb = new StringBuffer(s.length());
+ StringBuilder sb = new StringBuilder(s.length());
for(int i=0;i<s.length();i++) {
char c = s.charAt(i);
if(c == '/')
@@ -1566,7 +1566,7 @@
case 55: break;
case 22:
{ String s = yytext();
- StringBuffer sb = new StringBuffer(s.length());
+ StringBuilder sb = new StringBuilder(s.length());
sb.append("/* ");
boolean inPrefix = true;
for(int i=2;i<s.length()-2;i++) {
Modified:
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
===================================================================
---
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
2008-09-04 19:25:26 UTC (rev 22436)
+++
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -218,7 +218,7 @@
// would be much easier if we had a component-wise
constructor for URI that didn't
// re-encode, but at least it works...
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(path);
if(typeOverride != null) {
sb.append("?type=");
Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -148,8 +148,8 @@
* whitespace -> (1)
* </p>
*/
- StringBuffer b = new StringBuffer(100);
- StringBuffer balt = new StringBuffer(4000);
+ StringBuilder b = new StringBuilder(100);
+ StringBuilder balt = new StringBuilder(4000);
Vector splitTag = new Vector();
String currentTag = null;
char pprevC = 0;
@@ -356,11 +356,11 @@
boolean killStyle = false;
int styleScriptRecurseCount = 0;
String currentStyleScriptChunk = "";
- StringBuffer writeAfterTag = new StringBuffer(1024);
+ StringBuilder writeAfterTag = new StringBuilder(1024);
}
- void saveText(StringBuffer s, String tagName, Writer w,
HTMLParseContext pc)
+ void saveText(StringBuilder s, String tagName, Writer w,
HTMLParseContext pc)
throws IOException {
if(pc.noOutput) return;
@@ -386,7 +386,7 @@
pc.currentStyleScriptChunk += style;
return; // is parsed and written elsewhere
}
- StringBuffer out = new StringBuffer(s.length()*2);
+ StringBuilder out = new StringBuilder(s.length()*2);
for(int i=0;i<s.length();i++) {
char c = s.charAt(i);
if(c == '<') {
@@ -426,7 +426,7 @@
t.write(w);
if (pc.writeAfterTag.length() > 0) {
w.write(pc.writeAfterTag.toString());
- pc.writeAfterTag = new
StringBuffer(1024);
+ pc.writeAfterTag = new
StringBuilder(1024);
}
} else
pc.writeStyleScriptWithTag = false;
@@ -436,7 +436,7 @@
}
}
- void saveComment(StringBuffer s, Writer w, HTMLParseContext pc)
+ void saveComment(StringBuilder s, Writer w, HTMLParseContext pc)
throws IOException {
if(pc.noOutput) return;
if((s.length() > 3) && (s.charAt(0) == '!') && (s.charAt(1) ==
'-') && (s.charAt(2) == '-')) {
@@ -458,7 +458,7 @@
pc.killTag = false;
return;
}
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for(int i=0;i<s.length();i++) {
char c = s.charAt(i);
if(c == '<') {
@@ -551,7 +551,7 @@
public String toString() {
if (element == null)
return "";
- StringBuffer sb = new StringBuffer("<");
+ StringBuilder sb = new StringBuilder("<");
if (startSlash)
sb.append('/');
sb.append(element);
@@ -1215,7 +1215,7 @@
y = (String) o;
else
y = null;
- StringBuffer out = new StringBuffer(x);
+ StringBuilder out = new StringBuilder(x);
if (y != null)
out.append( "=\"" ).append( y ).append(
'"' );
outAttrs[i++] = out.toString();
@@ -1964,7 +1964,7 @@
}
static String escapeQuotes(String s) {
- StringBuffer buf = new StringBuffer(s.length());
+ StringBuilder buf = new StringBuilder(s.length());
for (int x = 0; x < s.length(); x++) {
char c = s.charAt(x);
if (c == '\"') {
Modified: trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -375,7 +375,7 @@
}
private String readNullTerminatedAsciiString(DataInputStream dis)
throws IOException {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
while(true) {
int x = dis.read();
if(x == -1)
Modified:
trunk/freenet/src/freenet/clients/http/filter/KnownUnsafeContentTypeException.java
===================================================================
---
trunk/freenet/src/freenet/clients/http/filter/KnownUnsafeContentTypeException.java
2008-09-04 19:25:26 UTC (rev 22436)
+++
trunk/freenet/src/freenet/clients/http/filter/KnownUnsafeContentTypeException.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -16,7 +16,7 @@
}
public String getExplanation() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("<p><b>");
sb.append(type.readDescription);
sb.append("</b></p>\n" + "<p>" + l10n("knownUnsafe") + "<ul>");
Modified: trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/clients/http/filter/PNGFilter.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -154,7 +154,7 @@
// Type of the chunk : Should match [a-zA-Z]{4}
dis.readFully(lengthBytes);
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
byte[] chunkTypeBytes = new byte[4];
for(int i = 0; i < 4; i++) {
char val = (char) lengthBytes[i];
Modified: trunk/freenet/src/freenet/crypt/CryptoKey.java
===================================================================
--- trunk/freenet/src/freenet/crypt/CryptoKey.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/crypt/CryptoKey.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -57,13 +57,13 @@
}
public String verboseToString() {
- StringBuffer b = new StringBuffer();
+ StringBuilder b = new StringBuilder();
b.append(toString()).append('\t').append(fingerprintToString());
return b.toString();
}
public String toString() {
- StringBuffer b = new StringBuffer(keyType().length() + 1 + 4);
+ StringBuilder b = new StringBuilder(keyType().length() + 1 + 4);
b.append(keyType()).append('/');
HexUtil.bytesToHexAppend(fingerprint(), 16, 4, b);
return b.toString();
@@ -75,7 +75,7 @@
//
public String fingerprintToString() {
String fphex = HexUtil.bytesToHex(fingerprint());
- StringBuffer b = new StringBuffer(40 + 10);
+ StringBuilder b = new StringBuilder(40 + 10);
b
.append(fphex.substring(0, 4))
.append(' ')
Modified: trunk/freenet/src/freenet/crypt/DHGroup.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DHGroup.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/crypt/DHGroup.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -30,7 +30,7 @@
public String toLongString() {
String pStr = HexUtil.biToHex(p);
String gStr = HexUtil.biToHex(g);
- StringBuffer b = new StringBuffer(pStr.length() + gStr.length()
+ 1);
+ StringBuilder b = new StringBuilder(pStr.length() +
gStr.length() + 1);
b.append(pStr).append(',').append(gStr);
return b.toString();
}
Modified: trunk/freenet/src/freenet/crypt/DiffieHellmanLightContext.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DiffieHellmanLightContext.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/crypt/DiffieHellmanLightContext.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -19,7 +19,7 @@
public final long lifetime = System.currentTimeMillis();
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(super.toString());
sb.append(": myExponent=");
sb.append(myExponent.toHexString());
Modified: trunk/freenet/src/freenet/crypt/SHA1.java
===================================================================
--- trunk/freenet/src/freenet/crypt/SHA1.java 2008-09-04 19:25:26 UTC (rev
22436)
+++ trunk/freenet/src/freenet/crypt/SHA1.java 2008-09-04 19:38:52 UTC (rev
22437)
@@ -343,7 +343,7 @@
* to the test vectors.
*/
protected String digout() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < 20; i++) {
char c1, c2;
Modified: trunk/freenet/src/freenet/frost/message/FrostMessage.java
===================================================================
--- trunk/freenet/src/freenet/frost/message/FrostMessage.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/frost/message/FrostMessage.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -51,7 +51,7 @@
String date = DateFun.getExtendedDateFromSqlDate(getSqlDate());
String time = DateFun.getExtendedTimeFromSqlTime(getSqlTime());
- StringBuffer sb = new StringBuffer(29);
+ StringBuilder sb = new StringBuilder(29);
sb.append(date).append(" ").append(time);
this.dateAndTime = sb.toString();
@@ -119,7 +119,7 @@
public String getId() {
Random rnd = new Random((new Date()).getTime());
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for(int i = 0; i<4; i++) {
sb.append(Long.toHexString(rnd.nextLong()).toUpperCase());
@@ -191,12 +191,12 @@
private final String getXml() {
if(xml==null)
{
- String messageContent = new StringBuffer()
+ String messageContent = new StringBuilder()
.append("----- ").append(this.getName()).append(" -----
")
.append(this.getDateStr(true)).append(" -
").append(this.getTimeStr()).append(" -----\n\n")
.append(this.getContent()).toString();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
sb.append("<FrostMessage>");
@@ -241,7 +241,7 @@
FreenetURI key;
if (board.isWriteAccessBoard()) {
key = new FreenetURI(
- new StringBuffer()
+ new StringBuilder()
.append(board.getPrivateKey())
.append('/')
.append(board.getName())
@@ -253,7 +253,7 @@
.toString());
} else {
key = new FreenetURI("KSK",
- new StringBuffer()
+ new StringBuilder()
.append("frost|message|")
.append(this.getMessageBase())
.append('|')
Modified: trunk/freenet/src/freenet/io/AllowedHosts.java
===================================================================
--- trunk/freenet/src/freenet/io/AllowedHosts.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/io/AllowedHosts.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -84,7 +84,7 @@
}
public synchronized String getAllowedHosts() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for(int i=0;i<addressMatchers.size();i++) {
AddressMatcher matcher = (AddressMatcher)
addressMatchers.get(i);
if(matcher instanceof EverythingMatcher) return "*";
Modified: trunk/freenet/src/freenet/io/Inet4AddressMatcher.java
===================================================================
--- trunk/freenet/src/freenet/io/Inet4AddressMatcher.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/io/Inet4AddressMatcher.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -133,7 +133,7 @@
}
private String convertToString(int addr) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for(int i=0;i<4;i++) {
int x = addr >>> 24;
addr = addr << 8;
Modified: trunk/freenet/src/freenet/io/Inet6AddressMatcher.java
===================================================================
--- trunk/freenet/src/freenet/io/Inet6AddressMatcher.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/io/Inet6AddressMatcher.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -102,7 +102,7 @@
}
private String convertToString(byte[] addr) {
- StringBuffer sb = new StringBuffer(4*8+7);
+ StringBuilder sb = new StringBuilder(4*8+7);
for(int i=0;i<8;i++) {
if(i != 0) sb.append(':');
int token = ((addr[i*2] & 0xff) << 8) + (addr[i*2+1] &
0xff);
Modified: trunk/freenet/src/freenet/io/comm/Message.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Message.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/io/comm/Message.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -251,7 +251,7 @@
}
public String toString() {
- StringBuffer ret = new StringBuffer(1000);
+ StringBuilder ret = new StringBuilder(1000);
String comma = "";
ret.append(_spec.getName()).append(" {");
for (Iterator i = _spec.getFields().keySet().iterator();
i.hasNext();) {
Modified: trunk/freenet/src/freenet/keys/FreenetURI.java
===================================================================
--- trunk/freenet/src/freenet/keys/FreenetURI.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/keys/FreenetURI.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -573,7 +573,7 @@
}
public String toShortString() {
- StringBuffer b = new StringBuffer();
+ StringBuilder b = new StringBuilder();
b.append(keyType).append('@');
Modified: trunk/freenet/src/freenet/node/Announcer.java
===================================================================
--- trunk/freenet/src/freenet/node/Announcer.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/node/Announcer.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -548,7 +548,7 @@
}
public String getText() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(l10n("announceAlertIntro"));
int status;
boolean dontKnowAddress;
Modified: trunk/freenet/src/freenet/node/DarknetPeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/node/DarknetPeerNode.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -955,7 +955,7 @@
}
public String getText() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(l10n("failedReceiveHeader",
new String[] { "filename", "node" },
new String[] {
filename, getName() }));
sb.append('\n');
@@ -1057,7 +1057,7 @@
}
public String getText() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(l10n("succeededReceiveHeader", new String[] { "filename", "node" },
new String[] {
filename, getName() }));
sb.append('\n');
@@ -1173,7 +1173,7 @@
return UserAlert.MINOR;
}
public String getText() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(l10n("offeredFileHeader",
"name", getName()));
sb.append('\n');
sb.append(l10n("fileLabel"));
Modified: trunk/freenet/src/freenet/node/IPDetectorPluginManager.java
===================================================================
--- trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/node/IPDetectorPluginManager.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -205,7 +205,7 @@
public String getText() {
if(!suggestPortForward) return super.getText();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(super.getText());
if(portsNotForwarded.length == 1) {
sb.append(l10n("suggestForwardPort", "port",
Integer.toString(Math.abs(portsNotForwarded[0]))));
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2008-09-04 19:25:26 UTC (rev
22436)
+++ trunk/freenet/src/freenet/node/Node.java 2008-09-04 19:38:52 UTC (rev
22437)
@@ -2654,7 +2654,7 @@
* @return Some status information.
*/
public String getStatus() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (peers != null)
sb.append(peers.getStatus());
else
@@ -2690,7 +2690,7 @@
* @return TMCI peer list
*/
public String getTMCIPeerList() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if (peers != null)
sb.append(peers.getTMCIPeerList());
else
@@ -2782,7 +2782,7 @@
* @return Data String for freeviz.
*/
public String getFreevizOutput() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("\nrequests=");
sb.append(getNumRequestSenders());
Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -748,7 +748,7 @@
}
public static String peersUIDsToString(long[] peerUIDs, double[]
peerLocs) {
- StringBuffer sb = new
StringBuffer(peerUIDs.length*23+peerLocs.length*26);
+ StringBuilder sb = new
StringBuilder(peerUIDs.length*23+peerLocs.length*26);
int min=Math.min(peerUIDs.length, peerLocs.length);
for(int i=0;i<min;i++) {
double loc = peerLocs[i];
Modified: trunk/freenet/src/freenet/node/RequestStarterGroup.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestStarterGroup.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/node/RequestStarterGroup.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -192,7 +192,7 @@
}
public String statsPageLine(boolean isSSK, boolean isInsert) {
- StringBuffer sb = new StringBuffer(100);
+ StringBuilder sb = new StringBuilder(100);
sb.append(isSSK ? "SSK" : "CHK");
sb.append(' ');
sb.append(isInsert ? "Insert" : "Request");
@@ -208,7 +208,7 @@
}
public String diagnosticThrottlesLine(boolean mode) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
if(mode) {
sb.append("Request window: ");
sb.append(throttleWindowRequest.toString());
Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -139,7 +139,7 @@
}
private void printHeader(OutputStream s) throws IOException {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("Trivial Text Mode Client Interface\r\n");
sb.append("---------------------------------------\r\n");
@@ -205,7 +205,7 @@
*/
private boolean processLine(BufferedReader reader, final OutputStream out)
throws IOException {
String line;
- StringBuffer outsb = new StringBuffer();
+ StringBuilder outsb = new StringBuilder();
try {
line = reader.readLine();
} catch (IOException e) {
@@ -380,25 +380,25 @@
out.flush();
return false;
} else if(uline.startsWith("SHUTDOWN")) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("Shutting node down.\r\n");
out.write(sb.toString().getBytes());
out.flush();
n.exit("Shutdown from console");
} else if(uline.startsWith("RESTART")) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("Restarting the node.\r\n");
out.write(sb.toString().getBytes());
out.flush();
n.getNodeStarter().restart();
} else if(uline.startsWith("QUIT") && (core.directTMCI == this)) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("QUIT command not available in console mode.\r\n");
out.write(sb.toString().getBytes());
out.flush();
return false;
} else if(uline.startsWith("QUIT")) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("Closing connection.\r\n");
out.write(sb.toString().getBytes());
out.flush();
@@ -419,7 +419,7 @@
while(tg.getParent() != null) tg = tg.getParent();
int threadCount = tg.activeCount();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("Used Java memory:\u00a0" +
SizeUtil.formatSize(usedJavaMem, true)+"\r\n");
sb.append("Allocated Java memory:\u00a0" +
SizeUtil.formatSize(allocatedJavaMem, true)+"\r\n");
sb.append("Maximum Java memory:\u00a0" +
SizeUtil.formatSize(maxJavaMem, true)+"\r\n");
@@ -1029,7 +1029,7 @@
* isFieldSet.
*/
private String readLines(BufferedReader reader, boolean isFieldSet) {
- StringBuffer sb = new StringBuffer(1000);
+ StringBuilder sb = new StringBuilder(1000);
boolean breakflag = false;
while(true) {
String line;
@@ -1224,7 +1224,7 @@
private String sanitize(String fnam) {
if(fnam == null) return "";
- StringBuffer sb = new StringBuffer(fnam.length());
+ StringBuilder sb = new StringBuilder(fnam.length());
for(int i=0;i<fnam.length();i++) {
char c = fnam.charAt(i);
if(Character.isLetterOrDigit(c) || (c == '-') || (c == '.'))
Modified: trunk/freenet/src/freenet/node/fcp/AddPeer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/AddPeer.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/node/fcp/AddPeer.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -50,7 +50,7 @@
}
String urlString = fs.get("URL");
String fileString = fs.get("File");
- StringBuffer ref = null;
+ StringBuilder ref = null;
BufferedReader in;
if(urlString != null) {
try {
@@ -58,7 +58,7 @@
URLConnection uc = url.openConnection();
// FIXME get charset from uc.getContentType()
in = new BufferedReader( new
InputStreamReader(uc.getInputStream()));
- ref = new StringBuffer(1024);
+ ref = new StringBuilder(1024);
String line;
while((line = in.readLine()) != null) {
line = line.trim();
@@ -70,7 +70,7 @@
} catch (IOException e) {
throw new
MessageInvalidException(ProtocolErrorMessage.URL_PARSE_ERROR, "IO error while
retrieving ref URL <"+urlString+">: "+e.getMessage(), identifier, false);
}
- ref = new StringBuffer(ref.toString().trim());
+ ref = new StringBuilder(ref.toString().trim());
if(ref == null) {
throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from URL <"+urlString+ '>', identifier, false);
}
@@ -89,7 +89,7 @@
}
try {
in = new BufferedReader(new FileReader(f));
- ref = new StringBuffer(1024);
+ ref = new StringBuilder(1024);
String line;
while((line = in.readLine()) != null) {
line = line.trim();
@@ -101,7 +101,7 @@
} catch (IOException e) {
throw new
MessageInvalidException(ProtocolErrorMessage.FILE_PARSE_ERROR, "IO error while
retrieving ref file <"+fileString+">: "+e.getMessage(), identifier, false);
}
- ref = new StringBuffer(ref.toString().trim());
+ ref = new StringBuilder(ref.toString().trim());
if(ref == null) {
throw new
MessageInvalidException(ProtocolErrorMessage.REF_PARSE_ERROR, "Error parsing
ref from file <"+fileString+ '>', identifier, false);
}
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -852,7 +852,7 @@
File f = new File(core.getDownloadDir(), preferredWithExt);
File f1 = new File(core.getDownloadDir(), preferredWithExt +
".freenet-tmp");
int x = 0;
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for(;f.exists() || f1.exists();sb.setLength(0)) {
sb.append(preferred);
sb.append('-');
Modified:
trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -243,7 +243,7 @@
//Print out the number which are non-zero & display the
distinct ones if a few...
int size=ids.size();
int MAX=6;
- StringBuffer sb=new
StringBuffer(Integer.toString(size)).append("/").append(Integer.toString(targetNum));
+ StringBuilder sb=new
StringBuilder(Integer.toString(size)).append("/").append(Integer.toString(targetNum));
sb.append(" ids (").append(group).append(") = ");
Iterator iter=ids.iterator();
for (int i=0; i<=MAX && i<size; i++) {
Modified:
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -184,7 +184,7 @@
System.exit(EXIT_BAD_DATA);
}
}
- StringBuffer load = new StringBuffer("Running UIDs for nodes:
");
+ StringBuilder load = new StringBuilder("Running UIDs for
nodes: ");
int totalRunningUIDs = 0;
int totalRunningUIDsAlt = 0;
Vector runningUIDsList = new Vector(); // <Long>
Modified: trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeULPRTest.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -220,7 +220,7 @@
// Now we should have a good web of subscriptions set up.
int visitedCount = 0;
- StringBuffer sb = new StringBuffer(3*nodes.length+1);
+ StringBuilder sb = new StringBuilder(3*nodes.length+1);
boolean first = true;
for(int i=0;i<visited.length;i++) {
if(!visited[i]) continue;
Modified: trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/node/updater/UpdateOverMandatoryManager.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -438,7 +438,7 @@
@Override
public String getText() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(l10n("intro")).append("\n\n");
PeerNode[][] nodes = getNodesSayBlown();
PeerNode[] nodesSayBlownConnected = nodes[0];
Modified: trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/node/useralerts/PeerManagerUserAlert.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -161,7 +161,7 @@
static public String replaceCareful(String text, String find, String
replace) {
String[] split = text.split(find, -1);
- StringBuffer sb = new StringBuffer(); // FIXME calculate size
+ StringBuilder sb = new StringBuilder(); // FIXME calculate size
for(int i=0;i<split.length;i++) {
sb.append(split[i]);
if(i < split.length - 1)
Modified:
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
===================================================================
---
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2008-09-04 19:25:26 UTC (rev 22436)
+++
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -37,7 +37,7 @@
UpdateThingy ut = createUpdateThingy();
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(ut.firstBit);
@@ -87,7 +87,7 @@
}
private UpdateThingy createUpdateThingy() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(l10n("notLatest"));
sb.append(' ');
Modified: trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -155,7 +155,7 @@
if(drawDumpEventsForm) {
HTMLNode dumpFormNode = contentNode.addChild("form",
new String[] { "action", "method" }, new String[] { "/", "post"
}).addChild("div");
dumpFormNode.addChild("input", new String[] { "type",
"name", "value" }, new String[] { "hidden", "formPassword", core.formPassword
});
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for(int i=0;i<currentAlerts.length;i++) {
if(!currentAlerts[i].isEventNotification())
continue;
if(sb.length() != 0)
@@ -208,7 +208,7 @@
}
/**
- * Write the alert summary as HTML to a StringBuffer
+ * Write the alert summary as HTML to a StringBuilder
*/
public HTMLNode createSummary() {
short highestLevel = 99;
@@ -241,7 +241,7 @@
boolean separatorNeeded = false;
int messageTypes=0;
- StringBuffer alertSummaryString = new StringBuffer(1024);
+ StringBuilder alertSummaryString = new StringBuilder(1024);
if (numberOfCriticalError != 0) {
alertSummaryString.append(l10n("criticalErrorCountLabel")).append('
').append(numberOfCriticalError);
separatorNeeded = true;
Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -410,7 +410,7 @@
}
public String dumpPlugins() {
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
synchronized(pluginWrappers) {
for(int i = 0; i < pluginWrappers.size(); i++) {
PluginInfoWrapper pi = pluginWrappers.get(i);
Modified: trunk/freenet/src/freenet/support/BitArray.java
===================================================================
--- trunk/freenet/src/freenet/support/BitArray.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/support/BitArray.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -81,7 +81,7 @@
}
public String toString() {
- StringBuffer sb = new StringBuffer(this._size);
+ StringBuilder sb = new StringBuilder(this._size);
for (int x=0; x<_size; x++) {
if (bitAt(x)) {
sb.append('1');
Modified: trunk/freenet/src/freenet/support/Buffer.java
===================================================================
--- trunk/freenet/src/freenet/support/Buffer.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/support/Buffer.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -114,7 +114,7 @@
if (this._length > 50) {
return "Buffer {"+this._length+ '}';
} else {
- StringBuffer b = new StringBuffer(this._length*3);
+ StringBuilder b = new StringBuilder(this._length*3);
b.append('{').append(this._length).append(':');
for (int x=0; x<this._length; x++) {
b.append(byteAt(x));
Modified: trunk/freenet/src/freenet/support/CPUInformation/CPUID.java
===================================================================
--- trunk/freenet/src/freenet/support/CPUInformation/CPUID.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/support/CPUInformation/CPUID.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -68,7 +68,7 @@
private static String getCPUVendorID()
{
CPUIDResult c = doCPUID(0);
- StringBuffer sb= new StringBuffer(13);
+ StringBuilder sb= new StringBuilder(13);
sb.append((char)( c.EBX & 0xFF));
sb.append((char)((c.EBX >> 8) & 0xFF));
sb.append((char)((c.EBX >> 16) & 0xFF));
Modified: trunk/freenet/src/freenet/support/HTMLDecoder.java
===================================================================
--- trunk/freenet/src/freenet/support/HTMLDecoder.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/support/HTMLDecoder.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -22,7 +22,7 @@
int tmpPos, i;
int maxPos = s.length();
- StringBuffer sb = new StringBuffer(maxPos);
+ StringBuilder sb = new StringBuilder(maxPos);
int curPos = 0;
while (curPos < maxPos) {
char c = s.charAt(curPos++);
@@ -131,7 +131,7 @@
public static String compact(String s) {
int maxPos = s.length();
- StringBuffer sb = new StringBuffer(maxPos);
+ StringBuilder sb = new StringBuilder(maxPos);
int curPos = 0;
while (curPos < maxPos) {
char c = s.charAt(curPos++);
Modified: trunk/freenet/src/freenet/support/HTMLNode.java
===================================================================
--- trunk/freenet/src/freenet/support/HTMLNode.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/support/HTMLNode.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -236,7 +236,7 @@
}
/**
- * @see
freenet.support.HTMLNode#generate(java.lang.StringBuffer)
+ * @see
freenet.support.HTMLNode#generate(java.lang.StringBuilder)
*/
@Override
public StringBuilder generate(StringBuilder tagBuffer) {
Modified: trunk/freenet/src/freenet/support/HexUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/HexUtil.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/support/HexUtil.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -34,7 +34,7 @@
public static final String bytesToHex(byte[] bs, int off, int length) {
if (bs.length <= off || bs.length < off+length)
throw new IllegalArgumentException();
- StringBuffer sb = new StringBuffer(length * 2);
+ StringBuilder sb = new StringBuilder(length * 2);
bytesToHexAppend(bs, off, length, sb);
return sb.toString();
}
@@ -43,7 +43,7 @@
byte[] bs,
int off,
int length,
- StringBuffer sb) {
+ StringBuilder sb) {
if (bs.length <= off || bs.length < off+length)
throw new IllegalArgumentException();
sb.ensureCapacity(sb.length() + length * 2);
@@ -117,8 +117,8 @@
public final static byte[] bitsToBytes(BitSet ba, int size) {
int bytesAlloc = countBytesForBits(size);
byte[] b = new byte[bytesAlloc];
- StringBuffer sb =null;
- if(logDEBUG) sb = new StringBuffer(8*bytesAlloc); //TODO:
Should it be 2*8*bytesAlloc here?
+ StringBuilder sb =null;
+ if(logDEBUG) sb = new StringBuilder(8*bytesAlloc); //TODO:
Should it be 2*8*bytesAlloc here?
for(int i=0;i<b.length;i++) {
short s = 0;
for(int j=0;j<8;j++) {
Modified: trunk/freenet/src/freenet/support/ReceivedPacketNumbers.java
===================================================================
--- trunk/freenet/src/freenet/support/ReceivedPacketNumbers.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/support/ReceivedPacketNumbers.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -161,7 +161,7 @@
}
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(super.toString());
sb.append(": max=");
synchronized(this) {
Modified: trunk/freenet/src/freenet/support/Serializer.java
===================================================================
--- trunk/freenet/src/freenet/support/Serializer.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/support/Serializer.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -74,7 +74,7 @@
return dis.readDouble();
} else if (type.equals(String.class)) {
int length = dis.readInt();
- StringBuffer sb = new StringBuffer(length);
+ StringBuilder sb = new StringBuilder(length);
for (int x = 0; x < length; x++) {
sb.append(dis.readChar());
}
Modified: trunk/freenet/src/freenet/support/ShortBuffer.java
===================================================================
--- trunk/freenet/src/freenet/support/ShortBuffer.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/support/ShortBuffer.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -112,7 +112,7 @@
if (this._length > 50) {
return "Buffer {"+this._length+ '}';
} else {
- StringBuffer b = new StringBuffer(this._length*3);
+ StringBuilder b = new StringBuilder(this._length*3);
b.append('{').append(this._length).append(':');
for (int x=0; x<this._length; x++) {
b.append(byteAt(x));
Modified: trunk/freenet/src/freenet/support/StringCounter.java
===================================================================
--- trunk/freenet/src/freenet/support/StringCounter.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/support/StringCounter.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -66,7 +66,7 @@
public String toLongString() {
Item[] items = sortedItems(false);
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for(int i=0;i<items.length;i++) {
if(i!=0) sb.append('\n');
Item it = items[i];
Modified: trunk/freenet/src/freenet/support/TimeUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/TimeUtil.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/support/TimeUtil.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -42,7 +42,7 @@
if (maxTerms > 6 )
throw new IllegalArgumentException();
- StringBuffer sb = new StringBuffer(64);
+ StringBuilder sb = new StringBuilder(64);
long l = timeInterval;
int termCount = 0;
//
Modified: trunk/freenet/src/freenet/support/URIPreEncoder.java
===================================================================
--- trunk/freenet/src/freenet/support/URIPreEncoder.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/support/URIPreEncoder.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -22,7 +22,7 @@
public final static String allowedChars =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-!.~'()*,;:$&+=?/@%";
public static String encode(String s) {
- StringBuffer output = new StringBuffer(s.length()*2);
+ StringBuilder output = new StringBuilder(s.length()*2);
for(int i=0;i<s.length();i++) {
char c = s.charAt(i);
if(allowedChars.indexOf(c) >= 0) {
Modified: trunk/freenet/src/freenet/support/URLEncoder.java
===================================================================
--- trunk/freenet/src/freenet/support/URLEncoder.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/support/URLEncoder.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -25,7 +25,7 @@
* @return Encoded version of string
*/
public final static String encode(String URL, String force, boolean
ascii) {
- StringBuffer enc = new StringBuffer(URL.length());
+ StringBuilder enc = new StringBuilder(URL.length());
for (int i = 0; i < URL.length(); ++i) {
char c = URL.charAt(i);
if (((safeURLCharacters.indexOf(c) >= 0) || ((!ascii)
&& c >= 0200))
Modified: trunk/freenet/src/freenet/support/io/ArrayBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/ArrayBucket.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/support/io/ArrayBucket.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -47,7 +47,7 @@
}
public String toString() {
- StringBuffer s = new StringBuffer(250);
+ StringBuilder s = new StringBuilder(250);
for (Iterator i = data.iterator(); i.hasNext();) {
byte[] b = (byte[]) i.next();
s.append(new String(b));
Modified: trunk/freenet/src/freenet/support/io/FileUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/io/FileUtil.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/src/freenet/support/io/FileUtil.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -85,7 +85,7 @@
}
public static String readUTF(File file, long offset) throws
FileNotFoundException, IOException {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
FileInputStream fis = null;
BufferedInputStream bis = null;
InputStreamReader isr = null;
@@ -181,7 +181,7 @@
}
public static String sanitize(String s) {
- StringBuffer sb = new StringBuffer(s.length());
+ StringBuilder sb = new StringBuilder(s.length());
for(int i=0;i<s.length();i++) {
char c = s.charAt(i);
if((c == '/') || (c == '\\') || (c == '%') || (c ==
'>') || (c == '<') || (c == ':') || (c == '\'') || (c == '\"'))
Modified: trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
===================================================================
--- trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/src/freenet/support/math/SimpleBinaryRunningAverage.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -179,7 +179,7 @@
}
private synchronized void calculateTotalOnesZeros() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
int tones = 0;
int tzeros = 0;
for(int i=0;i<baSize();i++) {
@@ -199,7 +199,7 @@
}
protected String checkOnesZeros() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
int tones = 0;
int tzeros = 0;
for(int i=0;i<baSize();i++) {
Modified: trunk/freenet/test/DatastoreTest.java
===================================================================
--- trunk/freenet/test/DatastoreTest.java 2008-09-04 19:25:26 UTC (rev
22436)
+++ trunk/freenet/test/DatastoreTest.java 2008-09-04 19:38:52 UTC (rev
22437)
@@ -78,7 +78,7 @@
content = line;
} else {
// Multiple line insert
- StringBuffer sb = new StringBuffer(1000);
+ StringBuilder sb = new StringBuilder(1000);
while(true) {
line = reader.readLine();
if(line.equals(".")) break;
Modified: trunk/freenet/test/PreNodeTest.java
===================================================================
--- trunk/freenet/test/PreNodeTest.java 2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/test/PreNodeTest.java 2008-09-04 19:38:52 UTC (rev 22437)
@@ -431,7 +431,7 @@
content = line;
} else {
// Multiple line insert
- StringBuffer sb = new StringBuffer(1000);
+ StringBuilder sb = new StringBuilder(1000);
while(true) {
line = reader.readLine();
if(line.equals(".")) break;
Modified: trunk/freenet/test/PreQuasiNodeTest.java
===================================================================
--- trunk/freenet/test/PreQuasiNodeTest.java 2008-09-04 19:25:26 UTC (rev
22436)
+++ trunk/freenet/test/PreQuasiNodeTest.java 2008-09-04 19:38:52 UTC (rev
22437)
@@ -133,7 +133,7 @@
content = line;
} else {
// Multiple line insert
- StringBuffer sb = new StringBuffer(1000);
+ StringBuilder sb = new StringBuilder(1000);
while(true) {
line = reader.readLine();
if(line.equals(".")) break;
Modified: trunk/freenet/test/QuasiNodeTest.java
===================================================================
--- trunk/freenet/test/QuasiNodeTest.java 2008-09-04 19:25:26 UTC (rev
22436)
+++ trunk/freenet/test/QuasiNodeTest.java 2008-09-04 19:38:52 UTC (rev
22437)
@@ -291,7 +291,7 @@
content = line;
} else {
// Multiple line insert
- StringBuffer sb = new StringBuffer(1000);
+ StringBuilder sb = new StringBuilder(1000);
while(true) {
line = reader.readLine();
if(line.equals(".")) break;
Modified: trunk/freenet/test/freenet/config/ConfigTest.java
===================================================================
--- trunk/freenet/test/freenet/config/ConfigTest.java 2008-09-04 19:25:26 UTC
(rev 22436)
+++ trunk/freenet/test/freenet/config/ConfigTest.java 2008-09-04 19:38:52 UTC
(rev 22437)
@@ -43,7 +43,7 @@
public void testRegister() {
/* test if we can register */
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for(int i=0; i< UTFUtil.PRINTABLE_ASCII.length; i++)
sb.append(UTFUtil.PRINTABLE_ASCII[i]);
for(int i=0; i< UTFUtil.STRESSED_UTF.length; i++)
Modified: trunk/freenet/test/freenet/support/BitArrayTest.java
===================================================================
--- trunk/freenet/test/freenet/support/BitArrayTest.java 2008-09-04
19:25:26 UTC (rev 22436)
+++ trunk/freenet/test/freenet/support/BitArrayTest.java 2008-09-04
19:38:52 UTC (rev 22437)
@@ -48,10 +48,10 @@
* @return the String of toRepeat
*/
private String createAllOneString(int stringSize, String toRepeat) {
- StringBuffer methodStringBuffer = new StringBuffer();
+ StringBuilder methodStringBuilder = new StringBuilder();
for (int i=0;i<stringSize;i++)
- methodStringBuffer.append(toRepeat);
- return methodStringBuffer.toString();
+ methodStringBuilder.append(toRepeat);
+ return methodStringBuilder.toString();
}
/**
Modified: trunk/freenet/test/freenet/support/HTMLEncoderDecoderTest.java
===================================================================
--- trunk/freenet/test/freenet/support/HTMLEncoderDecoderTest.java
2008-09-04 19:25:26 UTC (rev 22436)
+++ trunk/freenet/test/freenet/support/HTMLEncoderDecoderTest.java
2008-09-04 19:38:52 UTC (rev 22437)
@@ -47,8 +47,8 @@
* with all possible entity appended
*/
public void testDecodeAppendedEntities() {
- StringBuffer toDecode = new StringBuffer();
- StringBuffer expected = new StringBuffer();
+ StringBuilder toDecode = new StringBuilder();
+ StringBuilder expected = new StringBuilder();
for (int i =0; i<UTFUtil.HTML_ENTITIES_UTF.length; i++) {
toDecode.append(UTFUtil.HTML_ENTITIES_UTF[i][1]);
expected.append(UTFUtil.HTML_ENTITIES_UTF[i][0]);
@@ -83,9 +83,9 @@
* (e.g. tabs,newline,space).
*/
public void testCompactRepeated(){
- StringBuffer strBuffer[] = new StringBuffer[6];
+ StringBuilder strBuffer[] = new StringBuilder[6];
for (int i = 0; i < strBuffer.length; i++)
- strBuffer[i] = new StringBuffer();
+ strBuffer[i] = new StringBuilder();
for (int i=0;i<100;i++) {
//adding different "whitespaces"
