Index: trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 14540)
+++ trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 14542)
@@ -130,6 +130,13 @@
         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);
Index: trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 14540)
+++ trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java	(revision 14542)
@@ -26,4 +26,5 @@
 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,4 +67,13 @@
     @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,5 +83,5 @@
         }
 
-        Collection<OsmPrimitive> selection = getLayerManager().getEditDataSet().getSelected();
+        Collection<OsmPrimitive> selection = ds.getSelected();
 
         List<Node> selectedNodes = OsmPrimitive.getFilteredList(selection, Node.class);
@@ -284,5 +294,5 @@
         List<? extends PrimitiveId> newSel = result.getNewSelection();
         if (newSel != null && !newSel.isEmpty()) {
-            MainApplication.getLayerManager().getEditDataSet().setSelected(newSel);
+            way.getDataSet().setSelected(newSel);
         }
     }