From 03dd89b3f906064ab708a9965493f2c65c742392 Mon Sep 17 00:00:00 2001 From: Daniel Applebaum Date: Sun, 12 Apr 2009 01:51:54 +0000 Subject: [PATCH] Get rid of @Overrides that cause compilation failures with Java 1.5 --- src/com/android/email/preferences/Editor.java | 16 +++++++-------- .../android/email/preferences/Storage.java | 20 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/com/android/email/preferences/Editor.java b/src/com/android/email/preferences/Editor.java index f9afed36d..feaf74130 100644 --- a/src/com/android/email/preferences/Editor.java +++ b/src/com/android/email/preferences/Editor.java @@ -50,7 +50,7 @@ public class Editor implements android.content.SharedPreferences.Editor } } - @Override + //@Override public android.content.SharedPreferences.Editor clear() { removeAll = true; @@ -58,7 +58,7 @@ public class Editor implements android.content.SharedPreferences.Editor } /* This method is poorly defined. It should throw an Exception on failure */ - @Override + //@Override public boolean commit() { try @@ -106,7 +106,7 @@ public class Editor implements android.content.SharedPreferences.Editor } - @Override + //@Override public android.content.SharedPreferences.Editor putBoolean(String key, boolean value) { @@ -114,7 +114,7 @@ public class Editor implements android.content.SharedPreferences.Editor return this; } - @Override + //@Override public android.content.SharedPreferences.Editor putFloat(String key, float value) { @@ -122,21 +122,21 @@ public class Editor implements android.content.SharedPreferences.Editor return this; } - @Override + //@Override public android.content.SharedPreferences.Editor putInt(String key, int value) { changes.put(key, "" + value); return this; } - @Override + //@Override public android.content.SharedPreferences.Editor putLong(String key, long value) { changes.put(key, "" + value); return this; } - @Override + //@Override public android.content.SharedPreferences.Editor putString(String key, String value) { @@ -151,7 +151,7 @@ public class Editor implements android.content.SharedPreferences.Editor return this; } - @Override + //@Override public android.content.SharedPreferences.Editor remove(String key) { removals.add(key); diff --git a/src/com/android/email/preferences/Storage.java b/src/com/android/email/preferences/Storage.java index 1d9293c7c..5ec59885b 100644 --- a/src/com/android/email/preferences/Storage.java +++ b/src/com/android/email/preferences/Storage.java @@ -201,25 +201,25 @@ public class Storage implements SharedPreferences return storage.size(); } - @Override + //@Override public boolean contains(String key) { return storage.contains(key); } - @Override + //@Override public com.android.email.preferences.Editor edit() { return new com.android.email.preferences.Editor(this); } - @Override + //@Override public Map getAll() { return storage; } - @Override + //@Override public boolean getBoolean(String key, boolean defValue) { String val = storage.get(key); @@ -230,7 +230,7 @@ public class Storage implements SharedPreferences return Boolean.parseBoolean(val); } - @Override + //@Override public float getFloat(String key, float defValue) { String val = storage.get(key); @@ -241,7 +241,7 @@ public class Storage implements SharedPreferences return Float.parseFloat(val); } - @Override + //@Override public int getInt(String key, int defValue) { String val = storage.get(key); @@ -252,7 +252,7 @@ public class Storage implements SharedPreferences return Integer.parseInt(val); } - @Override + //@Override public long getLong(String key, long defValue) { String val = storage.get(key); @@ -263,7 +263,7 @@ public class Storage implements SharedPreferences return Long.parseLong(val); } - @Override + //@Override public String getString(String key, String defValue) { String val = storage.get(key); @@ -274,14 +274,14 @@ public class Storage implements SharedPreferences return val; } - @Override + //@Override public void registerOnSharedPreferenceChangeListener( OnSharedPreferenceChangeListener listener) { listeners.addIfAbsent(listener); } - @Override + //@Override public void unregisterOnSharedPreferenceChangeListener( OnSharedPreferenceChangeListener listener) {