make date comparator no longer differentiate between event and non event

caches. this can be done with filters anyway.

fixes #148

1 files changed, 7 insertions, 14 deletions

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;
 	}
-
 }