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

Timestamp:

2014-01-29T20:40:26+01:00 (10 years ago)

Author:

simon04

Message:

see #9104 - Do not suggest to combine conflicting values in order to reduce the wrong usage of semicolon values

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/tags

Files:

• CombinePrimitiveResolverDialog.java (modified) (1 diff)
• TagConflictResolverModel.java (modified) (2 diffs)

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

@@ -282 +282 @@
     protected void prepareDefaultTagDecisions() {
         TagConflictResolverModel model = getTagConflictResolverModel();
-        for (int i = 0; i < model.getRowCount(); i++) {
-            MultiValueResolutionDecision decision = model.getDecision(i);
-            List<String> values = decision.getValues();
-            values.remove("");
-            if (values.size() == 1) {
-                decision.keepOne(values.get(0));
-            } else {
-                decision.keepAll();
-            }
-        }
+        model.prepareDefaultTagDecisions();
         model.rebuild();
     }

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

@@ -258 +258 @@
      */
     public void prepareDefaultTagDecisions() {
+        // Do not suggest to keep all values in order to reduce the wrong usage of semicolon values, see #9104!
+        // Do not suggest to keep the single value in order to avoid long highways to become tunnels+bridges+...
+
+        /*
         for (MultiValueResolutionDecision decision: decisions.values()) {
             List<String> values = decision.getValues();
@@ -267 +271 @@
             }
         }
+        */
         rebuild();
     }