From 47eb0fa2e1f8c3454d76b8d8cc12722e7f2b3eb4 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Thu, 29 Sep 2011 23:18:00 -0700 Subject: [PATCH] Prefer StringBuilder over StringBuffer The former is unsynchronized and slightly faster. --- src/com/fsck/k9/Account.java | 2 +- src/com/fsck/k9/activity/MessageCompose.java | 4 ++-- .../setup/AccountSetupCheckSettings.java | 4 ++-- src/com/fsck/k9/helper/Utility.java | 2 +- src/com/fsck/k9/mail/Address.java | 4 ++-- .../fsck/k9/mail/internet/DecoderUtil.java | 2 +- .../fsck/k9/mail/internet/MimeMessage.java | 4 ++-- .../fsck/k9/mail/internet/MimeMultipart.java | 2 +- .../k9/mail/store/ImapResponseParser.java | 6 +++--- src/com/fsck/k9/mail/store/ImapStore.java | 2 +- src/com/fsck/k9/mail/store/LocalStore.java | 16 +++++++-------- src/com/fsck/k9/mail/store/Pop3Store.java | 2 +- src/com/fsck/k9/mail/store/WebDavStore.java | 20 +++++++++---------- .../fsck/k9/mail/transport/SmtpTransport.java | 2 +- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java index fb9b93869..951e27f31 100644 --- a/src/com/fsck/k9/Account.java +++ b/src/com/fsck/k9/Account.java @@ -380,7 +380,7 @@ public class Account implements BaseAccount { } private String combineUuids(String[] uuids) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0, length = uuids.length; i < length; i++) { if (sb.length() > 0) { sb.append(','); diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index 70cd53bb1..8a248b407 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -727,7 +727,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc private boolean setRecipients(TextView view, List recipients) { boolean recipientAdded = false; if (recipients != null) { - StringBuffer addressList = new StringBuffer(); + StringBuilder addressList = new StringBuilder(); for (String recipient : recipients) { addressList.append(recipient); addressList.append(", "); @@ -1964,7 +1964,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc mInReplyTo = message.getMessageId(); if (message.getReferences() != null && message.getReferences().length > 0) { - StringBuffer buffy = new StringBuffer(); + StringBuilder buffy = new StringBuilder(); for (int i = 0; i < message.getReferences().length; i++) buffy.append(message.getReferences()[i]); diff --git a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java index dea937eaa..d9e1e11e2 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java @@ -243,7 +243,7 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList } mProgressBar.setIndeterminate(false); - StringBuffer chainInfo = new StringBuffer(100); + StringBuilder chainInfo = new StringBuilder(100); MessageDigest sha1 = null; try { sha1 = MessageDigest.getInstance("SHA-1"); @@ -265,7 +265,7 @@ public class AccountSetupCheckSettings extends K9Activity implements OnClickList if (subjectAlternativeNames != null) { // The list of SubjectAltNames may be very long //TODO: localize this string - StringBuffer altNamesText = new StringBuffer("Subject has " + subjectAlternativeNames.size() + " alternative names\n"); + StringBuilder altNamesText = new StringBuilder("Subject has " + subjectAlternativeNames.size() + " alternative names\n"); // we need these for matching String storeURIHost = (Uri.parse(mAccount.getStoreUri())).getHost(); diff --git a/src/com/fsck/k9/helper/Utility.java b/src/com/fsck/k9/helper/Utility.java index f9a555ff1..832df84db 100644 --- a/src/com/fsck/k9/helper/Utility.java +++ b/src/com/fsck/k9/helper/Utility.java @@ -38,7 +38,7 @@ public class Utility { public static String readInputStream(InputStream in, String encoding) throws IOException { InputStreamReader reader = new InputStreamReader(in, encoding); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int count; char[] buf = new char[512]; while ((count = reader.read(buf)) != -1) { diff --git a/src/com/fsck/k9/mail/Address.java b/src/com/fsck/k9/mail/Address.java index 1ebc5a046..451035b9d 100644 --- a/src/com/fsck/k9/mail/Address.java +++ b/src/com/fsck/k9/mail/Address.java @@ -179,7 +179,7 @@ public class Address { if (addresses == null) { return null; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < addresses.length; i++) { sb.append(addresses[i].toString()); if (i < addresses.length - 1) { @@ -201,7 +201,7 @@ public class Address { if (addresses == null) { return null; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < addresses.length; i++) { sb.append(addresses[i].toEncodedString()); if (i < addresses.length - 1) { diff --git a/src/com/fsck/k9/mail/internet/DecoderUtil.java b/src/com/fsck/k9/mail/internet/DecoderUtil.java index 6580199e9..137ba5e7e 100644 --- a/src/com/fsck/k9/mail/internet/DecoderUtil.java +++ b/src/com/fsck/k9/mail/internet/DecoderUtil.java @@ -58,7 +58,7 @@ public class DecoderUtil { /* * Replace _ with =20 */ - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < encodedWord.length(); i++) { char c = encodedWord.charAt(i); if (c == '_') { diff --git a/src/com/fsck/k9/mail/internet/MimeMessage.java b/src/com/fsck/k9/mail/internet/MimeMessage.java index d61ed86bc..9a89624e5 100644 --- a/src/com/fsck/k9/mail/internet/MimeMessage.java +++ b/src/com/fsck/k9/mail/internet/MimeMessage.java @@ -530,7 +530,7 @@ public class MimeMessage extends Message { public void epilogue(InputStream is) throws IOException { expect(MimeMultipart.class); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int b; while ((b = is.read()) != -1) { sb.append((char)b); @@ -540,7 +540,7 @@ public class MimeMessage extends Message { public void preamble(InputStream is) throws IOException { expect(MimeMultipart.class); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int b; while ((b = is.read()) != -1) { sb.append((char)b); diff --git a/src/com/fsck/k9/mail/internet/MimeMultipart.java b/src/com/fsck/k9/mail/internet/MimeMultipart.java index 7ee7be0da..212c289c6 100644 --- a/src/com/fsck/k9/mail/internet/MimeMultipart.java +++ b/src/com/fsck/k9/mail/internet/MimeMultipart.java @@ -37,7 +37,7 @@ public class MimeMultipart extends Multipart { } public String generateBoundary() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("----"); for (int i = 0; i < 30; i++) { sb.append(Integer.toString((int)(Math.random() * 35), 36)); diff --git a/src/com/fsck/k9/mail/store/ImapResponseParser.java b/src/com/fsck/k9/mail/store/ImapResponseParser.java index f71951ddf..69f21cd12 100644 --- a/src/com/fsck/k9/mail/store/ImapResponseParser.java +++ b/src/com/fsck/k9/mail/store/ImapResponseParser.java @@ -281,7 +281,7 @@ public class ImapResponseParser { private String parseQuoted() throws IOException { expect('"'); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int ch; boolean escape = false; while ((ch = mIn.read()) != -1) { @@ -299,7 +299,7 @@ public class ImapResponseParser { } private String readStringUntil(char end) throws IOException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int ch; while ((ch = mIn.read()) != -1) { if (ch == end) { @@ -471,7 +471,7 @@ public class ImapResponseParser { public String getAlertText() { if (size() > 1 && equalsIgnoreCase("[ALERT]", get(1))) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 2, count = size(); i < count; i++) { sb.append(get(i).toString()); sb.append(' '); diff --git a/src/com/fsck/k9/mail/store/ImapStore.java b/src/com/fsck/k9/mail/store/ImapStore.java index 1ee09fc75..7299cbe03 100644 --- a/src/com/fsck/k9/mail/store/ImapStore.java +++ b/src/com/fsck/k9/mail/store/ImapStore.java @@ -1417,7 +1417,7 @@ public class ImapStore extends Store { // String key = (String)keyObj; // if ("ALERT".equalsIgnoreCase(key)) // { -// StringBuffer sb = new StringBuffer(); +// StringBuilder sb = new StringBuilder(); // for (int i = 2, count = response.size(); i < count; i++) { // sb.append(response.get(i).toString()); // sb.append(' '); diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java index b426e4ebc..ffb2f8abf 100644 --- a/src/com/fsck/k9/mail/store/LocalStore.java +++ b/src/com/fsck/k9/mail/store/LocalStore.java @@ -844,7 +844,7 @@ public class LocalStore extends Store implements Serializable { @Override public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(command); sb.append(": "); for (String argument : arguments) { @@ -1788,7 +1788,7 @@ public class LocalStore extends Store implements Serializable { try { Map popMessages = new HashMap(); List ids = new ArrayList(); - StringBuffer questions = new StringBuffer(); + StringBuilder questions = new StringBuilder(); for (int i = 0; i < messages.size(); i++) { if (i != 0) { @@ -2097,15 +2097,15 @@ public class LocalStore extends Store implements Serializable { ArrayList attachments = new ArrayList(); MimeUtility.collectParts(message, viewables, attachments); - StringBuffer sbHtml = new StringBuffer(); - StringBuffer sbText = new StringBuffer(); + StringBuilder sbHtml = new StringBuilder(); + StringBuilder sbText = new StringBuilder(); for (Part viewable : viewables) { try { String text = MimeUtility.getTextFromPart(viewable); /* * Small hack to make sure the string "null" doesn't end up - * in one of the StringBuffers. + * in one of the StringBuilders. */ if (text == null) { text = ""; @@ -2210,8 +2210,8 @@ public class LocalStore extends Store implements Serializable { MimeUtility.collectParts(message, viewables, attachments); - StringBuffer sbHtml = new StringBuffer(); - StringBuffer sbText = new StringBuffer(); + StringBuilder sbHtml = new StringBuilder(); + StringBuilder sbText = new StringBuilder(); for (int i = 0, count = viewables.size(); i < count; i++) { Part viewable = viewables.get(i); try { @@ -2219,7 +2219,7 @@ public class LocalStore extends Store implements Serializable { /* * Small hack to make sure the string "null" doesn't end up - * in one of the StringBuffers. + * in one of the StringBuilders. */ if (text == null) { text = ""; diff --git a/src/com/fsck/k9/mail/store/Pop3Store.java b/src/com/fsck/k9/mail/store/Pop3Store.java index e0ffa4bd9..82dc214d4 100644 --- a/src/com/fsck/k9/mail/store/Pop3Store.java +++ b/src/com/fsck/k9/mail/store/Pop3Store.java @@ -825,7 +825,7 @@ public class Pop3Store extends Store { } private String readLine() throws IOException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int d = mIn.read(); if (d == -1) { throw new IOException("End of stream reached while trying to read line."); diff --git a/src/com/fsck/k9/mail/store/WebDavStore.java b/src/com/fsck/k9/mail/store/WebDavStore.java index 67c909e8d..759d6e8db 100644 --- a/src/com/fsck/k9/mail/store/WebDavStore.java +++ b/src/com/fsck/k9/mail/store/WebDavStore.java @@ -398,7 +398,7 @@ public class WebDavStore extends Store { } private String getSpecialFoldersList() { - StringBuffer buffer = new StringBuffer(200); + StringBuilder buffer = new StringBuilder(200); buffer.append(""); buffer.append(""); buffer.append(""); @@ -421,7 +421,7 @@ public class WebDavStore extends Store { * WebDAV XML Request body retrieval functions */ private String getFolderListXml() { - StringBuffer buffer = new StringBuffer(200); + StringBuilder buffer = new StringBuilder(200); buffer.append(""); buffer.append("\r\n"); buffer.append("SELECT \"DAV:uid\", \"DAV:ishidden\"\r\n"); @@ -432,7 +432,7 @@ public class WebDavStore extends Store { } private String getMessageCountXml(String messageState) { - StringBuffer buffer = new StringBuffer(200); + StringBuilder buffer = new StringBuilder(200); buffer.append(""); buffer.append("\r\n"); buffer.append("SELECT \"DAV:visiblecount\"\r\n"); @@ -445,7 +445,7 @@ public class WebDavStore extends Store { } private String getMessageEnvelopeXml(String[] uids) { - StringBuffer buffer = new StringBuffer(200); + StringBuilder buffer = new StringBuilder(200); buffer.append(""); buffer.append("\r\n"); buffer.append("SELECT \"DAV:uid\", \"DAV:getcontentlength\","); @@ -475,7 +475,7 @@ public class WebDavStore extends Store { } private String getMessagesXml() { - StringBuffer buffer = new StringBuffer(200); + StringBuilder buffer = new StringBuilder(200); buffer.append(""); buffer.append("\r\n"); buffer.append("SELECT \"DAV:uid\"\r\n"); @@ -486,7 +486,7 @@ public class WebDavStore extends Store { } private String getMessageUrlsXml(String[] uids) { - StringBuffer buffer = new StringBuffer(600); + StringBuilder buffer = new StringBuilder(600); buffer.append(""); buffer.append("\r\n"); buffer.append("SELECT \"urn:schemas:httpmail:read\", \"DAV:uid\"\r\n"); @@ -510,7 +510,7 @@ public class WebDavStore extends Store { throw new MessagingException("Attempt to get flags on 0 length array for uids"); } - StringBuffer buffer = new StringBuffer(200); + StringBuilder buffer = new StringBuilder(200); buffer.append(""); buffer.append("\r\n"); buffer.append("SELECT \"urn:schemas:httpmail:read\", \"DAV:uid\"\r\n"); @@ -529,7 +529,7 @@ public class WebDavStore extends Store { } private String getMarkMessagesReadXml(String[] urls, boolean read) { - StringBuffer buffer = new StringBuffer(600); + StringBuilder buffer = new StringBuilder(600); buffer.append("\r\n"); buffer.append("\r\n"); buffer.append("\r\n"); @@ -553,7 +553,7 @@ public class WebDavStore extends Store { private String getMoveOrCopyMessagesReadXml(String[] urls, boolean isMove) { String action = (isMove ? "move" : "copy"); - StringBuffer buffer = new StringBuffer(600); + StringBuilder buffer = new StringBuilder(600); buffer.append("\r\n"); buffer.append("\r\n"); buffer.append("\r\n"); @@ -1488,7 +1488,7 @@ public class WebDavStore extends Store { if (entity != null) { InputStream istream = null; - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(); String tempText = ""; String resultText = ""; BufferedReader reader; diff --git a/src/com/fsck/k9/mail/transport/SmtpTransport.java b/src/com/fsck/k9/mail/transport/SmtpTransport.java index f82ba6849..06bcbf53b 100644 --- a/src/com/fsck/k9/mail/transport/SmtpTransport.java +++ b/src/com/fsck/k9/mail/transport/SmtpTransport.java @@ -429,7 +429,7 @@ public class SmtpTransport extends Transport { } private String readLine() throws IOException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); int d; while ((d = mIn.read()) != -1) { if (((char)d) == '\r') {