Changeset 1121 in josm

Timestamp:

Dec 13, 2008 11:24:29 PM (4 years ago)

Author:

stoecker

Message:

add bookmark sorting. closes #1787

File:

• trunk/src/org/openstreetmap/josm/data/Preferences.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -12 +12 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.Properties;
 import java.util.SortedMap;
-import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.Map.Entry;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.openstreetmap.josm.Main;
@@ -49 +51 @@
          * @author imi
          */
-        public static class Bookmark {
+        public static class Bookmark implements Comparable<Bookmark> {
                 public String name;
                 public double[] latlon = new double[4]; // minlat, minlon, maxlat, maxlon
                 @Override public String toString() {
                         return name;
+                }
+                public int compareTo(Bookmark b) {
+                        return name.toLowerCase().compareTo(b.name.toLowerCase());
                 }
         }
@@ -290 +295 @@
                 BufferedReader in = new BufferedReader(new FileReader(bookmarkFile));
 
-                Collection<Bookmark> bookmarks = new LinkedList<Bookmark>();
+                LinkedList<Bookmark> bookmarks = new LinkedList<Bookmark>();
+                // use pattern matches to scan text, as text may contain a "," itself
                 for (String line = in.readLine(); line != null; line = in.readLine()) {
-                        StringTokenizer st = new StringTokenizer(line, ",");
-                        if (st.countTokens() < 5)
-                                continue;
-                        Bookmark b = new Bookmark();
-                        b.name = st.nextToken();
-                        try {
+                        Matcher m = Pattern.compile("^(.+),(-?\\d+.\\d+),(-?\\d+.\\d+),(-?\\d+.\\d+),(-?\\d+.\\d+)$").matcher(line);
+                        if(m.matches())
+                        {
+                                Bookmark b = new Bookmark();
+                                b.name = m.group(1);
                                 for (int i = 0; i < b.latlon.length; ++i)
-                                        b.latlon[i] = Double.parseDouble(st.nextToken());
+                                        b.latlon[i] = Double.parseDouble(m.group(i+2));
                                 bookmarks.add(b);
-                        } catch (NumberFormatException x) {
-                                // line not parsed
                         }
                 }
                 in.close();
+                Collections.sort(bookmarks);
                 return bookmarks;
         }
@@ -315 +319 @@
                 PrintWriter out = new PrintWriter(new FileWriter(bookmarkFile));
                 for (Bookmark b : bookmarks) {
-                        b.name = b.name.replace(',', '_');
                         out.print(b.name+",");
                         for (int i = 0; i < b.latlon.length; ++i)