Changeset 10467 in josm for trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

Timestamp:

2016-06-24T00:30:42+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13037 - Small fixes for unit tests (patch by michael2402) - gsoc-core

File:

• trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java

@@ -74 +74 @@
      */
     public synchronized void add(final Command c) {
-        DataSet ds = Main.getLayerManager().getEditDataSet();
-        Collection<? extends OsmPrimitive> oldSelection = ds.getSelected();
+        DataSet ds = c.getAffectedDataSet();
+        if (ds == null) {
+            // old, legacy behaviour
+            ds = Main.getLayerManager().getEditDataSet();
+        }
+        Collection<? extends OsmPrimitive> oldSelection = null;
+        if (ds != null) {
+            oldSelection = ds.getSelected();
+        }
         addNoRedraw(c);
         afterAdd();
 
         // the command may have changed the selection so tell the listeners about the current situation
-        fireIfSelectionChanged(ds, oldSelection);
+        if (ds != null) {
+            fireIfSelectionChanged(ds, oldSelection);
+        }
     }