Make some methods static

7 files changed, 10 insertions, 8 deletions

diff --git a/main/src/cgeo/geocaching/apps/AbstractLocusApp.java b/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
index e56cce7..26874c4 100644
--- a/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
+++ b/main/src/cgeo/geocaching/apps/AbstractLocusApp.java
@@ -53,8 +53,8 @@ public abstract class AbstractLocusApp extends AbstractApp {
      * @param activity
      * @author koem
      */
-    protected void showInLocus(List<? extends Object> objectsToShow, boolean withCacheWaypoints,
-            Activity activity) {
+    protected static void showInLocus(final List<? extends Object> objectsToShow, final boolean withCacheWaypoints,
+            final Activity activity) {
         if (objectsToShow == null) {
             return;
         }
diff --git a/main/src/cgeo/geocaching/apps/cache/navi/LocusApp.java b/main/src/cgeo/geocaching/apps/cache/navi/LocusApp.java
index eea80da..305ded2 100644
--- a/main/src/cgeo/geocaching/apps/cache/navi/LocusApp.java
+++ b/main/src/cgeo/geocaching/apps/cache/navi/LocusApp.java
@@ -46,7 +46,7 @@ class LocusApp extends AbstractLocusApp implements NavigationApp {
                 points.add(waypoint);
             }
 
-            this.showInLocus(points, true, activity);
+            showInLocus(points, true, activity);
 
             return true;
         }
diff --git a/main/src/cgeo/geocaching/apps/cachelist/LocusCacheListApp.java b/main/src/cgeo/geocaching/apps/cachelist/LocusCacheListApp.java
index ed6ac20..c08122a 100644
--- a/main/src/cgeo/geocaching/apps/cachelist/LocusCacheListApp.java
+++ b/main/src/cgeo/geocaching/apps/cachelist/LocusCacheListApp.java
@@ -28,7 +28,7 @@ class LocusCacheListApp extends AbstractLocusApp implements CacheListApp {
         if (cacheList == null || cacheList.isEmpty())
             return false;
 
-        this.showInLocus((List<? extends Object>) cacheList, false, activity);
+        showInLocus((List<? extends Object>) cacheList, false, activity);
 
         return true;
     }
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index d31e693..6e7877b 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -2918,7 +2918,7 @@ public class cgBase {
         return users;
     }
 
-    public List<cgCache> processSearchResults(cgSearch search, cgCacheWrap caches, int excludeDisabled, int excludeMine, String cacheType) {
+    public static List<cgCache> processSearchResults(final cgSearch search, final cgCacheWrap caches, final int excludeDisabled, final int excludeMine, final String cacheType) {
         List<cgCache> cacheList = new ArrayList<cgCache>();
         if (caches != null) {
             if (StringUtils.isNotBlank(caches.error)) {
diff --git a/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java b/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java
index 5dc6204..dbf1a60 100644
--- a/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java
+++ b/main/src/cgeo/geocaching/compatibility/AndroidLevel8.java
@@ -6,11 +6,13 @@ import android.view.Display;
 
 public class AndroidLevel8 {
 
-    public int getRotation(Activity activity) {
+    @SuppressWarnings("static-method")
+    public int getRotation(final Activity activity) {
         Display display = activity.getWindowManager().getDefaultDisplay();
         return display.getRotation();
     }
 
+    @SuppressWarnings("static-method")
     public void dataChanged(final String name) {
         BackupManager.dataChanged(name);
     }
diff --git a/main/src/cgeo/geocaching/connector/GCConnector.java b/main/src/cgeo/geocaching/connector/GCConnector.java
index e269c8b..c7eec10 100644
--- a/main/src/cgeo/geocaching/connector/GCConnector.java
+++ b/main/src/cgeo/geocaching/connector/GCConnector.java
@@ -120,7 +120,7 @@ public class GCConnector extends AbstractConnector implements IConnector {
             return null;
         }
 
-        List<cgCache> cacheList = base.processSearchResults(search, caches, 0, 0, null);
+        List<cgCache> cacheList = cgBase.processSearchResults(search, caches, 0, 0, null);
         app.addSearch(search, cacheList, true, reason);
 
         return search.getCurrentId();
diff --git a/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java b/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java
index 63c773e..31ca32f 100644
--- a/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java
+++ b/main/src/cgeo/geocaching/connector/opencaching/ApiOpenCachingConnector.java
@@ -44,7 +44,7 @@ public class ApiOpenCachingConnector extends OpenCachingConnector implements ICo
         final cgCacheWrap caches = new cgCacheWrap();
         caches.cacheList.add(cache);
 
-        final List<cgCache> cacheList = base.processSearchResults(search, caches, 0, 0, null);
+        final List<cgCache> cacheList = cgBase.processSearchResults(search, caches, 0, 0, null);
         app.addSearch(search, cacheList, true, reason);
 
         return search.getCurrentId();