Changeset 19022 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

Timestamp:

2024-03-28T09:29:34+01:00 (2 months ago)

Author:

GerdP

Message:

see #23305 and #23555:
-revert most of the changes in r18988, it caused too many problems with plugins which relied on the old behaviour

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java

@@ -293 +293 @@
 
     /**
-     * Prepare the default decisions for the current model.
-     * @param decidedKeys set of tag keys for which the first value should be used
-     * @since 18988
-     */
-    public void prepareDefaultTagDecisions(Set<String> decidedKeys) {
-        for (MultiValueResolutionDecision decision : decisions.values()) {
-            if (!decidedKeys.contains(decision.getKey()))
-                continue;
-            List<String> values = decision.getValues();
-            if (!values.isEmpty()) {
-                decision.keepOne(values.iterator().next());
-            }
-        }
-        rebuild(false);
-    }
-
-    /**
      * Returns the set of keys in conflict.
      * @return the set of keys in conflict.