Changeset 5172 in josm for trunk

Timestamp:

2012-04-08T00:34:00+02:00 (13 years ago)

Author:

simon04

Message:

see #5933 - avoid warnings "Ignoring * attribute as * elements are given"

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (3 diffs)

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

@@ -636 +636 @@
             }
 
+            // as addToPanel may be called several times, set String to null to avoid "Ignoring * attribute as * elements are given"
+            values = null;
+            display_values = null;
+            locale_display_values = null;
+            short_descriptions = null;
+            locale_short_descriptions = null;
+
             return display_array;
         }
@@ -923 +930 @@
      * @param s the string
      */
-    private static String[] splitEscaped(char delemiter, String s) {
+    private static String[] splitEscaped(char delimiter, String s) {
         List<String> result = new ArrayList<String>();
         boolean backslash = false;
@@ -934 +941 @@
             } else if (ch == '\\') {
                 backslash = true;
-            } else if (ch == delemiter) {
+            } else if (ch == delimiter) {
                 result.add(item.toString());
                 item.setLength(0);