rerun astyle

This commit is contained in:
Jesse Vincent 2010-01-03 01:50:51 +00:00
parent 1c5073039a
commit a926911e7f
10 changed files with 23 additions and 22 deletions

View File

@ -76,7 +76,7 @@ public class Account implements Serializable
public static final String EXPUNGE_IMMEDIATELY = "EXPUNGE_IMMEDIATELY"; public static final String EXPUNGE_IMMEDIATELY = "EXPUNGE_IMMEDIATELY";
public static final String EXPUNGE_MANUALLY = "EXPUNGE_MANUALLY"; public static final String EXPUNGE_MANUALLY = "EXPUNGE_MANUALLY";
public static final String EXPUNGE_ON_POLL = "EXPUNGE_ON_POLL"; public static final String EXPUNGE_ON_POLL = "EXPUNGE_ON_POLL";
/** /**
* <pre> * <pre>
* 0 Never * 0 Never

View File

@ -61,7 +61,7 @@ public class K9 extends Application
*/ */
public static boolean ENABLE_ERROR_FOLDER = true; public static boolean ENABLE_ERROR_FOLDER = true;
public static String ERROR_FOLDER_NAME = "K9mail-errors"; public static String ERROR_FOLDER_NAME = "K9mail-errors";
private static boolean mAnimations = true; private static boolean mAnimations = true;
/** /**

View File

@ -993,10 +993,10 @@ public class MessagingController implements Runnable
int unreadMessageCount = setLocalUnreadCountToRemote(localFolder, remoteFolder, newMessages); int unreadMessageCount = setLocalUnreadCountToRemote(localFolder, remoteFolder, newMessages);
for (MessagingListener l : getListeners()) for (MessagingListener l : getListeners())
{ {
l.folderStatusChanged(account, folder, unreadMessageCount); l.folderStatusChanged(account, folder, unreadMessageCount);
} }
/* /*
* Notify listeners that we're finally done. * Notify listeners that we're finally done.
@ -3407,7 +3407,7 @@ public class MessagingController implements Runnable
} }
public void expunge(final Account account, final String folder, final MessagingListener listener) public void expunge(final Account account, final String folder, final MessagingListener listener)
{ {
putBackground("expunge", null, new Runnable() putBackground("expunge", null, new Runnable()
{ {
public void run() public void run()

View File

@ -480,7 +480,7 @@ public class FolderList extends K9ListActivity
MessagingController.getInstance(getApplication()).emptyTrash(account, null); MessagingController.getInstance(getApplication()).emptyTrash(account, null);
} }
private void onExpunge(final Account account, String folderName) private void onExpunge(final Account account, String folderName)
{ {
MessagingController.getInstance(getApplication()).expunge(account, folderName, null); MessagingController.getInstance(getApplication()).expunge(account, folderName, null);

View File

@ -678,7 +678,7 @@ public class MessageList
private void onOpenMessage(MessageInfoHolder message) private void onOpenMessage(MessageInfoHolder message)
{ {
if ( message.folder.name.equals(message.account.getDraftsFolderName())) if (message.folder.name.equals(message.account.getDraftsFolderName()))
{ {
MessageCompose.actionEditDraft(this, message.account, message.message); MessageCompose.actionEditDraft(this, message.account, message.message);
} }
@ -1496,9 +1496,10 @@ public class MessageList
AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo; AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
MessageInfoHolder message = (MessageInfoHolder) mAdapter.getItem(info.position); MessageInfoHolder message = (MessageInfoHolder) mAdapter.getItem(info.position);
// in multi-select mode, the context menu pops up unintentionally // in multi-select mode, the context menu pops up unintentionally
// causes misclicks // causes misclicks
if (mSelectedWidget == WIDGET_MULTISELECT) { if (mSelectedWidget == WIDGET_MULTISELECT)
{
return; return;
} }

View File

@ -180,7 +180,7 @@ public class AccountSettings extends K9PreferenceActivity
return false; return false;
} }
}); });
mPushLimit = (ListPreference) findPreference(PREFERENCE_PUSH_LIMIT); mPushLimit = (ListPreference) findPreference(PREFERENCE_PUSH_LIMIT);
mPushLimit.setEnabled(isPushCapable); mPushLimit.setEnabled(isPushCapable);
mPushLimit.setValue(String.valueOf(mAccount.getMaxPushFolders())); mPushLimit.setValue(String.valueOf(mAccount.getMaxPushFolders()));
@ -226,7 +226,7 @@ public class AccountSettings extends K9PreferenceActivity
return false; return false;
} }
}); });
mExpungePolicy = (ListPreference) findPreference(PREFERENCE_EXPUNGE_POLICY); mExpungePolicy = (ListPreference) findPreference(PREFERENCE_EXPUNGE_POLICY);
mExpungePolicy.setEnabled(isExpungeCapable); mExpungePolicy.setEnabled(isExpungeCapable);
@ -243,7 +243,7 @@ public class AccountSettings extends K9PreferenceActivity
return false; return false;
} }
}); });
mDisplayCount = (ListPreference) findPreference(PREFERENCE_DISPLAY_COUNT); mDisplayCount = (ListPreference) findPreference(PREFERENCE_DISPLAY_COUNT);
mDisplayCount.setValue(String.valueOf(mAccount.getDisplayCount())); mDisplayCount.setValue(String.valueOf(mAccount.getDisplayCount()));
mDisplayCount.setSummary(mDisplayCount.getEntry()); mDisplayCount.setSummary(mDisplayCount.getEntry());

View File

@ -118,7 +118,7 @@ public abstract class Folder
public abstract String getUidFromMessageId(Message message) throws MessagingException; public abstract String getUidFromMessageId(Message message) throws MessagingException;
public void expunge() throws MessagingException public void expunge() throws MessagingException
{} {}
public abstract void fetch(Message[] messages, FetchProfile fp, public abstract void fetch(Message[] messages, FetchProfile fp,
MessageRetrievalListener listener) throws MessagingException; MessageRetrievalListener listener) throws MessagingException;

View File

@ -110,8 +110,8 @@ public abstract class Store
{ {
return false; return false;
} }
public void sendMessages(Message[] messages) throws MessagingException public void sendMessages(Message[] messages) throws MessagingException
{ {
} }

View File

@ -163,7 +163,7 @@ public class ImapStore extends Store
mAuthType = AuthType.PLAIN; mAuthType = AuthType.PLAIN;
mUsername = userInfoParts[0]; mUsername = userInfoParts[0];
mPassword = userInfoParts[1]; mPassword = userInfoParts[1];
} }
else else
{ {
mAuthType = AuthType.valueOf(userInfoParts[0]); mAuthType = AuthType.valueOf(userInfoParts[0]);
@ -600,7 +600,7 @@ public class ImapStore extends Store
{ {
return; return;
} }
synchronized (this) synchronized (this)
{ {
releaseConnection(mConnection); releaseConnection(mConnection);

View File

@ -33,13 +33,13 @@ public abstract class CoreService extends Service
WakeLock wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "K9"); WakeLock wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "K9");
wakeLock.setReferenceCounted(false); wakeLock.setReferenceCounted(false);
wakeLock.acquire(K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT); wakeLock.acquire(K9.MAIL_SERVICE_WAKE_LOCK_TIMEOUT);
Integer tmpWakeLockId = wakeLockSeq.getAndIncrement(); Integer tmpWakeLockId = wakeLockSeq.getAndIncrement();
wakeLocks.put(tmpWakeLockId, wakeLock); wakeLocks.put(tmpWakeLockId, wakeLock);
i.putExtra(WAKE_LOCK_ID, tmpWakeLockId); i.putExtra(WAKE_LOCK_ID, tmpWakeLockId);
} }
@Override @Override
public void onStart(Intent intent, int startId) public void onStart(Intent intent, int startId)
{ {