From 88e6c59e7e4fafce95c6a1c21d16c161b0fa274b Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Sun, 6 Dec 2009 22:41:19 +0000
Subject: [PATCH] Get K-9 building on Java 1.5 again

---
 build.xml                                       | 2 +-
 src/com/android/email/MessagingController.java  | 1 -
 src/com/android/email/activity/MessageList.java | 3 ---
 src/com/android/email/mail/store/ImapStore.java | 3 ---
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 72f182fad..b4eaaeb69 100644
--- a/build.xml
+++ b/build.xml
@@ -193,7 +193,7 @@
 
     <!-- Compile this project's .java files into .class files. -->
     <target name="compile" depends="resource-src, aidl">
-        <javac encoding="ascii" target="1.6" debug="true" extdirs=""
+        <javac encoding="ascii" target="1.5" debug="true" extdirs=""
                 destdir="${out-classes}"
                 bootclasspathref="android.target.classpath">
             <src path="${source-folder}" />
diff --git a/src/com/android/email/MessagingController.java b/src/com/android/email/MessagingController.java
index 1379595ec..5fa809573 100644
--- a/src/com/android/email/MessagingController.java
+++ b/src/com/android/email/MessagingController.java
@@ -1558,7 +1558,6 @@ public class MessagingController implements Runnable
 
         localFolder.purgeToVisibleLimit(new MessageRemovalListener()
         {
-            @Override
             public void messageRemoved(Message message)
             {
                 for (MessagingListener l : getListeners())
diff --git a/src/com/android/email/activity/MessageList.java b/src/com/android/email/activity/MessageList.java
index d0aab4b30..559f8acb1 100644
--- a/src/com/android/email/activity/MessageList.java
+++ b/src/com/android/email/activity/MessageList.java
@@ -350,7 +350,6 @@ public class MessageList
         context.startActivity(intent);
     }
 
-    @Override
     public void onItemClick(AdapterView parent, View v, int position, long id)
     {
         if ((position+1) == (mAdapter.getCount()))
@@ -2114,7 +2113,6 @@ public class MessageList
         public CheckBox selected;
         public int position = -1;
 
-        @Override
         public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
         {
             if (position!=-1)
@@ -2240,7 +2238,6 @@ public class MessageList
         }
     }
 
-    @Override
     public void onClick(View v)
     {
         boolean newState = false;
diff --git a/src/com/android/email/mail/store/ImapStore.java b/src/com/android/email/mail/store/ImapStore.java
index 7862e2708..dec5ff8bf 100644
--- a/src/com/android/email/mail/store/ImapStore.java
+++ b/src/com/android/email/mail/store/ImapStore.java
@@ -2826,7 +2826,6 @@ public class ImapStore extends Store
             mReceiver = receiver;
         }
         
-        @Override
         public void start(List<String> folderNames)
         {
             stop();
@@ -2845,7 +2844,6 @@ public class ImapStore extends Store
             }
         }
 
-        @Override
         public void refresh()
         {
             synchronized(folderPushers)
@@ -2864,7 +2862,6 @@ public class ImapStore extends Store
             }
         }
         
-        @Override
         public void stop()
         {
             Log.i(Email.LOG_TAG, "Requested stop of IMAP pusher");