Changeset 4672 in josm for trunk

Timestamp:

2011-12-20T22:34:49+01:00 (13 years ago)

Author:

stoecker

Message:

fix #6727 - patch by Kalle Lampila - fix error with deleted objects

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/TestError.java (modified) (2 diffs)
• gui/dialogs/ValidatorDialog.java (modified) (1 diff)

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

@@ -9 +9 @@
 import java.util.List;
 import java.util.TreeSet;
+import java.util.ArrayList;
 
 import org.openstreetmap.josm.command.Command;
@@ -122 +123 @@
 
     /**
+     * Gets the list of primitives affected by this error and are selectable
+     * @return the list of selectable primitives affected by this error
+     */
+    public Collection<? extends OsmPrimitive> getSelectablePrimitives() {
+        List<OsmPrimitive> selectablePrimitives = new ArrayList<OsmPrimitive>(primitives.size());
+        for (OsmPrimitive o : primitives) {
+            if (o.isSelectable()) {
+                selectablePrimitives.add(o);
+            }
+        }
+        return selectablePrimitives;
+    }
+
+
+    /**
      * Sets the list of primitives affected by this error
      * @param primitives the list of primitives affected by this error

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

@@ -329 +329 @@
                 if (nodeInfo instanceof TestError) {
                     TestError error = (TestError) nodeInfo;
-                    sel.addAll(error.getPrimitives());
+                    sel.addAll(error.getSelectablePrimitives());
                 }
             }