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

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"

Location:

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

Files:

• CombinePrimitiveResolverDialog.java (modified) (1 diff)
• TagConflictResolver.java (modified) (4 diffs)
• TagConflictResolverModel.java (modified) (4 diffs)

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

@@ -365 +365 @@
         public void actionPerformed(ActionEvent arg0) {
             setVisible(false);
+            pnlTagConflictResolver.rememberPreferences();
         }
 

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

@@ -30 +30 @@
     /** selects wheter only tags with conflicts are displayed */
     private JCheckBox cbShowTagsWithConflictsOnly;
+    private JCheckBox cbShowTagsWithMultiValuesOnly;
 
     protected JPanel buildInfoPanel() {
@@ -50 +51 @@
                     public void stateChanged(ChangeEvent e) {
                         model.setShowTagsWithConflictsOnly(cbShowTagsWithConflictsOnly.isSelected());
+                        cbShowTagsWithMultiValuesOnly.setEnabled(cbShowTagsWithConflictsOnly.isSelected());
                     }
                 }
@@ -56 +58 @@
                 Main.pref.getBoolean(getClass().getName() + ".showTagsWithConflictsOnly", false)
         );
+        pnl.add(cbShowTagsWithMultiValuesOnly = new JCheckBox(tr("Show tags with multiple values only")), gc);
+        cbShowTagsWithMultiValuesOnly.addChangeListener(
+                new ChangeListener() {
+                    public void stateChanged(ChangeEvent e) {
+                        model.setShowTagsWithMultiValuesOnly(cbShowTagsWithMultiValuesOnly.isSelected());
+                    }
+                }
+        );
+        cbShowTagsWithMultiValuesOnly.setSelected(
+                Main.pref.getBoolean(getClass().getName() + ".showTagsWithMultiValuesOnly", false)
+        );
+        cbShowTagsWithMultiValuesOnly.setEnabled(cbShowTagsWithConflictsOnly.isSelected());
         return pnl;
     }
@@ -65 +79 @@
     public void rememberPreferences() {
         Main.pref.put(getClass().getName() + ".showTagsWithConflictsOnly", cbShowTagsWithConflictsOnly.isSelected());
+        Main.pref.put(getClass().getName() + ".showTagsWithMultiValuesOnly", cbShowTagsWithMultiValuesOnly.isSelected());
     }
 

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();
     }