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

Timestamp:

2018-12-09T23:58:32+01:00 (6 years ago)

Author:

Don-vip

Message:

see #17040 - fix unit tests

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CreateCircleAction.java (modified) (1 diff)
• SplitWayAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

@@ -130 +130 @@
         if (!isEnabled())
             return;
-
-        DataSet ds = getLayerManager().getEditDataSet();
+        runOn(getLayerManager().getEditDataSet());
+    }
+
+    /**
+     * Run the action on the given dataset.
+     * @param ds dataset
+     * @since 14542
+     */
+    public static void runOn(DataSet ds) {
         Collection<OsmPrimitive> sel = ds.getSelected();
         List<Node> nodes = OsmPrimitive.getFilteredList(sel, Node.class);

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -26 +26 @@
 import org.openstreetmap.josm.command.SplitWayCommand;
 import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.Node;
@@ -66 +67 @@
     @Override
     public void actionPerformed(ActionEvent e) {
+        runOn(getLayerManager().getEditDataSet());
+    }
+
+    /**
+     * Run the action on the given dataset.
+     * @param ds dataset
+     * @since 14542
+     */
+    public static void runOn(DataSet ds) {
 
         if (SegmentToKeepSelectionDialog.DISPLAY_COUNT.get() > 0) {
@@ -73 +83 @@
         }
 
-        Collection<OsmPrimitive> selection = getLayerManager().getEditDataSet().getSelected();
+        Collection<OsmPrimitive> selection = ds.getSelected();
 
         List<Node> selectedNodes = OsmPrimitive.getFilteredList(selection, Node.class);
@@ -284 +294 @@
         List<? extends PrimitiveId> newSel = result.getNewSelection();
         if (newSel != null && !newSel.isEmpty()) {
-            MainApplication.getLayerManager().getEditDataSet().setSelected(newSel);
+            way.getDataSet().setSelected(newSel);
         }
     }