Changeset 2779 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.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/TagConflictResolver.java (modified) (4 diffs)

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