Changeset 5563 in josm for trunk/src/org

Timestamp:

2012-11-04T02:36:23+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8052 - Presets: correctly select last value in comboboxes when specified, like with text fields

File:

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

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

@@ -862 +862 @@
                 // all items were unset (and so is default)
                 originalValue = lhm.get("");
-                combo.setSelectedItem(originalValue);
+                if ("force".equals(use_last_as_default) && lastValue.containsKey(key)) {
+                    combo.setSelectedItem(lhm.get(lastValue.get(key)));
+                } else {
+                    combo.setSelectedItem(originalValue);
+                }
             } else {
                 originalValue = lhm.get(DIFFERENT);
@@ -1223 +1227 @@
     public TemplateEntry nameTemplate;
     public Match nameTemplateFilter;
-    private static HashMap<String,String> lastValue = new HashMap<String,String>();
+    private static final HashMap<String,String> lastValue = new HashMap<String,String>();
 
     /**