Changeset 6772 in josm for trunk

Timestamp:

2014-01-29T21:14:07+01:00 (10 years ago)

Author:

simon04

Message:

fix #8413 - Presets: no not apply use_last_as_default when calling the preset dialog on an object with some tags of this preset already set

This avoids wrongs address tags when using the address preset.

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/tagging/TaggingPreset.java (modified) (2 diffs)
• gui/tagging/TaggingPresetItems.java (modified) (2 diffs)
• tools/Utils.java (modified) (2 diffs)

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

@@ -275 +275 @@
     }
 
+    static boolean presetInitiallyMatches = false;
+
     @Override
     public void actionPerformed(ActionEvent e) {
@@ -281 +283 @@
 
         Collection<OsmPrimitive> sel = createSelection(Main.main.getCurrentDataSet().getSelected());
+        presetInitiallyMatches = !sel.isEmpty() && Utils.forAll(sel, this);
         int answer = showDialog(sel, supportsRelation());
 

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

@@ -597 +597 @@
                 else if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
                     // selected osm primitives are untagged or filling default values feature is enabled
-                    if (!"false".equals(use_last_as_default) && lastValue.containsKey(key)) {
+                    if (!"false".equals(use_last_as_default) && lastValue.containsKey(key) && !TaggingPreset.presetInitiallyMatches) {
                         textField.setText(lastValue.get(key));
                     } else {
@@ -1227 +1227 @@
                 // all items were unset (and so is default)
                 originalValue = lhm.get("");
-                if ("force".equals(use_last_as_default) && lastValue.containsKey(key)) {
+                if ("force".equals(use_last_as_default) && lastValue.containsKey(key) && !TaggingPreset.presetInitiallyMatches) {
                     combo.setSelectedItem(lhm.get(lastValue.get(key)));
                 } else {

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -65 +65 @@
     public static final Charset UTF_8 = Charset.forName("UTF-8");
 
+    /**
+     * Tests whether {@code predicate} applies to at least one elements from {@code collection}.
+     */
     public static <T> boolean exists(Iterable<? extends T> collection, Predicate<? super T> predicate) {
         for (T item : collection) {
@@ -71 +74 @@
         }
         return false;
+    }
+
+    /**
+     * Tests whether {@code predicate} applies to all elements from {@code collection}.
+     */
+    public static <T> boolean forAll(Iterable<? extends T> collection, Predicate<? super T> predicate) {
+        return !exists(collection, Predicates.not(predicate));
     }