aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2012-04-10 22:26:05 +0200
committerSamuel Tardieu <sam@rfc1149.net>2012-04-11 15:50:34 +0200
commit4b5d28aa82b67a46883e4c905532a690a2e603fa (patch)
treeac8e05087f083553c66c9c29a9c69f46b5b6cf6c
parent0e1a543d2dd55239204e33fb1d9072a2ed69227b (diff)
downloadcgeo-4b5d28aa82b67a46883e4c905532a690a2e603fa.zip
cgeo-4b5d28aa82b67a46883e4c905532a690a2e603fa.tar.gz
cgeo-4b5d28aa82b67a46883e4c905532a690a2e603fa.tar.bz2
Some methods are only used internally
Those three methods do not need to be bounced from cgeoapplication as they are only used internally from cgData.
-rw-r--r--main/src/cgeo/geocaching/cgData.java6
-rw-r--r--main/src/cgeo/geocaching/cgeoapplication.java15
2 files changed, 3 insertions, 18 deletions
diff --git a/main/src/cgeo/geocaching/cgData.java b/main/src/cgeo/geocaching/cgData.java
index 7a3cece..b0a3574 100644
--- a/main/src/cgeo/geocaching/cgData.java
+++ b/main/src/cgeo/geocaching/cgData.java
@@ -1862,7 +1862,7 @@ public class cgData {
* @param loadFlags
* @return Set of loaded caches. Never null.
*/
- public Set<cgCache> loadCaches(final Set<String> geocodes, final Long centerLat, final Long centerLon, final Long spanLat, final Long spanLon, final EnumSet<LoadFlag> loadFlags) {
+ private Set<cgCache> loadCaches(final Set<String> geocodes, final Long centerLat, final Long centerLon, final Long spanLat, final Long spanLon, final EnumSet<LoadFlag> loadFlags) {
final Set<cgCache> caches = new HashSet<cgCache>();
if (CollectionUtils.isEmpty(geocodes)) {
return caches;
@@ -2244,7 +2244,7 @@ public class cgData {
return waypoint;
}
- public List<cgImage> loadSpoilers(String geocode) {
+ private List<cgImage> loadSpoilers(String geocode) {
if (StringUtils.isBlank(geocode)) {
return null;
}
@@ -2442,7 +2442,7 @@ public class cgData {
return logCounts;
}
- public List<cgTrackable> loadInventory(String geocode) {
+ private List<cgTrackable> loadInventory(String geocode) {
if (StringUtils.isBlank(geocode)) {
return null;
}
diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java
index afb0ba0..7e44871 100644
--- a/main/src/cgeo/geocaching/cgeoapplication.java
+++ b/main/src/cgeo/geocaching/cgeoapplication.java
@@ -384,21 +384,11 @@ public class cgeoapplication extends Application {
storage.dropList(listId);
}
- /** {@link cgData#loadInventory(String)} */
- public List<cgTrackable> loadInventory(String geocode) {
- return storage.loadInventory(geocode);
- }
-
/** {@link cgData#loadLogCounts(String)} */
public Map<LogType, Integer> loadLogCounts(String geocode) {
return storage.loadLogCounts(geocode);
}
- /** {@link cgData#loadSpoilers(String)} */
- public List<cgImage> loadSpoilers(String geocode) {
- return storage.loadSpoilers(geocode);
- }
-
/** {@link cgData#loadWaypoint(int)} */
public cgWaypoint loadWaypoint(int id) {
return storage.loadWaypoint(id);
@@ -520,11 +510,6 @@ public class cgeoapplication extends Application {
return storage.loadCaches(geocodes, loadFlags);
}
- /** {@link cgData#loadCaches} */
- public Set<cgCache> loadCaches(Long centerLat, Long centerLon, Long spanLat, Long spanLon, final EnumSet<LoadFlag> loadFlags) {
- return storage.loadCaches(null, centerLat, centerLon, spanLat, spanLon, loadFlags);
- }
-
/** {@link cgData#saveCache} */
public boolean saveCache(cgCache cache, EnumSet<LoadFlags.SaveFlag> saveFlags) {
return storage.saveCache(cache, saveFlags);