Changeset 10880 in josm for trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java

Timestamp:

2016-08-23T22:07:06+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13429 - Clean validator tree and use listener to find changes (patch by michael2402) - gsoc-core

File:

• trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java

@@ -41 +41 @@
  */
 public class ValidatorLayer extends Layer implements LayerChangeListener {
-
-    private int updateCount = -1;
+    private final Runnable invalidator = this::invalidate;
 
     /**
@@ -50 +49 @@
         super(tr("Validation errors"));
         Main.getLayerManager().addLayerChangeListener(this);
+        Main.map.validatorDialog.tree.addInvalidationListener(invalidator);
     }
 
@@ -68 +68 @@
     @Override
     public void paint(final Graphics2D g, final MapView mv, Bounds bounds) {
-        updateCount = Main.map.validatorDialog.tree.getUpdateCount();
         DefaultMutableTreeNode root = Main.map.validatorDialog.tree.getRoot();
         if (root == null || root.getChildCount() == 0)
@@ -124 +123 @@
 
     @Override
-    public boolean isChanged() {
-        return updateCount != Main.map.validatorDialog.tree.getUpdateCount();
-    }
-
-    @Override
     public void visitBoundingBox(BoundingXYVisitor v) {
         // Do nothing
@@ -168 +162 @@
             e.scheduleRemoval(Collections.singleton(this));
         } else if (e.getRemovedLayer() == this) {
-            Main.getLayerManager().removeLayerChangeListener(this);
             OsmValidator.errorLayer = null;
         }
@@ -177 +170 @@
         return LayerPositionStrategy.IN_FRONT;
     }
+
+    @Override
+    public void destroy() {
+        Main.map.validatorDialog.tree.removeInvalidationListener(invalidator);
+        Main.getLayerManager().removeLayerChangeListener(this);
+        super.destroy();
+    }
 }