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

Timestamp:

2020-03-15T20:50:44+01:00 (4 years ago)

Author:

simon04

Message:

fix #17683 - LoadAndZoomHandler: retain order of selection

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.concurrent.Future;
@@ -65 +65 @@
 
     // Optional argument 'select'
-    private final Set<SimplePrimitiveId> toSelect = new HashSet<>();
+    private final Set<SimplePrimitiveId> toSelect = new LinkedHashSet<>();
 
     private boolean isKeepingCurrentSelection;
@@ -175 +175 @@
         }
 
-        final Collection<OsmPrimitive> forTagAdd = new HashSet<>();
+        final Collection<OsmPrimitive> forTagAdd = new LinkedHashSet<>();
         final Bounds bbox = new Bounds(minlat, minlon, maxlat, maxlon);
         if (args.containsKey("select") && PermissionPrefWithDefault.CHANGE_SELECTION.isAllowed()) {
             // select objects after downloading, zoom to selection.
             GuiHelper.executeByMainWorkerInEDT(() -> {
-                Set<OsmPrimitive> newSel = new HashSet<>();
+                Set<OsmPrimitive> newSel = new LinkedHashSet<>();
                 DataSet ds = MainApplication.getLayerManager().getEditDataSet();
                 if (ds == null) // e.g. download failed