diff options
| author | Marco Jacob <mjacob@union06.de> | 2013-05-28 21:20:42 +0200 |
|---|---|---|
| committer | Marco Jacob <mjacob@union06.de> | 2013-05-28 21:20:42 +0200 |
| commit | 6a0e3632aa328a522537fde542094dd5ebdec974 (patch) | |
| tree | 8c61aa8e2eefae12cf074f841c338d47d1c73e8b | |
| parent | 5d6a8ac63938779c1defff1e530d4ddf8e96a741 (diff) | |
| download | cgeo-6a0e3632aa328a522537fde542094dd5ebdec974.zip cgeo-6a0e3632aa328a522537fde542094dd5ebdec974.tar.gz cgeo-6a0e3632aa328a522537fde542094dd5ebdec974.tar.bz2 | |
fix #2794 - rename SearchResult.addCache method name
| -rw-r--r-- | main/src/cgeo/geocaching/SearchResult.java | 6 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCMap.java | 4 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/connector/gc/GCParser.java | 4 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/files/GPXImporter.java | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/main/src/cgeo/geocaching/SearchResult.java b/main/src/cgeo/geocaching/SearchResult.java index b0540f2..4cef95e 100644 --- a/main/src/cgeo/geocaching/SearchResult.java +++ b/main/src/cgeo/geocaching/SearchResult.java @@ -114,7 +114,7 @@ public class SearchResult implements Parcelable { public SearchResult(final Collection<Geocache> caches) { this(); for (final Geocache cache : caches) { - addCache(cache); + addAndPutInCache(cache); } } @@ -199,7 +199,7 @@ public class SearchResult implements Parcelable { (excludeMine && (cache.isOwner() || cache.isFound())) || (!cacheType.contains(cache)); if (!excludeCache) { - result.addCache(cache); + result.addAndPutInCache(cache); cachesForVote.add(cache); } } @@ -229,7 +229,7 @@ public class SearchResult implements Parcelable { } /** Add the cache geocode to the search and store the cache in the CacheCache */ - public boolean addCache(final Geocache cache) { + public boolean addAndPutInCache(final Geocache cache) { addGeocode(cache.getGeocode()); return cgData.saveCache(cache, EnumSet.of(SaveFlag.SAVE_CACHE)); } diff --git a/main/src/cgeo/geocaching/connector/gc/GCMap.java b/main/src/cgeo/geocaching/connector/gc/GCMap.java index 49f61ef..3143a06 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCMap.java +++ b/main/src/cgeo/geocaching/connector/gc/GCMap.java @@ -92,7 +92,7 @@ public class GCMap { JSONObject ownerObj = dataObject.getJSONObject("owner"); cache.setOwnerDisplayName(ownerObj.getString("text")); - result.addCache(cache); + result.addAndPutInCache(cache); } } catch (JSONException e) { @@ -231,7 +231,7 @@ public class GCMap { exclude = true; } if (!exclude) { - searchResult.addCache(cache); + searchResult.addAndPutInCache(cache); } } Log.d("Retrieved " + searchResult.getCount() + " caches for tile " + tile.toString()); diff --git a/main/src/cgeo/geocaching/connector/gc/GCParser.java b/main/src/cgeo/geocaching/connector/gc/GCParser.java index 1d40314..6d9f4ed 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCParser.java +++ b/main/src/cgeo/geocaching/connector/gc/GCParser.java @@ -244,7 +244,7 @@ public abstract class GCParser { Log.w("GCParser.parseSearch: Failed to parse favorite count"); } - searchResult.addCache(cache); + searchResult.addAndPutInCache(cache); } // total caches found @@ -731,7 +731,7 @@ public abstract class GCParser { } cache.setDetailedUpdatedNow(); - searchResult.addCache(cache); + searchResult.addAndPutInCache(cache); return searchResult; } diff --git a/main/src/cgeo/geocaching/files/GPXImporter.java b/main/src/cgeo/geocaching/files/GPXImporter.java index 69d2dac..87c0ec4 100644 --- a/main/src/cgeo/geocaching/files/GPXImporter.java +++ b/main/src/cgeo/geocaching/files/GPXImporter.java @@ -140,7 +140,7 @@ public class GPXImporter { final SearchResult search = new SearchResult(); for (Geocache cache : caches) { - search.addCache(cache); + search.addAndPutInCache(cache); } if (Settings.isStoreOfflineMaps() || Settings.isStoreOfflineWpMaps()) { |
