Changeset 3481 in josm

Timestamp:

Aug 29, 2010 3:30:31 PM (3 years ago)

Author:

stoecker

Message:

add use_last_as_default for combos, fix long-time broken tagged/untagged detection for combo-box and textbox default value selection

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (6 diffs)

trunk/data/defaultpresets.xml

@@ -3501 +3501 @@
                 <text key="addr:city" text="City name" use_last_as_default="true" delete_if_empty="true" />
                 <text key="addr:postcode" text="Post code" use_last_as_default="true" delete_if_empty="true" />
-                <text key="addr:country" text="Country code" use_last_as_default="true" delete_if_empty="true" />
+                <combo key="addr:country" text="Country code" values="AT,CH,DE,FR,GB,IT,US" use_last_as_default="true" delete_if_empty="true" />
             </optional>
         </item>

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

@@ -145 +145 @@
                 returnValue.hadEmpty = true;
             }
-            returnValue.hadKeys = ! returnValue.values.isEmpty() | returnValue.hadEmpty;
+            if(s.hasKeys()) {
+                returnValue.hadKeys = true;
+            }
         }
         return returnValue;
@@ -347 +349 @@
             // find out if our key is already used in the selection.
             usage = determineTextUsage(sel, key);
+            String def = default_;
 
             String[] value_array = values.split(",");
@@ -359 +362 @@
             }
 
+            if(use_last_as_default && def == null && lastValue.containsKey(key))
+            {
+                def = lastValue.get(key);
+            }
+
             if (display_array.length != value_array.length) {
                 System.err.println(tr("Broken tagging preset \"{0}-{1}\" - number of items in display_values must be the same as in values", key, text));
@@ -380 +388 @@
                 }
             }
-            if (default_ != null && !lhm.containsKey(default_)) {
-                lhm.put(default_, default_);
+            if (def != null && !lhm.containsKey(def)) {
+                lhm.put(def, def);
             }
             if(!lhm.containsKey("")) {
@@ -400 +408 @@
             }
             // use default only in case it is a totally new entry
-            else if(default_ != null && !usage.hadKeys()) {
-                combo.setSelectedItem(default_);
+            else if(def != null && !usage.hadKeys()) {
+                combo.setSelectedItem(def);
                 originalValue=DIFFERENT;
             }
@@ -452 +460 @@
             if (delete_if_empty && value.length() == 0) {
                 value = null;
+            }
+            if (use_last_as_default) {
+                lastValue.put(key, value);
             }
             cmds.add(new ChangePropertyCommand(sel, key, value));