From 35ab566f43e8114ccaf1be8770a7656a6fd5656d Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Tue, 17 Nov 2009 19:25:46 +0000
Subject: [PATCH] Cleanup of the LocalFolder perf optimization from last night.

---
 src/com/android/email/mail/Folder.java            | 9 ++++-----
 src/com/android/email/mail/store/ImapStore.java   | 4 ----
 src/com/android/email/mail/store/Pop3Store.java   | 5 -----
 src/com/android/email/mail/store/WebDavStore.java | 4 ----
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/com/android/email/mail/Folder.java b/src/com/android/email/mail/Folder.java
index 2c2ec3ab7..3eb0493bf 100644
--- a/src/com/android/email/mail/Folder.java
+++ b/src/com/android/email/mail/Folder.java
@@ -82,12 +82,11 @@ public abstract class Folder {
      * @param listener
      */
     public abstract Message[] getMessages(MessageRetrievalListener listener)
-            throws MessagingException;
-
-
-    public abstract Message[] getMessages(MessageRetrievalListener listener, boolean includeDeleted)
-            throws MessagingException;
+           throws MessagingException;
 
+    public Message[] getMessages(MessageRetrievalListener listener, boolean includeDeleted) throws MessagingException {
+           return getMessages(listener);
+    }
 
     public abstract Message[] getMessages(String[] uids, MessageRetrievalListener listener)
             throws MessagingException;
diff --git a/src/com/android/email/mail/store/ImapStore.java b/src/com/android/email/mail/store/ImapStore.java
index 5a6c83ba3..036701c31 100644
--- a/src/com/android/email/mail/store/ImapStore.java
+++ b/src/com/android/email/mail/store/ImapStore.java
@@ -709,10 +709,6 @@ public class ImapStore extends Store {
             return messages.toArray(new Message[] {});
         }
 
-		@Override
-        public Message[] getMessages(MessageRetrievalListener listener, boolean includeDeleted) throws MessagingException {
-            return getMessages(listener);
-        }
 
         public Message[] getMessages(MessageRetrievalListener listener) throws MessagingException {
             return getMessages(null, listener);
diff --git a/src/com/android/email/mail/store/Pop3Store.java b/src/com/android/email/mail/store/Pop3Store.java
index 4f4158e76..cadb0ab66 100644
--- a/src/com/android/email/mail/store/Pop3Store.java
+++ b/src/com/android/email/mail/store/Pop3Store.java
@@ -493,11 +493,6 @@ public class Pop3Store extends Store {
             mUidToMsgNumMap.put(message.getUid(), msgNum);
         }
 
-		@Override
-        public Message[] getMessages(MessageRetrievalListener listener, boolean includeDeleted) throws MessagingException {
-            return getMessages(listener);
-        }
-
         @Override
         public Message[] getMessages(MessageRetrievalListener listener) throws MessagingException {
             throw new UnsupportedOperationException("Pop3: No getMessages");
diff --git a/src/com/android/email/mail/store/WebDavStore.java b/src/com/android/email/mail/store/WebDavStore.java
index 75703e469..ed944bff6 100644
--- a/src/com/android/email/mail/store/WebDavStore.java
+++ b/src/com/android/email/mail/store/WebDavStore.java
@@ -1248,10 +1248,6 @@ public class WebDavStore extends Store {
             return messages.toArray(new Message[] {});
         }
  
-		@Override
-        public Message[] getMessages(MessageRetrievalListener listener, boolean includeDeleted) throws MessagingException {
-            return getMessages(listener);
-        }
 
         @Override
         public Message[] getMessages(MessageRetrievalListener listener) throws MessagingException {