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

Timestamp:

2016-11-11T15:22:10+01:00 (7 years ago)

Author:

bastiK

Message:

applied #13948 - Validator seems to hang in last executed test (patch by Gerd Petermann)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/TestError.java (modified) (4 diffs)
• gui/dialogs/validator/ValidatorTreePanel.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -12 +12 @@
 import java.util.function.Supplier;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
@@ -19 +18 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
-import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
-import org.openstreetmap.josm.data.osm.event.DataSetListener;
-import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
-import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
-import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
-import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
-import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
-import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
 import org.openstreetmap.josm.tools.AlphanumComparator;
@@ -37 +27 @@
  * @since 3669
  */
-public class TestError implements Comparable<TestError>, DataSetListener {
+public class TestError implements Comparable<TestError> {
     /** is this error on the ignore list */
     private boolean ignored;
@@ -584 +574 @@
     }
 
-    @Override public void primitivesRemoved(PrimitivesRemovedEvent event) {
-        // Remove purged primitives (fix #8639)
-        try {
-            primitives.removeAll(event.getPrimitives());
-        } catch (UnsupportedOperationException e) {
-            if (event.getPrimitives().containsAll(primitives)) {
-                primitives = Collections.emptyList();
-            } else {
-                Main.warn(e, "Unable to remove primitives from "+this+'.');
-            }
-        }
-    }
-
-    @Override public void primitivesAdded(PrimitivesAddedEvent event) {
-        // Do nothing
-    }
-
-    @Override public void tagsChanged(TagsChangedEvent event) {
-        // Do nothing
-    }
-
-    @Override public void nodeMoved(NodeMovedEvent event) {
-        // Do nothing
-    }
-
-    @Override public void wayNodesChanged(WayNodesChangedEvent event) {
-        // Do nothing
-    }
-
-    @Override public void relationMembersChanged(RelationMembersChangedEvent event) {
-        // Do nothing
-    }
-
-    @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) {
-        // Do nothing
-    }
-
-    @Override public void dataChanged(DataChangedEvent event) {
-        // Do nothing
-    }
-
     @Override
     public String toString() {

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
+import org.openstreetmap.josm.data.osm.event.DataSetListener;
+import org.openstreetmap.josm.data.osm.event.NodeMovedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent;
+import org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent;
+import org.openstreetmap.josm.data.osm.event.RelationMembersChangedEvent;
+import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
+import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.TestError;
@@ -46 +55 @@
  * @author frsantos
  */
-public class ValidatorTreePanel extends JTree implements Destroyable {
+public class ValidatorTreePanel extends JTree implements Destroyable, DataSetListener {
 
     private static final class GroupTreeNode extends DefaultMutableTreeNode {
@@ -95 +104 @@
                 removeKeyListener(keyListener);
             }
+        }
+        DataSet ds = Main.getLayerManager().getEditDataSet();
+        if (ds != null) {
+            ds.addDataSetListener(this);
         }
     }
@@ -303 +316 @@
             return;
         clearErrors();
-        DataSet ds = Main.getLayerManager().getEditDataSet();
         for (TestError error : newerrors) {
             if (!error.isIgnored()) {
                 errors.add(error);
-                if (ds != null) {
-                    ds.addDataSetListener(error);
-                }
             }
         }
@@ -414 +423 @@
     private void clearErrors() {
         if (errors != null) {
-            DataSet ds = Main.getLayerManager().getEditDataSet();
-            if (ds != null) {
-                for (TestError e : errors) {
-                    ds.removeDataSetListener(e);
-                }
-            }
             errors.clear();
         }
@@ -426 +429 @@
     @Override
     public void destroy() {
+        DataSet ds = Main.getLayerManager().getEditDataSet();
+        if (ds != null) {
+            ds.removeDataSetListener(this);
+        }
         clearErrors();
     }
+
+    @Override public void primitivesRemoved(PrimitivesRemovedEvent event) {
+        // Remove purged primitives (fix #8639)
+        for (TestError err : errors) {
+            try {
+                err.getPrimitives().removeAll(event.getPrimitives());
+            } catch (UnsupportedOperationException e) {
+                if (event.getPrimitives().containsAll(err.getPrimitives())) {
+                    err.getPrimitives().clear();
+                } else {
+                    Main.warn(e, "Unable to remove primitives from "+err+'.');
+                }
+            }
+        }
+    }
+
+    @Override public void primitivesAdded(PrimitivesAddedEvent event) {
+        // Do nothing
+    }
+
+    @Override public void tagsChanged(TagsChangedEvent event) {
+        // Do nothing
+    }
+
+    @Override public void nodeMoved(NodeMovedEvent event) {
+        // Do nothing
+    }
+
+    @Override public void wayNodesChanged(WayNodesChangedEvent event) {
+        // Do nothing
+    }
+
+    @Override public void relationMembersChanged(RelationMembersChangedEvent event) {
+        // Do nothing
+    }
+
+    @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) {
+        // Do nothing
+    }
+
+    @Override public void dataChanged(DataChangedEvent event) {
+        // Do nothing
+    }
 }