From 5b1c5b2289280648d316169ea6889a7949e09f35 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Thu, 10 Dec 2009 03:16:51 +0000 Subject: [PATCH] Basic code style cleanups suggested by IntelliJ --- src/com/android/email/activity/Accounts.java | 8 ++-- .../android/email/activity/MessageList.java | 2 +- .../android/email/mail/store/WebDavStore.java | 42 +++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/com/android/email/activity/Accounts.java b/src/com/android/email/activity/Accounts.java index 038ba705d..9b107c90e 100644 --- a/src/com/android/email/activity/Accounts.java +++ b/src/com/android/email/activity/Accounts.java @@ -541,14 +541,14 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC { String appName = getString(R.string.app_name); WebView wv = new WebView(this); - String html = "

" + String.format(getString(R.string.about_title_fmt).toString(), + String html = "

" + String.format(getString(R.string.about_title_fmt), "" + appName + "") + "

" + "

" + appName + " " + - String.format(getString(R.string.debug_version_fmt).toString(), + String.format(getString(R.string.debug_version_fmt), getVersionNumber()) + "

" + - "

" + String.format(getString(R.string.app_authors_fmt).toString(), + "

" + String.format(getString(R.string.app_authors_fmt), getString(R.string.app_authors)) + "

" + - "

" + String.format(getString(R.string.app_revision_fmt).toString(), + "

" + String.format(getString(R.string.app_revision_fmt), "" + getString(R.string.app_revision_url) + "

"); wv.loadData(html, "text/html", "utf-8"); diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java index 40ca398d3..0e3fcffe1 100644 --- a/src/com/android/email/activity/MessageList.java +++ b/src/com/android/email/activity/MessageList.java @@ -1859,7 +1859,7 @@ public class MessageList { if (mCurrentFolder.lastCheckFailed == false) { - holder.main.setText(String.format(getString(R.string.load_more_messages_fmt).toString(), mAccount.getDisplayCount())); + holder.main.setText(String.format(getString(R.string.load_more_messages_fmt), mAccount.getDisplayCount())); } else { diff --git a/src/com/android/email/mail/store/WebDavStore.java b/src/com/android/email/mail/store/WebDavStore.java index fc2764fca..00dae30f3 100644 --- a/src/com/android/email/mail/store/WebDavStore.java +++ b/src/com/android/email/mail/store/WebDavStore.java @@ -610,8 +610,8 @@ public class WebDavStore extends Store String password = this.mPassword; String[] urlParts = url.split("/"); String finalUrl = ""; - String loginUrl = new String(); - String destinationUrl = new String(); + String loginUrl = ""; + String destinationUrl = ""; if (this.mAuthPath != null && !this.mAuthPath.equals("") && @@ -673,7 +673,7 @@ public class WebDavStore extends Store if (istream != null) { BufferedReader reader = new BufferedReader(new InputStreamReader(istream), 4096); - String tempText = new String(); + String tempText = ""; boolean matched = false; while ((tempText = reader.readLine()) != null && @@ -1161,7 +1161,7 @@ public class WebDavStore extends Store } else { - String encodedName = new String(); + String encodedName = ""; try { String[] urlParts = name.split("/"); @@ -1249,7 +1249,7 @@ public class WebDavStore extends Store { uids[i] = messages[i].getUid(); } - String messageBody = new String(); + String messageBody = ""; HashMap headers = new HashMap(); HashMap uidToUrl = getMessageUrls(uids); String[] urls = new String[uids.length]; @@ -1286,11 +1286,11 @@ public class WebDavStore extends Store if (read) { - isRead = new String("True"); + isRead = "True"; } else { - isRead = new String("False"); + isRead = "False"; } messageBody = getMessageCountXml(isRead); @@ -1619,8 +1619,8 @@ public class WebDavStore extends Store { InputStream istream = null; StringBuffer buffer = new StringBuffer(); - String tempText = new String(); - String resultText = new String(); + String tempText = ""; + String resultText = ""; BufferedReader reader; int currentLines = 0; @@ -1679,7 +1679,7 @@ public class WebDavStore extends Store HashMap uidToReadStatus = new HashMap(); HashMap headers = new HashMap(); DataSet dataset = new DataSet(); - String messageBody = new String(); + String messageBody = ""; Message[] messages = new Message[20]; String[] uids; @@ -1763,7 +1763,7 @@ public class WebDavStore extends Store HashMap envelopes = new HashMap(); HashMap headers = new HashMap(); DataSet dataset = new DataSet(); - String messageBody = new String(); + String messageBody = ""; String[] uids; Message[] messages = new Message[10]; @@ -1866,7 +1866,7 @@ public class WebDavStore extends Store private void markServerMessagesRead(String[] uids, boolean read) throws MessagingException { - String messageBody = new String(); + String messageBody = ""; HashMap headers = new HashMap(); HashMap uidToUrl = getMessageUrls(uids); DataSet dataset = new DataSet(); @@ -2051,7 +2051,7 @@ public class WebDavStore extends Store */ class WebDavMessage extends MimeMessage { - private String mUrl = new String(); + private String mUrl = ""; WebDavMessage(String uid, Folder folder) throws MessagingException @@ -2077,8 +2077,8 @@ public class WebDavStore extends Store int length = urlParts.length; String end = urlParts[length - 1]; - this.mUrl = new String(); - url = new String(); + this.mUrl = ""; + url = ""; /** * We have to decode, then encode the URL because Exchange likes to @@ -2146,7 +2146,7 @@ public class WebDavStore extends Store String headerValue = messageHeaders.get(headers[i]); if (headers[i].equals("Content-Length")) { - int size = new Integer(messageHeaders.get(headers[i])).intValue(); + int size = Integer.parseInt(messageHeaders.get(headers[i])); this.setSize(size); } @@ -2258,7 +2258,7 @@ public class WebDavStore extends Store }; private boolean mReadStatus = false; - private String mUid = new String(); + private String mUid = ""; private HashMap mMessageHeaders = new HashMap(); private ArrayList mHeaders = new ArrayList(); @@ -2316,7 +2316,7 @@ public class WebDavStore extends Store { private HashMap mData = new HashMap(); private HashMap mLostData = new HashMap(); - private String mUid = new String(); + private String mUid = ""; private HashMap mTempData = new HashMap(); public void addValue(String value, String tagName) @@ -2352,7 +2352,7 @@ public class WebDavStore extends Store String visibleCount = mLostData.get("visiblecount"); } - mUid = new String(); + mUid = ""; mTempData = new HashMap(); } @@ -2446,7 +2446,7 @@ public class WebDavStore extends Store if (count != null && !count.equals("")) { - messageCount = new Integer(count).intValue(); + messageCount = Integer.parseInt(count); } } @@ -2552,7 +2552,7 @@ public class WebDavStore extends Store String[] urlParts = uri.split("/"); int length = urlParts.length; String end = urlParts[length - 1]; - String url = new String(); + String url = ""; /** * We have to decode, then encode the URL because Exchange likes to