Changeset 3849 in josm

Timestamp:

Feb 2, 2011 11:39:08 PM (2 years ago)

Author:

bastiK

Message:

continue fixes by jttt and stoecker

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• mappaint/mapcss/Condition.java (modified) (1 diff)
• mappaint/mapcss/Selector.java (modified) (1 diff)
• tagging/TaggingPreset.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

@@ -80 +80 @@
                 if (osm instanceof Way && ((Way) osm).isClosed())
                     return true;
-                if (osm instanceof Relation && "multipolygon".equals(osm.get("type")))
+                if (osm instanceof Relation && ((Relation) osm).isMultipolygon())
                     return true;
                 return false;

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -50 +50 @@
             if (osm instanceof Way && ((Way)osm).isClosed())
                 return true;
-            if (osm instanceof Relation && "multipolygon".equals(osm.get("type")))
+            if (osm instanceof Relation && ((Relation) osm).isMultipolygon())
                 return true;
         }

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -418 +418 @@
             String def = default_;
 
-            String[] value_array = splitEscaped(values);
+            String[] value_array = splitEscaped(',', values);
             String[] display_array;
             String[] short_descriptions_array = null;
 
             if(locale_display_values != null) {
-                display_array = splitEscaped(locale_display_values);
+                display_array = splitEscaped(',', locale_display_values);
             } else if (display_values != null) {
-                display_array = splitEscaped(display_values);
+                display_array = splitEscaped(',', display_values);
             } else {
                 display_array = value_array;
@@ -431 +431 @@
 
             if (locale_short_descriptions != null) {
-                short_descriptions_array = splitEscaped(locale_short_descriptions);
+                short_descriptions_array = splitEscaped(',', locale_short_descriptions);
             } else if (short_descriptions != null) {
-                short_descriptions_array = splitEscaped(short_descriptions);
+                short_descriptions_array = splitEscaped(',', short_descriptions);
             } else if (short_description_list != null) {
                 short_descriptions_array = short_description_list.toArray(new String[0]);
@@ -551 +551 @@
                 return lbl;
             }
-        }
-
-        // allow escaped comma in comma separated list:
-        // "A\, B\, C,one\, two" --> ["A, B, C", "one, two"]
-        private static String[] splitEscaped(String s) {
-            List<String> result = new ArrayList<String>();
-            boolean backslash = false;
-            StringBuffer item = new StringBuffer();
-            for (int i=0; i<s.length(); i++) {
-                char ch = s.charAt(i);
-                if (backslash) {
-                    item.append(ch);
-                    backslash = false;
-                } else if (ch == '\\') {
-                    backslash = true;
-                } else if (ch == ',') {
-                    result.add(item.toString());
-                    item.setLength(0);
-                } else {
-                    item.append(ch);
-                }
-            }
-            return result.toArray(new String[result.size()]);
         }
 
@@ -700 +677 @@
             String def = default_;
 
-            String[] value_array = values.split(delimiter);
+            char delChar = ';';
+            if (delimiter.length() > 0) {
+                delChar = delimiter.charAt(0);
+            }
+
+            String[] value_array = splitEscaped(delChar, values);
             String[] display_array;
             String[] short_descriptions_array = null;
 
             if (locale_display_values != null) {
-                display_array = splitEscaped(delimiter, locale_display_values);
+                display_array = splitEscaped(delChar, locale_display_values);
             } else if (display_values != null) {
-                display_array = splitEscaped(delimiter, display_values);
+                display_array = splitEscaped(delChar, display_values);
             } else {
                 display_array = value_array;
@@ -713 +695 @@
 
             if (locale_short_descriptions != null) {
-                short_descriptions_array = splitEscaped(delimiter, locale_short_descriptions);
+                short_descriptions_array = splitEscaped(delChar, locale_short_descriptions);
             } else if (short_descriptions != null) {
-                short_descriptions_array = splitEscaped(delimiter, short_descriptions);
+                short_descriptions_array = splitEscaped(delChar, short_descriptions);
             } else if (short_description_list != null) {
                 short_descriptions_array = short_description_list.toArray(new String[0]);
@@ -817 +799 @@
         }
 
-        // allow escaped delimiter in comma separated list:
-        // "A\, B\, C,one\, two" --> ["A, B, C", "one, two"]
-        private static String[] splitEscaped(String delimiter, String s) {
-            String[] res = s.replaceAll("\\\\,", "\u0091").split(delimiter);
-            for (int i=0; i<res.length; ++i) {
-                res[i] = res[i].replaceAll("\u0091", delimiter);
-            }
-            return res;
-        }
-
         @Override public void addCommands(List<Tag> changedTags) {
             Object obj = list.getSelectedItem();
@@ -871 +843 @@
 
         @Override boolean requestFocusInWindow() {return list.requestFocusInWindow();}
+    }
+
+    /**
+     * allow escaped comma in comma separated list:
+     * "A\, B\, C,one\, two" --> ["A, B, C", "one, two"]
+     * @param delimiter the delimiter, e.g. a comma. separates the entries and
+     *      must be escaped within one entry
+     * @param s the string
+     */
+    private static String[] splitEscaped(char delemiter, String s) {
+        List<String> result = new ArrayList<String>();
+        boolean backslash = false;
+        StringBuilder item = new StringBuilder();
+        for (int i=0; i<s.length(); i++) {
+            char ch = s.charAt(i);
+            if (backslash) {
+                item.append(ch);
+                backslash = false;
+            } else if (ch == '\\') {
+                backslash = true;
+            } else if (ch == delemiter) {
+                result.add(item.toString());
+                item.setLength(0);
+            } else {
+                item.append(ch);
+            }
+        }
+        return result.toArray(new String[result.size()]);
     }