From a558466c36f6e2921fb2dd989d23f1efd5fed55f Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Mon, 13 Jun 2011 19:49:06 -0400 Subject: [PATCH] ant astyle --- .../fsck/k9/activity/ConfirmationDialog.java | 2 +- src/com/fsck/k9/activity/MessageList.java | 34 +++++++++---------- src/com/fsck/k9/activity/MessageView.java | 8 ++--- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/com/fsck/k9/activity/ConfirmationDialog.java b/src/com/fsck/k9/activity/ConfirmationDialog.java index 6b22b7746..246ab2f5d 100644 --- a/src/com/fsck/k9/activity/ConfirmationDialog.java +++ b/src/com/fsck/k9/activity/ConfirmationDialog.java @@ -23,7 +23,7 @@ public class ConfirmationDialog { final String message, final int confirmButton, final int cancelButton, final Runnable action) { return create(activity, dialogId, title, message, confirmButton, cancelButton, - action, null); + action, null); } /** diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index a4addaeec..f9cf52721 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -846,10 +846,10 @@ public class MessageList } /* (non-Javadoc) - * + * * Method overriden for proper typing within this class (the return type is * more specific than the super implementation) - * + * * @see android.app.Activity#onRetainNonConfigurationInstance() */ @Override @@ -862,10 +862,10 @@ public class MessageList /* * (non-Javadoc) - * + * * Method overriden for proper typing within this class (the return type is * more specific than the super implementation) - * + * * @see android.app.Activity#getLastNonConfigurationInstance() */ @Override @@ -1325,7 +1325,7 @@ public class MessageList final int selectionSize = mActiveMessages.size(); final String message; message = getResources().getQuantityString(R.plurals.dialog_confirm_spam_message, selectionSize, - Integer.valueOf(selectionSize)); + Integer.valueOf(selectionSize)); ((AlertDialog) dialog).setMessage(message); } break; @@ -2600,7 +2600,7 @@ public class MessageList /** * Display the message move activity. - * + * * @param holders * Never {@code null}. */ @@ -2615,7 +2615,7 @@ public class MessageList /** * Display the message copy activity. - * + * * @param holders * Never {@code null}. */ @@ -2702,12 +2702,12 @@ public class MessageList /** * Display an Toast message if any message isn't synchronized - * + * * @param holders * Never null. * @param operation * Never {@code null}. - * + * * @return true if operation is possible */ private boolean checkCopyOrMovePossible(final List holders, final FolderOperation operation) { @@ -2728,7 +2728,7 @@ public class MessageList // message check if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(message))) { final Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, - Toast.LENGTH_LONG); + Toast.LENGTH_LONG); toast.show(); return false; } @@ -2738,7 +2738,7 @@ public class MessageList /** * Helper method to get a List of message ready to be processed. This implementation will return a list containing the sole argument. - * + * * @param holder Never {@code null}. * @return Never {@code null}. */ @@ -2749,7 +2749,7 @@ public class MessageList /** * Helper method to get a List of message ready to be processed. This implementation will iterate over messages and choose the checked ones. - * + * * @return Never {@code null}. */ private List getSelectionFromCheckboxes() { @@ -2788,7 +2788,7 @@ public class MessageList * The underlying implementation for {@link #copy(List, String)} and * {@link #move(List, String)}. This method was added mainly because those 2 * methods share common behavior. - * + * * @param holders * Never {@code null}. * @param destination @@ -2818,13 +2818,13 @@ public class MessageList return; } } else if (!account.equals(message.getFolder().getAccount()) - || !folderName.equals(message.getFolder().getName())) { + || !folderName.equals(message.getFolder().getName())) { // make sure all messages come from the same account/folder? return; } if ((operation == FolderOperation.MOVE && !mController.isMoveCapable(message)) || (operation == FolderOperation.COPY && !mController.isCopyCapable(message))) { final Toast toast = Toast.makeText(this, R.string.move_copy_cannot_copy_unsynced_message, - Toast.LENGTH_LONG); + Toast.LENGTH_LONG); toast.show(); // XXX return meaningful error value? @@ -2837,11 +2837,11 @@ public class MessageList if (operation == FolderOperation.MOVE) { mController.moveMessages(account, folderName, messages.toArray(new Message[messages.size()]), destination, - null); + null); mHandler.removeMessages(holders); } else { mController.copyMessages(account, folderName, messages.toArray(new Message[messages.size()]), destination, - null); + null); } } diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index 225caaab3..937e4e035 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -51,7 +51,7 @@ public class MessageView extends K9Activity implements OnClickListener { static { boolean hasOnBackMethod; try { - final Class superClass = MessageView.class.getSuperclass(); + final Class superClass = MessageView.class.getSuperclass(); final Method method = superClass.getMethod("onBackPressed", new Class[] {}); hasOnBackMethod = (method.getModifiers() & Modifier.PUBLIC) == Modifier.PUBLIC; } catch (final SecurityException e) { @@ -160,9 +160,9 @@ public class MessageView extends K9Activity implements OnClickListener { @Override public boolean onKeyDown(final int keyCode, final KeyEvent event) { if ( - // XXX TODO - when we go to android 2.0, uncomment this - // android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.ECLAIR && - keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) { + // XXX TODO - when we go to android 2.0, uncomment this + // android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.ECLAIR && + keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) { // Take care of calling this method on earlier versions of // the platform where it doesn't exist. onBackPressed();