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

Timestamp:

2010-05-24T23:36:44+02:00 (14 years ago)

Author:

stoecker

Message:

fix #4192 - allow definition of true/false values in presets

File:

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

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

@@ -224 +224 @@
         public String text_context;
         public String locale_text;
+        public String value_on = OsmUtils.trueval;
+        public String value_off = OsmUtils.falseval;
         public boolean default_ = false; // only used for tagless objects
         public boolean use_last_as_default = false;
@@ -249 +251 @@
                 oneValue = s;
             }
-            if (usage.values.size() < 2 && (oneValue == null || OsmUtils.trueval.equals(oneValue) || OsmUtils.falseval.equals(oneValue))) {
+            if (usage.values.size() < 2 && (oneValue == null || value_on.equals(oneValue) || value_off.equals(oneValue))) {
                 if(def)
                 {
@@ -260 +262 @@
                 // all selected objects share the same value which is either true or false or unset,
                 // we can display a standard check box.
-                initialState = OsmUtils.trueval.equals(oneValue) ?
+                initialState = value_on.equals(oneValue) ?
                         QuadStateCheckBox.State.SELECTED :
-                            OsmUtils.falseval.equals(oneValue) ?
+                            value_off.equals(oneValue) ?
                                     QuadStateCheckBox.State.NOT_SELECTED :
                                         def ? QuadStateCheckBox.State.SELECTED
@@ -294 +296 @@
             // otherwise change things according to the selected value.
             cmds.add(new ChangePropertyCommand(sel, key,
-                    check.getState() == QuadStateCheckBox.State.SELECTED ? OsmUtils.trueval :
-                        check.getState() == QuadStateCheckBox.State.NOT_SELECTED ? OsmUtils.falseval :
+                    check.getState() == QuadStateCheckBox.State.SELECTED ? value_on :
+                        check.getState() == QuadStateCheckBox.State.NOT_SELECTED ? value_off :
                             null));
         }