#671, cache normalized name for sorting

1 files changed, 15 insertions, 0 deletions

diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index 8874eae..cdd0fc3 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -85,7 +85,9 @@ public class cgCache implements ICache {
     public boolean statusChecked = false;
     public boolean statusCheckedView = false;
     public String directionImg = null;
+    private String nameForSorting;
 
+    private static final Pattern NUMBER_PATTERN = Pattern.compile("\\d+");
     /**
      * Gather missing information from another cache object.
      *
@@ -562,4 +564,17 @@ public class cgCache implements ICache {
         return favouriteCnt;
     }
 
+    @Override
+    public String getNameForSorting() {
+        if (null == nameForSorting) {
+            final Matcher matcher = NUMBER_PATTERN.matcher(name);
+            if (matcher.find()) {
+                nameForSorting = name.replace(matcher.group(), StringUtils.leftPad(matcher.group(), 6, '0'));
+            }
+            else {
+                nameForSorting = name;
+            }
+        }
+        return nameForSorting;
+    }
 }