Changeset 13149 in josm for trunk/src

Timestamp:

2017-11-23T01:19:28+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #10542 - fix broken layer invalidation when selection changes in validator dialog

File:

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

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

@@ -45 +45 @@
 import org.openstreetmap.josm.data.validation.ValidatorVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.PopupMenuHandler;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.validator.ValidatorTreePanel;
-import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
@@ -320 +318 @@
             tree.resetErrors();
             OsmValidator.saveIgnoredErrors();
-            MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(Layer::invalidate);
+            invalidateValidatorLayers();
         }
     }
@@ -477 +475 @@
         @Override
         public void mouseClicked(MouseEvent e) {
+            TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
+            if (selPath == null) {
+                tree.clearSelection();
+            }
+
             fixButton.setEnabled(false);
             if (ignoreButton != null) {
@@ -501 +504 @@
         }
 
-        @Override public void launch(MouseEvent e) {
+        @Override
+        public void launch(MouseEvent e) {
             TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
             if (selPath == null)
@@ -510 +514 @@
             super.launch(e);
         }
-
     }
 
@@ -529 +532 @@
             fixButton.setEnabled(hasFixes);
             popupMenuHandler.setPrimitives(sel);
-            MapFrame map = MainApplication.getMap();
-            if (map != null) {
-                map.repaint();
-            }
+            invalidateValidatorLayers();
         }
     }
@@ -648 +648 @@
                 SwingUtilities.invokeAndWait(() -> {
                     MainApplication.undoRedo.afterAdd();
-                    MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate);
+                    invalidateValidatorLayers();
                     tree.resetErrors();
                 });
@@ -659 +659 @@
         }
     }
+
+    private static void invalidateValidatorLayers() {
+        MainApplication.getLayerManager().getLayersOfType(ValidatorLayer.class).forEach(ValidatorLayer::invalidate);
+    }
 }