Changeset 5912 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-04-29T02:00:39+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #8638 - Presets: Allow editing of multiselect values in wrong order

File:

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

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

@@ -80 +80 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.GBC;
@@ -91 +92 @@
 import org.openstreetmap.josm.tools.template_engine.TemplateParser;
 import org.xml.sax.SAXException;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 
 
@@ -1012 +1012 @@
             } else {
                 String s = o.toString();
-                HashSet<String> parts = new HashSet<String>(Arrays.asList(s.split(delimiter)));
+                TreeSet<String> parts = new TreeSet<String>(Arrays.asList(s.split(delimiter)));
                 ListModel lm = getModel();
                 int[] intParts = new int[lm.getSize()];
@@ -1025 +1025 @@
                 // value with our presets. if not, cop out; we will not offer
                 // a selection list that threatens to ruin the value.
-                setEnabled(s.equals(getSelectedItem()));
+                setEnabled(Utils.join(delimiter, parts).equals(getSelectedItem()));
             }
         }