From 9586b506fd44b035dd057e9fd4ff65f49ee3c7b7 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 28 Apr 2012 12:50:14 +0200
Subject: Refactoring: use simpler comparaisons

---
 main/src/cgeo/geocaching/sorting/GeocodeComparator.java | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'main/src/cgeo/geocaching/sorting/GeocodeComparator.java')

diff --git a/main/src/cgeo/geocaching/sorting/GeocodeComparator.java b/main/src/cgeo/geocaching/sorting/GeocodeComparator.java
index 1377cce..fb93c0e 100644
--- a/main/src/cgeo/geocaching/sorting/GeocodeComparator.java
+++ b/main/src/cgeo/geocaching/sorting/GeocodeComparator.java
@@ -17,12 +17,8 @@ public class GeocodeComparator extends AbstractCacheComparator {
     }
 
     @Override
-    protected int compareCaches(cgCache cache1, cgCache cache2) {
-        if (cache1.getGeocode().length() > cache2.getGeocode().length()) {
-            return 1;
-        } else if (cache2.getGeocode().length() > cache1.getGeocode().length()) {
-            return -1;
-        }
-        return cache1.getGeocode().compareToIgnoreCase(cache2.getGeocode());
+    protected int compareCaches(final cgCache cache1, final cgCache cache2) {
+        final int lengthDiff = cache1.getGeocode().length() - cache2.getGeocode().length();
+        return lengthDiff != 0 ? lengthDiff : cache1.getGeocode().compareToIgnoreCase(cache2.getGeocode());
     }
 }
-- 
cgit v1.1