From a8de2d000078c9ee7219c5a17c36a77707f6e95f Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Sat, 13 Nov 2010 01:47:08 +0000 Subject: [PATCH] astyle --- src/com/fsck/k9/Account.java | 20 +++++++++---------- src/com/fsck/k9/activity/ColorPickerBox.java | 4 ++-- .../fsck/k9/activity/ColorPickerDialog.java | 4 ++-- src/com/fsck/k9/activity/MessageList.java | 12 +++++------ .../k9/controller/MessagingController.java | 8 +++++--- src/com/fsck/k9/mail/store/LocalStore.java | 18 ++++++++--------- 6 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java index a11579a47..2ddb1a84d 100644 --- a/src/com/fsck/k9/Account.java +++ b/src/com/fsck/k9/Account.java @@ -576,17 +576,17 @@ public class Account implements BaseAccount } - public void resetVisibleLimits() + public void resetVisibleLimits() { - try - { - LocalStore localStore = getLocalStore(); - localStore.resetVisibleLimits(getDisplayCount()); - } - catch (MessagingException e) - { - Log.e(K9.LOG_TAG, "Unable to reset visible limits", e); - } + try + { + LocalStore localStore = getLocalStore(); + localStore.resetVisibleLimits(getDisplayCount()); + } + catch (MessagingException e) + { + Log.e(K9.LOG_TAG, "Unable to reset visible limits", e); + } } diff --git a/src/com/fsck/k9/activity/ColorPickerBox.java b/src/com/fsck/k9/activity/ColorPickerBox.java index 568b46686..ad737e77e 100644 --- a/src/com/fsck/k9/activity/ColorPickerBox.java +++ b/src/com/fsck/k9/activity/ColorPickerBox.java @@ -1,8 +1,8 @@ /* Sourced from http://code.google.com/p/android-color-picker/source/browse/trunk/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaBox.java?r=1 - * On 2010-11-07 + * On 2010-11-07 * Translated to English, Ported to use the same (inferior) API as the more standard "ColorPickerDialog" and imported into the K-9 namespace by Jesse Vincent * In an ideal world, we should move to using AmbilWarna as an Android Library Project in the future - * License: Apache 2.0 + * License: Apache 2.0 * Author: yukuku@code.google.com */ diff --git a/src/com/fsck/k9/activity/ColorPickerDialog.java b/src/com/fsck/k9/activity/ColorPickerDialog.java index 624d02f6c..3f22905a8 100644 --- a/src/com/fsck/k9/activity/ColorPickerDialog.java +++ b/src/com/fsck/k9/activity/ColorPickerDialog.java @@ -1,8 +1,8 @@ /* Sourced from http://code.google.com/p/android-color-picker/source/browse/trunk/AmbilWarna/src/yuku/ambilwarna/AmbilWarnaDialog.java?r=1 - * On 2010-11-07 + * On 2010-11-07 * Translated to English, Ported to use the same (inferior) API as the more standard "ColorPickerDialog" and imported into the K-9 namespace by Jesse Vincent * In an ideal world, we should move to using AmbilWarna as an Android Library Project in the future - * License: Apache 2.0 + * License: Apache 2.0 * Author: yukuku@code.google.com */ diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index 3d09dd5b3..8155d13e2 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -2794,14 +2794,14 @@ public class MessageList { if (!mCurrentFolder.lastCheckFailed) { - if (mAccount.getDisplayCount() == 0 ) - { + if (mAccount.getDisplayCount() == 0 ) + { holder.main.setText(getString(R.string.message_list_load_more_messages_action)); - } - else - { + } + else + { holder.main.setText(String.format(getString(R.string.load_more_messages_fmt), mAccount.getDisplayCount())); - } + } } else { diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java index 4e4529a05..9a0a2ece4 100644 --- a/src/com/fsck/k9/controller/MessagingController.java +++ b/src/com/fsck/k9/controller/MessagingController.java @@ -925,7 +925,8 @@ public class MessagingController implements Runnable { LocalStore localStore = account.getLocalStore(); LocalFolder localFolder = localStore.getFolder(folder); - if (localFolder.getVisibleLimit() > 0 ) { + if (localFolder.getVisibleLimit() > 0 ) + { localFolder.setVisibleLimit(localFolder.getVisibleLimit() + account.getDisplayCount()); } synchronizeMailbox(account, folder, listener, null); @@ -1121,11 +1122,12 @@ public class MessagingController implements Runnable * Message numbers start at 1. */ int remoteStart; - if (visibleLimit > 0 ) + if (visibleLimit > 0 ) { remoteStart = Math.max(0, remoteMessageCount - visibleLimit) + 1; } - else { + else + { remoteStart = 1; } int remoteEnd = remoteMessageCount; diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java index fceeb0bdb..1fcdb2884 100644 --- a/src/com/fsck/k9/mail/store/LocalStore.java +++ b/src/com/fsck/k9/mail/store/LocalStore.java @@ -1150,9 +1150,9 @@ public class LocalStore extends Store implements Serializable public void purgeToVisibleLimit(MessageRemovalListener listener) throws MessagingException { - if ( mVisibleLimit == 0) + if ( mVisibleLimit == 0) { - return ; + return ; } open(OpenMode.READ_WRITE); Message[] messages = getMessages(null, false); @@ -2416,7 +2416,7 @@ public class LocalStore extends Store implements Serializable return null; } - // Only look at the first 8k of a message when calculating + // Only look at the first 8k of a message when calculating // the preview. This should avoid unnecessary // memory usage on large messages if (text.length() > 8192) @@ -4758,7 +4758,7 @@ public class LocalStore extends Store implements Serializable } @Override - public String getSubject() + public String getSubject() { return mSubject; } @@ -4892,11 +4892,11 @@ public class LocalStore extends Store implements Serializable } - /* - * If a message is being marked as deleted we want to clear out it's content - * and attachments as well. Delete will not actually remove the row since we need - * to retain the uid for synchronization purposes. - */ + /* + * If a message is being marked as deleted we want to clear out it's content + * and attachments as well. Delete will not actually remove the row since we need + * to retain the uid for synchronization purposes. + */ private void delete() throws MessagingException {