Changeset 12113 in josm for trunk/src/org

Timestamp:

2017-05-11T01:26:34+02:00 (8 years ago)

Author:

michael2402

Message:

See #13467: Preserve order of removed / added fields for selection events.

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java (modified) (5 diffs)

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

@@ -133 +133 @@
         public SelectionReplaceEvent(DataSet source, Set<OsmPrimitive> old, Stream<OsmPrimitive> newSelection) {
             super(source, old);
-            this.current = newSelection.collect(Collectors.toSet());
+            this.current = newSelection.collect(Collectors.toCollection(LinkedHashSet::new));
         }
 
@@ -144 +144 @@
         public synchronized Set<OsmPrimitive> getRemoved() {
             if (removed == null) {
-                removed = getOldSelection().stream().filter(p -> !current.contains(p)).collect(Collectors.toSet());
+                removed = getOldSelection().stream()
+                        .filter(p -> !current.contains(p))
+                        .collect(Collectors.toCollection(LinkedHashSet::new));
             }
             return removed;
@@ -152 +154 @@
         public synchronized Set<OsmPrimitive> getAdded() {
             if (added == null) {
-                added = current.stream().filter(p -> !getOldSelection().contains(p)).collect(Collectors.toSet());
+                added = current.stream()
+                        .filter(p -> !getOldSelection().contains(p)).collect(Collectors.toCollection(LinkedHashSet::new));
             }
             return added;
@@ -175 +178 @@
         public SelectionAddEvent(DataSet source, Set<OsmPrimitive> old, Stream<OsmPrimitive> toAdd) {
             super(source, old);
-            this.add = toAdd.filter(p -> !old.contains(p)).collect(Collectors.toSet());
+            this.add = toAdd
+                    .filter(p -> !old.contains(p))
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
             if (this.add.isEmpty()) {
                 this.current = this.getOldSelection();
@@ -217 +222 @@
         public SelectionRemoveEvent(DataSet source, Set<OsmPrimitive> old, Stream<OsmPrimitive> toRemove) {
             super(source, old);
-            this.remove = toRemove.filter(old::contains).collect(Collectors.toSet());
+            this.remove = toRemove
+                    .filter(old::contains)
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
             if (this.remove.isEmpty()) {
                 this.current = this.getOldSelection();