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

Timestamp:

2017-06-07T21:59:05+02:00 (7 years ago)

Author:

michael2402

Message:

See #14854: Selection change listeners should not re-add the primitives that are removed to the selection.

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSelectionListener.java (modified) (1 diff)
• DataSet.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java

@@ -230 +230 @@
                 HashSet<OsmPrimitive> currentSet = new LinkedHashSet<>(old);
                 currentSet.removeAll(remove);
-                current = Collections.unmodifiableSet(currentSet);
+                current = currentSet;
             }
         }

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -584 +584 @@
     private void removePrimitiveImpl(OsmPrimitive primitive) {
         clearSelection(primitive.getPrimitiveId());
+        if (primitive.isSelected()) {
+            throw new DataIntegrityProblemException("Primitive was re-selected by a selection listener: " + primitive);
+        }
         super.removePrimitive(primitive);
         allPrimitives.remove(primitive);