remove some findbugs issues

* unused code
* convert explicit type casts to generic method invocations

1 files changed, 24 insertions, 26 deletions

diff --git a/main/src/cgeo/geocaching/AbstractDialogFragment.java b/main/src/cgeo/geocaching/AbstractDialogFragment.java
index f242fc9..4025347 100644
--- a/main/src/cgeo/geocaching/AbstractDialogFragment.java
+++ b/main/src/cgeo/geocaching/AbstractDialogFragment.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
+
 import cgeo.geocaching.activity.AbstractActivity;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.enumerations.CacheSize;
@@ -56,26 +58,26 @@ public abstract class AbstractDialogFragment extends DialogFragment implements C
 
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         res = getResources();
         app = (CgeoApplication) getActivity().getApplication();
         setHasOptionsMenu(true);
     }
 
-    protected void initCustomActionBar(View v)
+    protected void initCustomActionBar(final View v)
     {
-        final ImageView defaultNavigationImageView = (ImageView) v.findViewById(R.id.defaultNavigation);
+        final ImageView defaultNavigationImageView = ButterKnife.findById(v, R.id.defaultNavigation);
         defaultNavigationImageView.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
-            public boolean onLongClick(View v) {
+            public boolean onLongClick(final View v) {
                 startDefaultNavigation2();
                 return true;
             }
         });
         defaultNavigationImageView.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onClick(final View v) {
                 navigateTo();
             }
         });
@@ -83,7 +85,7 @@ public abstract class AbstractDialogFragment extends DialogFragment implements C
         final View overflowActionBar = v.findViewById(R.id.overflowActionBar);
         overflowActionBar.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View v) {
+            public void onClick(final View v) {
                 showPopup(v);
             }
         });
@@ -109,7 +111,7 @@ public abstract class AbstractDialogFragment extends DialogFragment implements C
     }
 
 
-    protected void showPopup(View view)
+    protected void showPopup(final View view)
     {
         // For reason I totally not understand the PopupMenu from Appcompat is broken beyond
         // repair. Chicken out here and show the old menu on Gingerbread.
@@ -124,13 +126,13 @@ public abstract class AbstractDialogFragment extends DialogFragment implements C
     }
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    private void showPopupHoneycomb(View view) {
-        android.widget.PopupMenu popupMenu = new android.widget.PopupMenu(getActivity(), view);
+    private void showPopupHoneycomb(final View view) {
+        final android.widget.PopupMenu popupMenu = new android.widget.PopupMenu(getActivity(), view);
         CacheMenuHandler.addMenuItems(new MenuInflater(getActivity()), popupMenu.getMenu(), cache);
         popupMenu.setOnMenuItemClickListener(
                 new android.widget.PopupMenu.OnMenuItemClickListener() {
                     @Override
-                    public boolean onMenuItemClick(MenuItem item) {
+                    public boolean onMenuItemClick(final MenuItem item) {
                        return AbstractDialogFragment.this.onMenuItemClick(item);
                     }
                 }
@@ -138,9 +140,9 @@ public abstract class AbstractDialogFragment extends DialogFragment implements C
         popupMenu.show();
     }
 
-    protected void showPopupCompat(View view)
+    protected void showPopupCompat(final View view)
     {
-        PopupMenu popupMenu = new PopupMenu(getActivity(), view);
+        final PopupMenu popupMenu = new PopupMenu(getActivity(), view);
 
         // Directly instantiate SupportMenuInflater instead of getActivity().getMenuinflator
         // getMenuinflator will throw a NPE since it tries to get the not displayed ActionBar
@@ -238,7 +240,7 @@ public abstract class AbstractDialogFragment extends DialogFragment implements C
         buttonMore.setOnClickListener(new View.OnClickListener() {
 
             @Override
-            public void onClick(View arg0) {
+            public void onClick(final View arg0) {
                 CacheDetailActivity.startActivity(getActivity(), geocode);
                 getActivity().finish();
             }
@@ -248,7 +250,7 @@ public abstract class AbstractDialogFragment extends DialogFragment implements C
         registerForContextMenu(buttonMore);
     }
 
-    public final void showToast(String text) {
+    public final void showToast(final String text) {
         ActivityMixin.showToast(getActivity(), text);
     }
 
@@ -277,35 +279,35 @@ public abstract class AbstractDialogFragment extends DialogFragment implements C
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         CacheMenuHandler.addMenuItems(inflater, menu, cache);
 
     }
 
     @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+    public void onCreateContextMenu(final ContextMenu menu, final View v, final ContextMenu.ContextMenuInfo menuInfo) {
         super.onCreateContextMenu(menu, v, menuInfo);
         CacheMenuHandler.addMenuItems(new MenuInflater(getActivity()), menu, cache);
         for (int i=0;i<menu.size();i++) {
-            MenuItem m = menu.getItem(i);
+            final MenuItem m = menu.getItem(i);
             m.setOnMenuItemClickListener(this);
         }
     }
 
     @Override
-    public boolean onContextItemSelected(MenuItem item) {
+    public boolean onContextItemSelected(final MenuItem item) {
         return onOptionsItemSelected(item);
     }
 
 
     @Override
-    public boolean onMenuItemClick(MenuItem menuItem) {
+    public boolean onMenuItemClick(final MenuItem menuItem) {
         return onOptionsItemSelected(menuItem);
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
+    public boolean onOptionsItemSelected(final MenuItem item) {
         if (CacheMenuHandler.onMenuItemSelected(item, this, cache)) {
             return true;
         }
@@ -317,7 +319,7 @@ public abstract class AbstractDialogFragment extends DialogFragment implements C
     }
 
     @Override
-    public void onPrepareOptionsMenu(Menu menu) {
+    public void onPrepareOptionsMenu(final Menu menu) {
         super.onPrepareOptionsMenu(menu);
 
         try {
@@ -346,13 +348,9 @@ public abstract class AbstractDialogFragment extends DialogFragment implements C
     }
 
     @Override
-    public void onCancel(DialogInterface dialog) {
+    public void onCancel(final DialogInterface dialog) {
         super.onCancel(dialog);
         getActivity().finish();
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-    }
 }