diff options
| author | bananeweizen <bananeweizen@gmx.de> | 2011-08-14 15:51:18 +0200 |
|---|---|---|
| committer | bananeweizen <bananeweizen@gmx.de> | 2011-08-14 15:51:18 +0200 |
| commit | e9ff8452457816da5bf98cb6f5c6ef8a8d9c6d0a (patch) | |
| tree | c6ab0e87e3ca29a2c8f20f8d83b7ecb722f4e471 | |
| parent | 8146f618c9ffe779642c829dd2fd7d8039eabcee (diff) | |
| download | cgeo-e9ff8452457816da5bf98cb6f5c6ef8a8d9c6d0a.zip cgeo-e9ff8452457816da5bf98cb6f5c6ef8a8d9c6d0a.tar.gz cgeo-e9ff8452457816da5bf98cb6f5c6ef8a8d9c6d0a.tar.bz2 | |
make date comparator no longer differentiate between event and non event
caches. this can be done with filters anyway.
fixes #148
| -rw-r--r-- | res/values-de/strings.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | src/cgeo/geocaching/sorting/DateComparator.java | 21 |
3 files changed, 11 insertions, 18 deletions
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 525b148..3fd19cf 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -271,11 +271,11 @@ <string name="caches_sort_size">Größe</string> <string name="caches_sort_favorites">Beliebtheit</string> <string name="caches_sort_name">Name</string> - <string name="caches_sort_gccode">GC-Code (Alter)</string> + <string name="caches_sort_gccode">GC-Code</string> <string name="caches_sort_rating">Bewertung</string> <string name="caches_sort_vote">Eigene Bewertung</string> <string name="caches_sort_inventory">Inventaranzahl</string> - <string name="caches_sort_date">Datum (Event-Caches)</string> + <string name="caches_sort_date">Datum</string> <string name="caches_select">Wähle von Liste</string> <string name="caches_select_mode">Auswahlmodus</string> <string name="caches_select_mode_exit">Auswahlmodus beenden</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 3c56517..015b4d7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -271,11 +271,11 @@ <string name="caches_sort_size">size</string> <!-- since: 2.10 RC3 --> <string name="caches_sort_favorites">popularity</string> <!-- since: 2.10 RC3 --> <string name="caches_sort_name">name</string> <!-- since: 2.10 RC3 --> - <string name="caches_sort_gccode">GC-code (age)</string> <!-- since: 2.2 --> + <string name="caches_sort_gccode">GC-code</string> <!-- since: 2.2 --> <string name="caches_sort_rating">rating</string> <string name="caches_sort_vote">vote (own rating)</string> <string name="caches_sort_inventory">count of inventory</string> - <string name="caches_sort_date">date (event caches)</string> + <string name="caches_sort_date">date</string> <string name="caches_select">Select from list</string> <string name="caches_select_mode">Select mode</string> <string name="caches_select_mode_exit">Exit select mode</string> diff --git a/src/cgeo/geocaching/sorting/DateComparator.java b/src/cgeo/geocaching/sorting/DateComparator.java index 685c0b3..f1d08a4 100644 --- a/src/cgeo/geocaching/sorting/DateComparator.java +++ b/src/cgeo/geocaching/sorting/DateComparator.java @@ -5,7 +5,7 @@ import java.util.Date; import cgeo.geocaching.cgCache; /** - * compares event caches by date + * compares caches by date * @author bananeweizen * */ @@ -18,24 +18,17 @@ public class DateComparator extends AbstractCacheComparator { @Override protected int compareCaches(cgCache cache1, cgCache cache2) { - Date event1 = null; - Date event2 = null; - if (cache1.isEventCache()) { - event1 = cache1.hidden; + Date date1 = cache1.hidden; + Date date2 = cache2.hidden; + if (date1 != null && date2 != null) { + return date1.compareTo(date2); } - if (cache2.isEventCache()) { - event2 = cache2.hidden; - } - if (event1 != null && event2 != null) { - return event1.compareTo(event2); - } - if (event1 != null) { + if (date1 != null) { return -1; } - if (event2 != null) { + if (date2 != null) { return 1; } return 0; } - } |