Changeset 16043 in josm for trunk

Timestamp:

2020-03-06T00:23:33+01:00 (5 years ago)

Author:

simon04

Message:

see #18864 - TaggingPreset: use char for separator field

Retained size of TaggingPreset is unchanged at 1_750_272 (de).

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/tagging/presets/items/Combo.java (modified) (1 diff)
• gui/tagging/presets/items/ComboMultiSelect.java (modified) (7 diffs)
• tools/XmlObjectParser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java

@@ -30 +30 @@
      */
     public Combo() {
-        delimiter = ",";
+        delimiter = ',';
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -90 +90 @@
      * In case of {@link MultiSelect} the default is semicolon and this will also be used to separate selected values in the tag.
      */
-    public String delimiter = ";"; // NOSONAR
+    public char delimiter = ';'; // NOSONAR
     /** whether the last value is used as default. Using "force" enforces this behaviour also for already tagged objects. Default is "false".*/
     public String use_last_as_default = "false"; // NOSONAR
@@ -158 +158 @@
      */
     protected static class ConcatenatingJList extends JList<PresetListEntry> {
-        private final String delimiter;
-
-        protected ConcatenatingJList(String del, PresetListEntry... o) {
+        private final char delimiter;
+
+        protected ConcatenatingJList(char del, PresetListEntry... o) {
             super(o);
             delimiter = del;
@@ -170 +170 @@
             } else {
                 String s = o.toString();
-                Set<String> parts = new TreeSet<>(Arrays.asList(s.split(delimiter)));
+                Set<String> parts = new TreeSet<>(Arrays.asList(s.split(String.valueOf(delimiter))));
                 ListModel<PresetListEntry> lm = getModel();
                 int[] intParts = new int[lm.getSize()];
@@ -351 +351 @@
     protected abstract void addToPanelAnchor(JPanel p, String def, boolean presetInitiallyMatches);
 
-    protected char getDelChar() {
-        return delimiter.isEmpty() ? ';' : delimiter.charAt(0);
-    }
-
     @Override
     public Collection<String> getValues() {
@@ -423 +419 @@
 
     private void initListEntriesFromAttributes() {
-        char delChar = getDelChar();
 
         String[] valueArray = null;
@@ -450 +445 @@
 
         if (valueArray == null) {
-            valueArray = splitEscaped(delChar, values);
+            valueArray = splitEscaped(delimiter, values);
         }
 
@@ -456 +451 @@
         if (!values_no_i18n) {
             final String displ = Utils.firstNonNull(locale_display_values, display_values);
-            displayArray = displ == null ? valueArray : splitEscaped(delChar, displ);
+            displayArray = displ == null ? valueArray : splitEscaped(delimiter, displ);
         }
 
         final String descr = Utils.firstNonNull(locale_short_descriptions, short_descriptions);
-        String[] shortDescriptionsArray = descr == null ? null : splitEscaped(delChar, descr);
+        String[] shortDescriptionsArray = descr == null ? null : splitEscaped(delimiter, descr);
 
         if (displayArray.length != valueArray.length) {

trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -126 +126 @@
             if (boolean.class.equals(klass))
                 return parseBoolean(value);
+            else if (char.class.equals(klass))
+                return value.charAt(0);
             else if (Integer.class.equals(klass))
                 return Integer.valueOf(value);
@@ -154 +156 @@
                 }
                 if (f != null && Modifier.isPublic(f.getModifiers()) && (
-                        String.class.equals(f.getType()) || boolean.class.equals(f.getType()) ||
+                        String.class.equals(f.getType()) || boolean.class.equals(f.getType()) || char.class.equals(f.getType()) ||
                         Float.class.equals(f.getType()) || Double.class.equals(f.getType()) ||
                         Long.class.equals(f.getType()) || Integer.class.equals(f.getType()))) {