Changeset 12349 in josm for trunk/src

Timestamp:

2017-06-08T23:50:37+02:00 (7 years ago)

Author:

michael2402

Message:

Fix SelectCommand triggering a critical error when it is undone after the edit layer was changed.

File:

• trunk/src/org/openstreetmap/josm/command/SelectCommand.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/command/SelectCommand.java

@@ -9 +9 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
@@ -37 +37 @@
     }
 
+    /**
+     * Constructs a new select command.
+     * @param dataset The dataset the selection belongs to
+     * @param newSelection the primitives to select when executing the command.
+     * @since 12349
+     */
+    public SelectCommand(DataSet dataset, Collection<OsmPrimitive> newSelection) {
+        super(dataset);
+        if (newSelection == null || newSelection.isEmpty()) {
+            this.newSelection = Collections.emptySet();
+        } else {
+            this.newSelection = new HashSet<>(newSelection);
+        }
+    }
+
     @Override
     public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
@@ -44 +59 @@
     @Override
     public void undoCommand() {
-        Main.getLayerManager().getEditLayer().data.setSelected(oldSelection);
+        getAffectedDataSet().setSelected(oldSelection);
     }
 
     @Override
     public boolean executeCommand() {
-        oldSelection = Main.getLayerManager().getEditLayer().data.getSelected();
-        Main.getLayerManager().getEditLayer().data.setSelected(newSelection);
+        oldSelection = getAffectedDataSet().getSelected();
+        getAffectedDataSet().setSelected(newSelection);
         return true;
     }