Changeset 5911 in josm for trunk

Timestamp:

2013-04-29T01:29:55+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8639 - Handle purged primitives in validator errors

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/TestError.java (modified) (4 diffs)
• data/validation/util/MultipleNameVisitor.java (modified) (2 diffs)
• gui/dialogs/validator/ValidatorTreePanel.java (modified) (5 diffs)

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

@@ -8 +8 @@
 import java.util.TreeSet;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.Node;
@@ -14 +15 @@
 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;
 
@@ -20 +30 @@
  * @author frsantos
  */
-public class TestError implements Comparable<TestError> {
+public class TestError implements Comparable<TestError>, DataSetListener {
     /** is this error on the ignore list */
     private Boolean ignored = false;
@@ -290 +300 @@
         return v1.toString().compareToIgnoreCase(v2.toString());
     }
+
+    @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("Unable to remove primitives from "+this);
+            }
+        }
+    }
+
+    @Override public void primitivesAdded(PrimitivesAddedEvent event) {}
+    @Override public void tagsChanged(TagsChangedEvent event) {}
+    @Override public void nodeMoved(NodeMovedEvent event) {}
+    @Override public void wayNodesChanged(WayNodesChangedEvent event) {}
+    @Override public void relationMembersChanged(RelationMembersChangedEvent event) {}
+    @Override public void otherDatasetChange(AbstractDatasetChangedEvent event) {}
+    @Override public void dataChanged(DataChangedEvent event) {}
+
+    @Override
+    public String toString() {
+        return "TestError [tester=" + tester + ", code=" + code + "]";
+    }
 }

trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java

@@ -60 +60 @@
         }
 
-        if (size == 1) {
+        if (size <= 1) {
             displayName = name;
         } else {
@@ -92 +92 @@
      */
     public Icon getIcon() {
-        if (size == 1)
+        if (size <= 1)
             return icon;
         else

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

@@ -22 +22 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.validation.Severity;
@@ -27 +28 @@
 import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
 import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
+import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.MultiMap;
 
@@ -36 +38 @@
  * @author frsantos
  */
-public class ValidatorTreePanel extends JTree {
+public class ValidatorTreePanel extends JTree implements Destroyable {
     /** Serializable ID */
     private static final long serialVersionUID = 2952292777351992696L;
@@ -294 +296 @@
         if (errors == null)
             return;
-        errors.clear();
+        clearErrors();
+        DataSet ds = Main.main.getCurrentDataSet();
         for (TestError error : newerrors) {
             if (!error.getIgnored()) {
                 errors.add(error);
+                if (ds != null) {
+                    ds.addDataSetListener(error);
+                }
             }
         }
@@ -374 +380 @@
         return updateCount;
     }
+    
+    private void clearErrors() {
+        if (errors != null) {
+            DataSet ds = Main.main.getCurrentDataSet();
+            if (ds != null) {
+                for (TestError e : errors) {
+                    ds.removeDataSetListener(e);
+                }
+            }
+            errors.clear();
+        }
+    }
+
+    @Override
+    public void destroy() {
+        clearErrors();
+    }
 }