diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2015-01-02 08:56:53 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2015-01-02 08:56:53 +0100 |
| commit | 1151670b79b1c1ff5266dc6ec21fa8a38bca8e75 (patch) | |
| tree | 4d8898ac9e20fb8f92c61f44d1baa690ea344f28 | |
| parent | 4e8d093d518792d19b703482c571d3d54349d474 (diff) | |
| download | cgeo-1151670b79b1c1ff5266dc6ec21fa8a38bca8e75.zip cgeo-1151670b79b1c1ff5266dc6ec21fa8a38bca8e75.tar.gz cgeo-1151670b79b1c1ff5266dc6ec21fa8a38bca8e75.tar.bz2 | |
remove redundant code for cache size null checks
| -rw-r--r-- | main/src/cgeo/geocaching/DataStore.java | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/sorting/SizeComparator.java | 5 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/ui/CacheDetailsCreator.java | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/main/src/cgeo/geocaching/DataStore.java b/main/src/cgeo/geocaching/DataStore.java index cf4fde8..b7b0576 100644 --- a/main/src/cgeo/geocaching/DataStore.java +++ b/main/src/cgeo/geocaching/DataStore.java @@ -1157,7 +1157,7 @@ public class DataStore { values.put("hidden", hiddenDate.getTime()); } values.put("hint", cache.getHint()); - values.put("size", cache.getSize() == null ? "" : cache.getSize().id); + values.put("size", cache.getSize().id); values.put("difficulty", cache.getDifficulty()); values.put("terrain", cache.getTerrain()); values.put("location", cache.getLocation()); diff --git a/main/src/cgeo/geocaching/sorting/SizeComparator.java b/main/src/cgeo/geocaching/sorting/SizeComparator.java index 9e911f5..8cb5178 100644 --- a/main/src/cgeo/geocaching/sorting/SizeComparator.java +++ b/main/src/cgeo/geocaching/sorting/SizeComparator.java @@ -9,11 +9,6 @@ import cgeo.geocaching.Geocache; class SizeComparator extends AbstractCacheComparator { @Override - protected boolean canCompare(final Geocache cache) { - return cache.getSize() != null; - } - - @Override protected int compareCaches(final Geocache cache1, final Geocache cache2) { return cache2.getSize().comparable - cache1.getSize().comparable; } diff --git a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java index de954aa..e2af419 100644 --- a/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java +++ b/main/src/cgeo/geocaching/ui/CacheDetailsCreator.java @@ -133,7 +133,7 @@ public final class CacheDetailsCreator { } public void addSize(final Geocache cache) { - if (null != cache.getSize() && cache.showSize()) { + if (cache.showSize()) { add(R.string.cache_size, cache.getSize().getL10n()); } } |