Ticket #8413: 8413.patch

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

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

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

@@ -596 +596 @@
                 }
                 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 {
                         textField.setText(default_);
@@ -1226 +1226 @@
             } else if (usage.unused()) {
                 // 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 {
                     combo.setSelectedItem(originalValue);

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

@@ -64 +64 @@
      */
     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) {
             if (predicate.evaluate(item))
@@ -72 +75 @@
         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));
+    }
+
     public static <T> boolean exists(Iterable<T> collection, Class<? extends T> klass) {
         for (Object item : collection) {
             if (klass.isInstance(item))