From d3848d352d7a06322f845a24a912f0b4abf69359 Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Tue, 12 Apr 2011 22:17:22 +1000 Subject: [PATCH] astyle --- src/com/fsck/k9/Account.java | 18 +- src/com/fsck/k9/activity/ChooseFolder.java | 4 +- .../k9/activity/setup/AccountSettings.java | 6 +- src/com/fsck/k9/mail/store/WebDavStore.java | 180 +++++++++--------- 4 files changed, 104 insertions(+), 104 deletions(-) diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java index 5aefe10c2..9dd61ba9d 100644 --- a/src/com/fsck/k9/Account.java +++ b/src/com/fsck/k9/Account.java @@ -86,7 +86,7 @@ public class Account implements BaseAccount { private String mTrashFolderName; private String mArchiveFolderName; private String mSpamFolderName; - private String mOutboxFolderName; + private String mOutboxFolderName; private String mAutoExpandFolderName; private FolderMode mFolderDisplayMode; private FolderMode mFolderSyncMode; @@ -255,7 +255,7 @@ public class Account implements BaseAccount { mTrashFolderName = prefs.getString(mUuid + ".trashFolderName", "Trash"); mArchiveFolderName = prefs.getString(mUuid + ".archiveFolderName", "Archive"); mSpamFolderName = prefs.getString(mUuid + ".spamFolderName", "Spam"); - mOutboxFolderName = prefs.getString(mUuid + ".outboxFolderName", "Outbox"); + mOutboxFolderName = prefs.getString(mUuid + ".outboxFolderName", "Outbox"); mExpungePolicy = prefs.getString(mUuid + ".expungePolicy", EXPUNGE_IMMEDIATELY); mSyncRemoteDeletions = prefs.getBoolean(mUuid + ".syncRemoteDeletions", true); @@ -398,7 +398,7 @@ public class Account implements BaseAccount { editor.remove(mUuid + ".trashFolderName"); editor.remove(mUuid + ".archiveFolderName"); editor.remove(mUuid + ".spamFolderName"); - editor.remove(mUuid + ".outboxFolderName"); + editor.remove(mUuid + ".outboxFolderName"); editor.remove(mUuid + ".autoExpandFolderName"); editor.remove(mUuid + ".accountNumber"); editor.remove(mUuid + ".vibrate"); @@ -496,7 +496,7 @@ public class Account implements BaseAccount { editor.putString(mUuid + ".trashFolderName", mTrashFolderName); editor.putString(mUuid + ".archiveFolderName", mArchiveFolderName); editor.putString(mUuid + ".spamFolderName", mSpamFolderName); - editor.putString(mUuid + ".outboxFolderName", mOutboxFolderName); + editor.putString(mUuid + ".outboxFolderName", mOutboxFolderName); editor.putString(mUuid + ".autoExpandFolderName", mAutoExpandFolderName); editor.putInt(mUuid + ".accountNumber", mAccountNumber); editor.putString(mUuid + ".hideButtonsEnum", mScrollMessageViewButtons.name()); @@ -1316,12 +1316,12 @@ public class Account implements BaseAccount { } public String getInboxFolderName() { - return mInboxFolderName; - } + return mInboxFolderName; + } - public void setInboxFolderName(String mInboxFolderName) { - this.mInboxFolderName = mInboxFolderName; - } + public void setInboxFolderName(String mInboxFolderName) { + this.mInboxFolderName = mInboxFolderName; + } public synchronized boolean syncRemoteDeletions() { return mSyncRemoteDeletions; diff --git a/src/com/fsck/k9/activity/ChooseFolder.java b/src/com/fsck/k9/activity/ChooseFolder.java index 5d0ff100f..32e7fba22 100644 --- a/src/com/fsck/k9/activity/ChooseFolder.java +++ b/src/com/fsck/k9/activity/ChooseFolder.java @@ -249,7 +249,7 @@ public class ChooseFolder extends K9ListActivity { // Inbox needs to be compared case-insensitively if (hideCurrentFolder && (name.equals(mFolder) || - (mAccount.getInboxFolderName().equalsIgnoreCase(mFolder) && mAccount.getInboxFolderName().equalsIgnoreCase(name)))) { + (mAccount.getInboxFolderName().equalsIgnoreCase(mFolder) && mAccount.getInboxFolderName().equalsIgnoreCase(name)))) { continue; } try { @@ -316,7 +316,7 @@ public class ChooseFolder extends K9ListActivity { selectedFolder = position; } } else if (name.equals(mFolder) || - (mAccount.getInboxFolderName().equalsIgnoreCase(mFolder) && mAccount.getInboxFolderName().equalsIgnoreCase(name))) { + (mAccount.getInboxFolderName().equalsIgnoreCase(mFolder) && mAccount.getInboxFolderName().equalsIgnoreCase(name))) { selectedFolder = position; } position++; diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java index c54f82cc4..2944ace9b 100644 --- a/src/com/fsck/k9/activity/setup/AccountSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSettings.java @@ -702,10 +702,10 @@ public class AccountSettings extends K9PreferenceActivity { // In webdav account we use the exact folder name also for inbox, // since it varies because of internationalization - if(mAccount.getStoreUri().startsWith("webdav")) - mAccount.setAutoExpandFolderName(mAutoExpandFolder.getValue()); + if (mAccount.getStoreUri().startsWith("webdav")) + mAccount.setAutoExpandFolderName(mAutoExpandFolder.getValue()); else - mAccount.setAutoExpandFolderName(reverseTranslateFolder(mAutoExpandFolder.getValue())); + mAccount.setAutoExpandFolderName(reverseTranslateFolder(mAutoExpandFolder.getValue())); mAccount.setArchiveFolderName(mArchiveFolder.getValue()); mAccount.setDraftsFolderName(mDraftsFolder.getValue()); diff --git a/src/com/fsck/k9/mail/store/WebDavStore.java b/src/com/fsck/k9/mail/store/WebDavStore.java index 6f626bba9..ef3b837f6 100644 --- a/src/com/fsck/k9/mail/store/WebDavStore.java +++ b/src/com/fsck/k9/mail/store/WebDavStore.java @@ -85,9 +85,9 @@ public class WebDavStore extends Store { private static final String DAV_MAIL_DRAFTS_FOLDER = "drafts"; private static final String DAV_MAIL_SPAM_FOLDER = "junkemail"; private static final String DAV_MAIL_SEND_FOLDER = "##DavMailSubmissionURI##"; - private static final String DAV_MAIL_TRASH_FOLDER = "deleteditems"; - private static final String DAV_MAIL_OUTBOX_FOLDER = "outbox"; - private static final String DAV_MAIL_SENT_FOLDER = "sentitems"; + private static final String DAV_MAIL_TRASH_FOLDER = "deleteditems"; + private static final String DAV_MAIL_OUTBOX_FOLDER = "outbox"; + private static final String DAV_MAIL_SENT_FOLDER = "sentitems"; private short mConnectionSecurity; private String mUsername; /* Stores the username for authentications */ @@ -256,30 +256,30 @@ public class WebDavStore extends Store { HashMap specialFoldersMap = dataset.getSpecialFolderToUrl(); String folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_INBOX_FOLDER)); - if(folderName != null) { - mAccount.setAutoExpandFolderName(folderName); - mAccount.setInboxFolderName(folderName); + if (folderName != null) { + mAccount.setAutoExpandFolderName(folderName); + mAccount.setInboxFolderName(folderName); } folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_DRAFTS_FOLDER)); - if(folderName != null) - mAccount.setDraftsFolderName(folderName); + if (folderName != null) + mAccount.setDraftsFolderName(folderName); folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_TRASH_FOLDER)); - if(folderName != null) - mAccount.setTrashFolderName(folderName); + if (folderName != null) + mAccount.setTrashFolderName(folderName); folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_SPAM_FOLDER)); - if(folderName != null) - mAccount.setSpamFolderName(folderName); + if (folderName != null) + mAccount.setSpamFolderName(folderName); folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_OUTBOX_FOLDER)); - if(folderName != null) - mAccount.setOutboxFolderName(folderName); + if (folderName != null) + mAccount.setOutboxFolderName(folderName); folderName = getFolderName(specialFoldersMap.get(DAV_MAIL_SENT_FOLDER)); - if(folderName != null) - mAccount.setSentFolderName(folderName); + if (folderName != null) + mAccount.setSentFolderName(folderName); /** * Next we get all the folders (including "special" ones) @@ -293,8 +293,8 @@ public class WebDavStore extends Store { for (int i = 0; i < folderUrls.length; i++) { String tempUrl = folderUrls[i]; WebDavFolder folder = createFolder(tempUrl); - if(folder != null) - folderList.add(folder); + if (folder != null) + folderList.add(folder); } return folderList; @@ -308,60 +308,60 @@ public class WebDavStore extends Store { * @return */ private WebDavFolder createFolder(String folderUrl) { - if(folderUrl == null) - return null; + if (folderUrl == null) + return null; - WebDavFolder wdFolder=null; - String folderName = getFolderName(folderUrl); - if(folderName != null) { - if(!this.mFolderList.containsKey(folderName)) { + WebDavFolder wdFolder = null; + String folderName = getFolderName(folderUrl); + if (folderName != null) { + if (!this.mFolderList.containsKey(folderName)) { wdFolder = new WebDavFolder(this, folderName); wdFolder.setUrl(folderUrl); - mFolderList.put(folderName, wdFolder); - } + mFolderList.put(folderName, wdFolder); + } } - // else: Unknown URL format => NO Folder created + // else: Unknown URL format => NO Folder created - return wdFolder; - } + return wdFolder; + } private String getFolderName(String folderUrl) { - if(folderUrl == null) - return null; + if (folderUrl == null) + return null; - // Here we extract the folder name starting from the complete url. - // folderUrl is in the form http://mail.domain.com/exchange/username/foldername - // so we need "foldername" which is the string after the fifth slash - int folderSlash=-1; - for(int j=0; j < 5; j++) { - folderSlash=folderUrl.indexOf('/', folderSlash+1); - if(folderSlash < 0) - break; + // Here we extract the folder name starting from the complete url. + // folderUrl is in the form http://mail.domain.com/exchange/username/foldername + // so we need "foldername" which is the string after the fifth slash + int folderSlash = -1; + for (int j = 0; j < 5; j++) { + folderSlash = folderUrl.indexOf('/', folderSlash + 1); + if (folderSlash < 0) + break; } - if(folderSlash > 0) { - String folderName; - String fullPathName; + if (folderSlash > 0) { + String folderName; + String fullPathName; - // Removes the final slash if present - if(folderUrl.charAt(folderUrl.length()-1) == '/') - fullPathName = folderUrl.substring(folderSlash+1, folderUrl.length()-1); - else - fullPathName = folderUrl.substring(folderSlash+1); + // Removes the final slash if present + if (folderUrl.charAt(folderUrl.length() - 1) == '/') + fullPathName = folderUrl.substring(folderSlash + 1, folderUrl.length() - 1); + else + fullPathName = folderUrl.substring(folderSlash + 1); - // Decodes the url-encoded folder name (i.e. "My%20folder" => "My Folder" - try { - folderName = java.net.URLDecoder.decode(fullPathName, "UTF-8"); - } catch (UnsupportedEncodingException uee) { - /** - * If we don't support UTF-8 there's a problem, don't decode - * it then - */ - folderName = fullPathName; - } + // Decodes the url-encoded folder name (i.e. "My%20folder" => "My Folder" + try { + folderName = java.net.URLDecoder.decode(fullPathName, "UTF-8"); + } catch (UnsupportedEncodingException uee) { + /** + * If we don't support UTF-8 there's a problem, don't decode + * it then + */ + folderName = fullPathName; + } - return folderName; - } + return folderName; + } return null; } @@ -378,10 +378,10 @@ public class WebDavStore extends Store { } public Folder getSendSpoolFolder() throws MessagingException { - if (mSendFolder == null) - mSendFolder = getFolder(DAV_MAIL_SEND_FOLDER); + if (mSendFolder == null) + mSendFolder = getFolder(DAV_MAIL_SEND_FOLDER); - return mSendFolder; + return mSendFolder; } @Override @@ -394,25 +394,25 @@ public class WebDavStore extends Store { return true; } - private String getSpecialFoldersList() { - StringBuffer buffer = new StringBuffer(200); - buffer.append(""); - buffer.append(""); - buffer.append(""); - buffer.append("<").append(DAV_MAIL_INBOX_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>"); - buffer.append("<").append(DAV_MAIL_DRAFTS_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>"); - buffer.append("<").append(DAV_MAIL_OUTBOX_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>"); - buffer.append("<").append(DAV_MAIL_SENT_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>"); - buffer.append("<").append(DAV_MAIL_TRASH_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>"); - // This should always be ##DavMailSubmissionURI## for which we already have a constant - // buffer.append(""); + private String getSpecialFoldersList() { + StringBuffer buffer = new StringBuffer(200); + buffer.append(""); + buffer.append(""); + buffer.append(""); + buffer.append("<").append(DAV_MAIL_INBOX_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>"); + buffer.append("<").append(DAV_MAIL_DRAFTS_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>"); + buffer.append("<").append(DAV_MAIL_OUTBOX_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>"); + buffer.append("<").append(DAV_MAIL_SENT_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>"); + buffer.append("<").append(DAV_MAIL_TRASH_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>"); + // This should always be ##DavMailSubmissionURI## for which we already have a constant + // buffer.append(""); - buffer.append("<").append(DAV_MAIL_SPAM_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>"); + buffer.append("<").append(DAV_MAIL_SPAM_FOLDER).append(" xmlns=\"urn:schemas:httpmail:\"/>"); - buffer.append(""); - buffer.append(""); - return buffer.toString(); - } + buffer.append(""); + buffer.append(""); + return buffer.toString(); + } /*************************************************************** * WebDAV XML Request body retrieval functions @@ -1081,7 +1081,7 @@ public class WebDavStore extends Store { @Override public void sendMessages(Message[] messages) throws MessagingException { - WebDavFolder tmpFolder = (WebDavStore.WebDavFolder) getFolder(mAccount.getDraftsFolderName()); + WebDavFolder tmpFolder = (WebDavStore.WebDavFolder) getFolder(mAccount.getDraftsFolderName()); try { tmpFolder.open(OpenMode.READ_WRITE); Message[] retMessages = tmpFolder.appendWebDavMessages(messages); @@ -2072,17 +2072,17 @@ public class WebDavStore extends Store { } /** - * Returns a hashmap of special folder name => special folder url - */ - public HashMap getSpecialFolderToUrl() { - // We return the first (and only) map - for (HashMap folderMap : mData.values()) { - return folderMap; - } - return new HashMap(); - } + * Returns a hashmap of special folder name => special folder url + */ + public HashMap getSpecialFolderToUrl() { + // We return the first (and only) map + for (HashMap folderMap : mData.values()) { + return folderMap; + } + return new HashMap(); + } - /** + /** * Returns a hashmap of Message UID => Message Url */ public HashMap getUidToUrl() {