Changeset 3581 in josm for trunk

Timestamp:

2010-10-03T11:37:46+02:00 (14 years ago)

Author:

jttt

Message:

Fix handling of tagging preset required attribute, use required attribute in Bridge preset

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -448 +448 @@
             <label text="Edit Bridge" />
             <space />
-            <key key="bridge" value="yes" />
+            <combo key="bridge" values="yes,viaduct,swing,aqueduct" required="true" default="yes" text="Bridge" />
             <optional>
                 <text key="name" text="Name" default="" delete_if_empty="true" />

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java

@@ -120 +120 @@
                             key = ((Check)i).key;
                         }
-                        if (key != null && valueCount.get(key) == null) {
-                            found -= 100;
+                        if (key != null) {
+                            if (valueCount.get(key) != null) {
+                                found += 1;
+                            } else {
+                                found -= 100;
+                            }
                         }
                     }

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

@@ -176 +176 @@
                 return result;
         }
+
+        @Override
+        public String toString() {
+            return classification + " " + preset.toString();
+        }
     }