From 888d28aed6c63737207c5502db520305fc7e3599 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 19 Feb 2014 20:01:39 -0500 Subject: [PATCH] @Override decorator on every method that overrides This marks a method as overriding another method, and makes sure that it matches the signature of the method it is supposed to be overriding, otherwise it gives a warning. Its a bit verbose, but can catch mistakes and save time. And the default Android profile for Eclipse always adds them automatically... --- src/org/fdroid/fdroid/ProgressListener.java | 2 ++ src/org/fdroid/fdroid/compat/TabManager.java | 7 +++++++ src/org/fdroid/fdroid/data/ApkProvider.java | 2 ++ src/org/fdroid/fdroid/data/AppProvider.java | 1 + src/org/fdroid/fdroid/data/Repo.java | 1 + src/org/fdroid/fdroid/data/RepoProvider.java | 1 + src/org/fdroid/fdroid/net/NsdHelper.java | 1 + src/org/fdroid/fdroid/updater/SignedRepoUpdater.java | 1 + src/org/fdroid/fdroid/views/RepoAdapter.java | 1 + .../fdroid/views/fragments/AvailableAppsFragment.java | 1 + .../fdroid/fdroid/views/fragments/RepoDetailsFragment.java | 4 ++++ test/src/org/fdroid/fdroid/ApkProviderTest.java | 1 + test/src/org/fdroid/fdroid/AppProviderTest.java | 1 + 13 files changed, 24 insertions(+) diff --git a/src/org/fdroid/fdroid/ProgressListener.java b/src/org/fdroid/fdroid/ProgressListener.java index ab83d08b0..5550c1492 100644 --- a/src/org/fdroid/fdroid/ProgressListener.java +++ b/src/org/fdroid/fdroid/ProgressListener.java @@ -66,10 +66,12 @@ public interface ProgressListener { } public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + @Override public Event createFromParcel(Parcel in) { return new Event(in.readInt(), in.readInt(), in.readInt(), in.readBundle()); } + @Override public Event[] newArray(int size) { return new Event[size]; } diff --git a/src/org/fdroid/fdroid/compat/TabManager.java b/src/org/fdroid/fdroid/compat/TabManager.java index e3edeb6da..d93e9fdf3 100644 --- a/src/org/fdroid/fdroid/compat/TabManager.java +++ b/src/org/fdroid/fdroid/compat/TabManager.java @@ -66,6 +66,7 @@ class OldTabManagerImpl extends TabManager { * and giving it a FrameLayout as a child. This will make the tabs have * dummy empty contents and then hook them up to our ViewPager. */ + @Override public void createTabs() { tabHost = new TabHost(parent, null); tabHost.setLayoutParams(new TabHost.LayoutParams( @@ -128,12 +129,14 @@ class OldTabManagerImpl extends TabManager { } + @Override public void selectTab(int index) { tabHost.setCurrentTab(index); if (index == INDEX_CAN_UPDATE) removeNotification(1); } + @Override public void refreshTabLabel(int index) { CharSequence text = getLabel(index); @@ -166,6 +169,7 @@ class HoneycombTabManagerImpl extends TabManager { actionBar = parent.getActionBar(); } + @Override public void createTabs() { actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); for (int i = 0; i < pager.getAdapter().getCount(); i ++) { @@ -174,6 +178,7 @@ class HoneycombTabManagerImpl extends TabManager { actionBar.newTab() .setText(label) .setTabListener(new ActionBar.TabListener() { + @Override public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) { int pos = tab.getPosition(); @@ -193,6 +198,7 @@ class HoneycombTabManagerImpl extends TabManager { } } + @Override public void selectTab(int index) { actionBar.setSelectedNavigationItem(index); Spinner actionBarSpinner = getActionBarSpinner(); @@ -203,6 +209,7 @@ class HoneycombTabManagerImpl extends TabManager { removeNotification(1); } + @Override public void refreshTabLabel(int index) { CharSequence text = getLabel(index); actionBar.getTabAt(index).setText(text); diff --git a/src/org/fdroid/fdroid/data/ApkProvider.java b/src/org/fdroid/fdroid/data/ApkProvider.java index 27987908e..34efab702 100644 --- a/src/org/fdroid/fdroid/data/ApkProvider.java +++ b/src/org/fdroid/fdroid/data/ApkProvider.java @@ -255,6 +255,7 @@ public class ApkProvider extends FDroidProvider { return PROVIDER_NAME; } + @Override protected UriMatcher getMatcher() { return matcher; } @@ -323,6 +324,7 @@ public class ApkProvider extends FDroidProvider { this.orderBy = orderBy; } + @Override public String toString() { StringBuilder suffix = new StringBuilder(); diff --git a/src/org/fdroid/fdroid/data/AppProvider.java b/src/org/fdroid/fdroid/data/AppProvider.java index 0ce0b1ac0..f404df0c0 100644 --- a/src/org/fdroid/fdroid/data/AppProvider.java +++ b/src/org/fdroid/fdroid/data/AppProvider.java @@ -266,6 +266,7 @@ public class AppProvider extends FDroidProvider { return AUTHORITY + "." + PROVIDER_NAME; } + @Override protected UriMatcher getMatcher() { return matcher; } diff --git a/src/org/fdroid/fdroid/data/Repo.java b/src/org/fdroid/fdroid/data/Repo.java index 1b0bdd055..76001ca1d 100644 --- a/src/org/fdroid/fdroid/data/Repo.java +++ b/src/org/fdroid/fdroid/data/Repo.java @@ -72,6 +72,7 @@ public class Repo extends ValueObject { return name; } + @Override public String toString() { return address; } diff --git a/src/org/fdroid/fdroid/data/RepoProvider.java b/src/org/fdroid/fdroid/data/RepoProvider.java index 9d23b440d..530ce8ecf 100644 --- a/src/org/fdroid/fdroid/data/RepoProvider.java +++ b/src/org/fdroid/fdroid/data/RepoProvider.java @@ -234,6 +234,7 @@ public class RepoProvider extends FDroidProvider { return "RepoProvider"; } + @Override protected UriMatcher getMatcher() { return matcher; } diff --git a/src/org/fdroid/fdroid/net/NsdHelper.java b/src/org/fdroid/fdroid/net/NsdHelper.java index de5c67763..b56dbe37c 100644 --- a/src/org/fdroid/fdroid/net/NsdHelper.java +++ b/src/org/fdroid/fdroid/net/NsdHelper.java @@ -202,6 +202,7 @@ public class NsdHelper { //in order for it to update the ListView without error Handler refresh = new Handler(Looper.getMainLooper()); refresh.post(new Runnable() { + @Override public void run() { notifyDataSetChanged(); diff --git a/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java b/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java index ce22fd0c3..9b5ef8b1e 100644 --- a/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java +++ b/src/org/fdroid/fdroid/updater/SignedRepoUpdater.java @@ -84,6 +84,7 @@ public class SignedRepoUpdater extends RepoUpdater { return indexFile; } + @Override protected String getIndexAddress() { return repo.address + "/index.jar?client_version=" + context.getString(R.string.version_name); } diff --git a/src/org/fdroid/fdroid/views/RepoAdapter.java b/src/org/fdroid/fdroid/views/RepoAdapter.java index 3fcb3c3aa..c3cd8d60e 100644 --- a/src/org/fdroid/fdroid/views/RepoAdapter.java +++ b/src/org/fdroid/fdroid/views/RepoAdapter.java @@ -45,6 +45,7 @@ public class RepoAdapter extends CursorAdapter { enabledListener = listener; } + @Override public boolean hasStableIds() { return true; } diff --git a/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java b/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java index ee8efedd3..d222440c4 100644 --- a/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java +++ b/src/org/fdroid/fdroid/views/fragments/AvailableAppsFragment.java @@ -37,6 +37,7 @@ public class AvailableAppsFragment extends AppListFragment implements return "Available"; } + @Override protected AppListAdapter getAppListAdapter() { if (adapter == null) { final AppListAdapter a = new AvailableAppListAdapter(getActivity(), null); diff --git a/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java b/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java index a22d01229..0a91d8748 100644 --- a/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java +++ b/src/org/fdroid/fdroid/views/fragments/RepoDetailsFragment.java @@ -62,6 +62,7 @@ public class RepoDetailsFragment extends Fragment { // best way to go about this... private Repo repo; + @Override public void onAttach(Activity activity) { super.onAttach(activity); } @@ -80,6 +81,7 @@ public class RepoDetailsFragment extends Fragment { return RepoProvider.Helper.findById(getActivity(), getRepoId()); } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { repo = loadRepoDetails(); @@ -346,11 +348,13 @@ public class RepoDetailsFragment extends Fragment { repoFingerprintView.setTextColor(repoFingerprintColor); } + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); } + @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); } diff --git a/test/src/org/fdroid/fdroid/ApkProviderTest.java b/test/src/org/fdroid/fdroid/ApkProviderTest.java index bd265ba54..cee69d733 100644 --- a/test/src/org/fdroid/fdroid/ApkProviderTest.java +++ b/test/src/org/fdroid/fdroid/ApkProviderTest.java @@ -20,6 +20,7 @@ public class ApkProviderTest extends FDroidProviderTest { super(ApkProvider.class, ApkProvider.getAuthority()); } + @Override protected String[] getMinimalProjection() { return new String[] { ApkProvider.DataColumns.APK_ID, diff --git a/test/src/org/fdroid/fdroid/AppProviderTest.java b/test/src/org/fdroid/fdroid/AppProviderTest.java index 6b801869d..2768e858b 100644 --- a/test/src/org/fdroid/fdroid/AppProviderTest.java +++ b/test/src/org/fdroid/fdroid/AppProviderTest.java @@ -25,6 +25,7 @@ public class AppProviderTest extends FDroidProviderTest { getSwappableContext().setResources(new MockCategoryResources()); } + @Override protected String[] getMinimalProjection() { return new String[] { AppProvider.DataColumns.APP_ID,