Changeset 14847 in josm for trunk/src/org

Timestamp:

2019-03-06T12:08:32+01:00 (6 years ago)

Author:

GerdP

Message:

fix #17343 and #17344: Enable/Disable buttons in ValidatorDialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java (modified) (18 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -27 +27 @@
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 
@@ -42 +41 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataSetListenerAdapter;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -77 +80 @@
  * @author frsantos
  */
-public class ValidatorDialog extends ToggleDialog implements DataSelectionListener, ActiveLayerChangeListener {
+public class ValidatorDialog extends ToggleDialog
+        implements DataSelectionListener, ActiveLayerChangeListener, DataSetListenerAdapter.Listener {
 
     /** The display tree */
@@ -85 +89 @@
     public static final ValidateAction validateAction = new ValidateAction();
 
-    /** The fix button */
-    private final SideButton fixButton;
-    /** The ignore button */
-    private final SideButton ignoreButton;
-    /** The reset ignorelist button */
-    private final SideButton ignorelistManagement;
-    /** The select button */
-    private final SideButton selectButton;
-    /** The lookup button */
-    private final SideButton lookupButton;
+    /** The fix action */
+    private final transient Action fixAction;
+    /** The ignore action */
+    private final transient Action ignoreAction;
+    /** The ignore-list management action */
+    private final transient Action ignorelistManagementAction;
+    /** The select action */
+    private final transient Action selectAction;
+    /** The lookup action */
+    private final transient LookupAction lookupAction;
 
     private final JPopupMenu popupMenu = new JPopupMenu();
     private final transient PopupMenuHandler popupMenuHandler = new PopupMenuHandler(popupMenu);
+    private final transient DataSetListenerAdapter dataChangedAdapter = new DataSetListenerAdapter(this);
 
     /** Last selected element */
@@ -120 +125 @@
         List<SideButton> buttons = new LinkedList<>();
 
-        selectButton = new SideButton(new AbstractSelectAction() {
+        selectAction = new AbstractSelectAction() {
             @Override
             public void actionPerformed(ActionEvent e) {
                 setSelectedItems();
             }
-        });
-        InputMapUtils.addEnterAction(tree, selectButton.getAction());
-
-        selectButton.setEnabled(false);
-        buttons.add(selectButton);
-
-        lookupButton = new SideButton(new LookupAction());
-        buttons.add(lookupButton);
+        };
+        selectAction.setEnabled(false);
+        InputMapUtils.addEnterAction(tree, selectAction);
+        buttons.add(new SideButton(selectAction));
+
+        lookupAction = new LookupAction();
+        buttons.add(new SideButton(lookupAction));
 
         buttons.add(new SideButton(validateAction));
 
-        fixButton = new SideButton(new AbstractAction() {
+        fixAction = new AbstractAction() {
             {
                 putValue(NAME, tr("Fix"));
@@ -146 +150 @@
                 fixErrors();
             }
-        });
-        fixButton.setEnabled(false);
-        buttons.add(fixButton);
+        };
+        fixAction.setEnabled(false);
+        buttons.add(new SideButton(fixAction));
 
         if (ValidatorPrefHelper.PREF_USE_IGNORE.get()) {
-            ignoreButton = new SideButton(new AbstractAction() {
+            ignoreAction = new AbstractAction() {
                 {
                     putValue(NAME, tr("Ignore"));
@@ -161 +165 @@
                     ignoreErrors();
                 }
-            });
-            ignoreButton.setEnabled(false);
-            buttons.add(ignoreButton);
-
-            ignorelistManagement = new SideButton(new AbstractAction() {
-                {
-                    putValue(NAME, tr("Manage Ignore"));
-                    putValue(SHORT_DESCRIPTION, tr("Manage the ignore list"));
-                    new ImageProvider("dialogs", "fix").getResource().attachImageIcon(this, true);
-                }
-
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                    new ValidatorListManagementDialog("Ignore");
-                }
-            });
-            buttons.add(ignorelistManagement);
+            };
+            ignoreAction.setEnabled(false);
+            buttons.add(new SideButton(ignoreAction));
+
+            ignorelistManagementAction = new IgnorelistManagementAction();
+            buttons.add(new SideButton(ignorelistManagementAction));
         } else {
-            ignoreButton = null;
-            ignorelistManagement = null;
+            ignoreAction = null;
+            ignorelistManagementAction = null;
         }
 
@@ -187 +180 @@
 
     /**
+     * The action to manage the ignore list.
+     */
+    static class IgnorelistManagementAction extends AbstractAction {
+        IgnorelistManagementAction() {
+            putValue(NAME, tr("Manage Ignore"));
+            putValue(SHORT_DESCRIPTION, tr("Manage the ignore list"));
+            new ImageProvider("dialogs", "fix").getResource().attachImageIcon(this, true);
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            new ValidatorListManagementDialog("Ignore");
+        }
+    }
+
+    /**
      * The action to lookup the selection in the error tree.
      */
-    class LookupAction extends AbstractAction implements DataSelectionListener {
-
+    class LookupAction extends AbstractAction {
         LookupAction() {
             putValue(NAME, tr("Lookup"));
             putValue(SHORT_DESCRIPTION, tr("Looks up the selected primitives in the error list."));
             new ImageProvider("dialogs", "search").getResource().attachImageIcon(this, true);
-            SelectionEventManager.getInstance().addSelectionListener(this);
             updateEnabledState();
         }
@@ -208 +215 @@
         }
 
-        protected void updateEnabledState() {
+        public void updateEnabledState() {
             boolean found = false;
             for (TestError e : tree.getErrors()) {
@@ -220 +227 @@
             setEnabled(found);
         }
-
-        @Override
-        public void selectionChanged(SelectionChangeEvent event) {
-            updateEnabledState();
-        }
     }
 
     @Override
     public void showNotify() {
+        DatasetEventManager.getInstance().addDatasetListener(dataChangedAdapter, FireMode.IN_EDT_CONSOLIDATED);
         SelectionEventManager.getInstance().addSelectionListener(this);
         DataSet ds = MainApplication.getLayerManager().getActiveDataSet();
@@ -235 +238 @@
         }
         MainApplication.getLayerManager().addAndFireActiveLayerChangeListener(this);
+
     }
 
     @Override
     public void hideNotify() {
+        DatasetEventManager.getInstance().removeDatasetListener(dataChangedAdapter);
         MainApplication.getLayerManager().removeActiveLayerChangeListener(this);
         SelectionEventManager.getInstance().removeSelectionListener(this);
@@ -349 +354 @@
         for (TreePath path : selectedPaths) {
             DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent();
-            Enumeration<TreeNode> children = node.breadthFirstEnumeration();
+            Enumeration<?> children = node.breadthFirstEnumeration();
             while (children.hasMoreElements()) {
                 DefaultMutableTreeNode childNode = (DefaultMutableTreeNode) children.nextElement();
@@ -394 +399 @@
                 }
             });
-            selectButton.setEnabled(true);
-            if (ignoreButton != null) {
-                ignoreButton.setEnabled(node.getDepth() <= 1);
+            selectAction.setEnabled(true);
+            if (ignoreAction != null) {
+                ignoreAction.setEnabled(node.getDepth() <= 1);
             }
         }
@@ -472 +477 @@
             }
 
-            fixButton.setEnabled(false);
-            if (ignoreButton != null) {
-                ignoreButton.setEnabled(false);
-            }
-            selectButton.setEnabled(false);
+            fixAction.setEnabled(false);
+            if (ignoreAction != null) {
+                ignoreAction.setEnabled(false);
+            }
+            selectAction.setEnabled(false);
 
             boolean isDblClick = isDoubleClick(e);
@@ -483 +488 @@
 
             boolean hasFixes = setSelection(sel, isDblClick);
-            fixButton.setEnabled(hasFixes);
+            fixAction.setEnabled(hasFixes);
 
             if (isDblClick) {
@@ -514 +519 @@
         @Override
         public void valueChanged(TreeSelectionEvent e) {
-            fixButton.setEnabled(false);
-            if (ignoreButton != null) {
-                ignoreButton.setEnabled(false);
-            }
-            selectButton.setEnabled(false);
+            if (ignoreAction != null) {
+                ignoreAction.setEnabled(false);
+            }
+            selectAction.setEnabled(false);
 
             Collection<OsmPrimitive> sel = new HashSet<>();
             boolean hasFixes = setSelection(sel, true);
-            fixButton.setEnabled(hasFixes);
+            fixAction.setEnabled(hasFixes);
             popupMenuHandler.setPrimitives(sel);
             invalidateValidatorLayers();
@@ -578 +582 @@
     public void selectionChanged(SelectionChangeEvent event) {
         updateSelection(event.getSelection());
+        lookupAction.updateEnabledState();
     }
 
@@ -682 +687 @@
 
     @Override
-    public void destroy() {
-        if (lookupButton != null && lookupButton.getAction() instanceof DataSelectionListener) {
-            Action a = lookupButton.getAction();
-            SelectionEventManager.getInstance().removeSelectionListener((DataSelectionListener) a);
-        }
-        super.destroy();
+    public void processDatasetEvent(AbstractDatasetChangedEvent event) {
+        validateAction.updateEnabledState();
     }