From b5a6a28f1916f1c0c6c677290d4d37d8c16de9d3 Mon Sep 17 00:00:00 2001
From: cketti <cketti@googlemail.com>
Date: Wed, 19 May 2010 18:44:22 +0000
Subject: [PATCH] Fixed some more warnings: - Removed unused imports - Removed
 unnecessary @SuppressWarnings("deprecation") annotations - Added
 @SuppressWarnings("deprecation") to API 1-3 code that's now (API 5)
 deprecated - Added missing @Override annotation

---
 src/com/fsck/k9/EmailAddressAdapter.java          | 1 -
 src/com/fsck/k9/EmailAddressAdapterSdk3_4.java    | 1 +
 src/com/fsck/k9/activity/ColorPickerDialog.java   | 1 -
 src/com/fsck/k9/activity/FolderList.java          | 1 -
 src/com/fsck/k9/activity/setup/SpinnerHelper.java | 1 +
 src/com/fsck/k9/helper/AutoSyncHelper.java        | 1 -
 6 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/com/fsck/k9/EmailAddressAdapter.java b/src/com/fsck/k9/EmailAddressAdapter.java
index 8c98c9906..a1451fb82 100644
--- a/src/com/fsck/k9/EmailAddressAdapter.java
+++ b/src/com/fsck/k9/EmailAddressAdapter.java
@@ -38,7 +38,6 @@ public abstract class EmailAddressAdapter extends ResourceCursorAdapter
              * Check the version of the SDK we are running on. Choose an
              * implementation class designed for that version of the SDK.
              */
-            @SuppressWarnings("deprecation")
             int sdkVersion = Integer.parseInt(Build.VERSION.SDK);       // Cupcake style
             if (sdkVersion < Build.VERSION_CODES.ECLAIR)
             {
diff --git a/src/com/fsck/k9/EmailAddressAdapterSdk3_4.java b/src/com/fsck/k9/EmailAddressAdapterSdk3_4.java
index c1fdf7aa5..a5f0653ce 100644
--- a/src/com/fsck/k9/EmailAddressAdapterSdk3_4.java
+++ b/src/com/fsck/k9/EmailAddressAdapterSdk3_4.java
@@ -27,6 +27,7 @@ import com.fsck.k9.mail.Address;
 
 import static android.provider.Contacts.ContactMethods.CONTENT_EMAIL_URI;
 
+@SuppressWarnings("deprecation")
 public class EmailAddressAdapterSdk3_4 extends EmailAddressAdapter
 {
     public static final int NAME_INDEX = 1;
diff --git a/src/com/fsck/k9/activity/ColorPickerDialog.java b/src/com/fsck/k9/activity/ColorPickerDialog.java
index 67bb4a4a0..a3d694005 100644
--- a/src/com/fsck/k9/activity/ColorPickerDialog.java
+++ b/src/com/fsck/k9/activity/ColorPickerDialog.java
@@ -17,7 +17,6 @@
 package com.fsck.k9.activity;
 
 import com.fsck.k9.R;
-import com.fsck.k9.R.string;
 import android.os.Bundle;
 import android.app.Dialog;
 
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index e7e9013d1..930ec5444 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -9,7 +9,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
 import android.util.Config;
 import android.util.Log;
 import android.util.TypedValue;
diff --git a/src/com/fsck/k9/activity/setup/SpinnerHelper.java b/src/com/fsck/k9/activity/setup/SpinnerHelper.java
index 0a15ef03f..1d5431ed2 100644
--- a/src/com/fsck/k9/activity/setup/SpinnerHelper.java
+++ b/src/com/fsck/k9/activity/setup/SpinnerHelper.java
@@ -73,6 +73,7 @@ public class SpinnerHelper
             this.entry = entry;
             this.value = value;
         }
+        @Override
         public String toString()
         {
             return entry;
diff --git a/src/com/fsck/k9/helper/AutoSyncHelper.java b/src/com/fsck/k9/helper/AutoSyncHelper.java
index 91582fd5f..07e9645e3 100644
--- a/src/com/fsck/k9/helper/AutoSyncHelper.java
+++ b/src/com/fsck/k9/helper/AutoSyncHelper.java
@@ -46,7 +46,6 @@ public class AutoSyncHelper
          * Check the version of the SDK we are running on. Choose an
          * implementation class designed for that version of the SDK.
          */
-        @SuppressWarnings("deprecation")
         int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
 
         String className = null;