aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/apps/cachelist
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/cgeo/geocaching/apps/cachelist')
-rw-r--r--main/src/cgeo/geocaching/apps/cachelist/CacheListApp.java5
-rw-r--r--main/src/cgeo/geocaching/apps/cachelist/CacheListAppFactory.java8
-rw-r--r--main/src/cgeo/geocaching/apps/cachelist/InternalCacheListMap.java8
-rw-r--r--main/src/cgeo/geocaching/apps/cachelist/LocusCacheListApp.java5
4 files changed, 10 insertions, 16 deletions
diff --git a/main/src/cgeo/geocaching/apps/cachelist/CacheListApp.java b/main/src/cgeo/geocaching/apps/cachelist/CacheListApp.java
index 45ebaff..519b394 100644
--- a/main/src/cgeo/geocaching/apps/cachelist/CacheListApp.java
+++ b/main/src/cgeo/geocaching/apps/cachelist/CacheListApp.java
@@ -1,9 +1,8 @@
package cgeo.geocaching.apps.cachelist;
-import cgeo.geocaching.IGeoData;
import cgeo.geocaching.SearchResult;
-import cgeo.geocaching.apps.App;
import cgeo.geocaching.cgCache;
+import cgeo.geocaching.apps.App;
import android.app.Activity;
@@ -11,7 +10,7 @@ import java.util.List;
interface CacheListApp extends App {
- boolean invoke(final IGeoData geo, final List<cgCache> caches,
+ boolean invoke(final List<cgCache> caches,
final Activity activity, final SearchResult search);
}
diff --git a/main/src/cgeo/geocaching/apps/cachelist/CacheListAppFactory.java b/main/src/cgeo/geocaching/apps/cachelist/CacheListAppFactory.java
index 0b36716..fbfb9fc 100644
--- a/main/src/cgeo/geocaching/apps/cachelist/CacheListAppFactory.java
+++ b/main/src/cgeo/geocaching/apps/cachelist/CacheListAppFactory.java
@@ -1,6 +1,5 @@
package cgeo.geocaching.apps.cachelist;
-import cgeo.geocaching.IGeoData;
import cgeo.geocaching.R;
import cgeo.geocaching.SearchResult;
import cgeo.geocaching.cgCache;
@@ -35,7 +34,7 @@ public final class CacheListAppFactory extends AbstractAppFactory {
public static MenuItem addMenuItems(final Menu menu, final Activity activity, final Resources res) {
final List<CacheListApp> activeApps = new ArrayList<CacheListApp>(LazyHolder.apps.length);
for (final CacheListApp app : LazyHolder.apps) {
- if (app.isInstalled(activity)) {
+ if (app.isInstalled()) {
activeApps.add(app);
}
}
@@ -56,13 +55,12 @@ public final class CacheListAppFactory extends AbstractAppFactory {
}
}
- public static boolean onMenuItemSelected(final MenuItem item,
- final IGeoData geo, final List<cgCache> caches, final IAbstractActivity activity,
+ public static boolean onMenuItemSelected(final MenuItem item, final List<cgCache> caches, final IAbstractActivity activity,
final SearchResult search) {
final CacheListApp app = (CacheListApp) getAppFromMenuItem(item, LazyHolder.apps);
if (app != null) {
try {
- boolean result = app.invoke(geo, caches, (Activity) activity, search);
+ boolean result = app.invoke(caches, (Activity) activity, search);
activity.invalidateOptionsMenuCompatible();
return result;
} catch (Exception e) {
diff --git a/main/src/cgeo/geocaching/apps/cachelist/InternalCacheListMap.java b/main/src/cgeo/geocaching/apps/cachelist/InternalCacheListMap.java
index f450bbc..d6e1fed 100644
--- a/main/src/cgeo/geocaching/apps/cachelist/InternalCacheListMap.java
+++ b/main/src/cgeo/geocaching/apps/cachelist/InternalCacheListMap.java
@@ -1,14 +1,12 @@
package cgeo.geocaching.apps.cachelist;
-import cgeo.geocaching.IGeoData;
import cgeo.geocaching.R;
import cgeo.geocaching.SearchResult;
-import cgeo.geocaching.apps.AbstractApp;
import cgeo.geocaching.cgCache;
+import cgeo.geocaching.apps.AbstractApp;
import cgeo.geocaching.maps.CGeoMap;
import android.app.Activity;
-import android.content.Context;
import java.util.List;
@@ -19,12 +17,12 @@ class InternalCacheListMap extends AbstractApp implements CacheListApp {
}
@Override
- public boolean isInstalled(Context context) {
+ public boolean isInstalled() {
return true;
}
@Override
- public boolean invoke(IGeoData geo, List<cgCache> caches, Activity activity, final SearchResult search) {
+ public boolean invoke(List<cgCache> caches, Activity activity, final SearchResult search) {
CGeoMap.startActivitySearch(activity, search, null);
return true;
}
diff --git a/main/src/cgeo/geocaching/apps/cachelist/LocusCacheListApp.java b/main/src/cgeo/geocaching/apps/cachelist/LocusCacheListApp.java
index b7557c3..c3427fb 100644
--- a/main/src/cgeo/geocaching/apps/cachelist/LocusCacheListApp.java
+++ b/main/src/cgeo/geocaching/apps/cachelist/LocusCacheListApp.java
@@ -1,10 +1,9 @@
package cgeo.geocaching.apps.cachelist;
-import cgeo.geocaching.IGeoData;
import cgeo.geocaching.R;
import cgeo.geocaching.SearchResult;
-import cgeo.geocaching.apps.AbstractLocusApp;
import cgeo.geocaching.cgCache;
+import cgeo.geocaching.apps.AbstractLocusApp;
import org.apache.commons.collections.CollectionUtils;
@@ -29,7 +28,7 @@ class LocusCacheListApp extends AbstractLocusApp implements CacheListApp {
* @author koem
*/
@Override
- public boolean invoke(IGeoData geo, List<cgCache> cacheList, Activity activity, final SearchResult search) {
+ public boolean invoke(List<cgCache> cacheList, Activity activity, final SearchResult search) {
if (CollectionUtils.isEmpty(cacheList)) {
return false;
}