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

Timestamp:

2010-01-08T22:15:11+01:00 (14 years ago)

Author:

mjulius

Message:

fixes #4253 - Combine way conflict dialog - check box for "Show tags with multiple values only"

File:

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

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

@@ -28 +28 @@
     private PropertyChangeSupport support;
     private boolean showTagsWithConflictsOnly = false;
+    private boolean showTagsWithMultiValuesOnly = false;
 
     public TagConflictResolverModel() {
@@ -91 +92 @@
         if (showTagsWithConflictsOnly) {
             keys.retainAll(keysWithConflicts);
+            if (showTagsWithMultiValuesOnly) {
+                Set<String> keysWithMultiValues = new HashSet<String>();
+                for (String key: keys) {
+                    if (decisions.get(key).canKeepAll()) {
+                        keysWithMultiValues.add(key);
+                    }
+                }
+                keys.retainAll(keysWithMultiValues);
+            }
             for (String key: tags.getKeys()) {
                 if (!decisions.get(key).isDecided() && !keys.contains(key)) {
@@ -144 +154 @@
             MultiValueDecisionType type = (MultiValueDecisionType)value;
             switch(type) {
-                case KEEP_NONE:
-                    decision.keepNone();
-                    break;
-                case KEEP_ALL:
-                    decision.keepAll();
-                    break;
+            case KEEP_NONE:
+                decision.keepNone();
+                break;
+            case KEEP_ALL:
+                decision.keepAll();
+                break;
             }
         }
@@ -193 +203 @@
     public void setShowTagsWithConflictsOnly(boolean showTagsWithConflictsOnly) {
         this.showTagsWithConflictsOnly = showTagsWithConflictsOnly;
+        rebuild();
+    }
+
+    /**
+     * Sets whether all conflicts or only conflicts with multiple values are displayed
+     *
+     * @param showTagsWithMultiValuesOnly if true, only tags with multiple values are displayed
+     */
+    public void setShowTagsWithMultiValuesOnly(boolean showTagsWithMultiValuesOnly) {
+        this.showTagsWithMultiValuesOnly = showTagsWithMultiValuesOnly;
         rebuild();
     }