Index: trunk/test/unit/org/openstreetmap/josm/command/DeleteCommandTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/command/DeleteCommandTest.java	(revision 12726)
+++ trunk/test/unit/org/openstreetmap/josm/command/DeleteCommandTest.java	(revision 12727)
@@ -103,5 +103,5 @@
     @Test
     public void testReferredDelete() {
-        DeleteCommand.deleteWithReferences(testData.layer, Arrays.asList(testData.existingNode), true).executeCommand();
+        DeleteCommand.deleteWithReferences(Arrays.asList(testData.existingNode), true).executeCommand();
 
         assertTrue(testData.existingNode.isDeleted());
@@ -206,5 +206,5 @@
 
     /**
-     * Test {@link DeleteCommand#deleteWaySegment(OsmDataLayer, org.openstreetmap.josm.data.osm.WaySegment)}
+     * Test {@link DeleteCommand#deleteWaySegment(WaySegment)}
      * Way with only 1 segment
      */
@@ -213,5 +213,5 @@
         Way way1 = testData.createWay(100, testData.createNode(101), testData.createNode(102));
         WaySegment ws = new WaySegment(way1, 0);
-        Command command = DeleteCommand.deleteWaySegment(testData.layer, ws);
+        Command command = DeleteCommand.deleteWaySegment(ws);
         command.executeCommand();
 
@@ -220,5 +220,5 @@
 
     /**
-     * Test {@link DeleteCommand#deleteWaySegment(OsmDataLayer, org.openstreetmap.josm.data.osm.WaySegment)}
+     * Test {@link DeleteCommand#deleteWaySegment(WaySegment)}
      * Delete end of way
      */
@@ -228,5 +228,5 @@
                 testData.createNode(204));
         WaySegment ws = new WaySegment(way, 2);
-        Command command = DeleteCommand.deleteWaySegment(testData.layer, ws);
+        Command command = DeleteCommand.deleteWaySegment(ws);
         command.executeCommand();
 
@@ -238,5 +238,5 @@
 
     /**
-     * Test {@link DeleteCommand#deleteWaySegment(OsmDataLayer, org.openstreetmap.josm.data.osm.WaySegment)}
+     * Test {@link DeleteCommand#deleteWaySegment(WaySegment)}
      * Delete start of way
      */
@@ -246,5 +246,5 @@
                 testData.createNode(104));
         WaySegment ws = new WaySegment(way, 0);
-        Command command = DeleteCommand.deleteWaySegment(testData.layer, ws);
+        Command command = DeleteCommand.deleteWaySegment(ws);
         command.executeCommand();
 
@@ -256,5 +256,5 @@
 
     /**
-     * Test {@link DeleteCommand#deleteWaySegment(OsmDataLayer, org.openstreetmap.josm.data.osm.WaySegment)}
+     * Test {@link DeleteCommand#deleteWaySegment(WaySegment)}
      * Delete start of way
      */
@@ -265,5 +265,5 @@
         Way way = testData.createWay(100, testData.createNode(101), testData.createNode(102), node103, node104);
         WaySegment ws = new WaySegment(way, 1);
-        Command command = DeleteCommand.deleteWaySegment(testData.layer, ws);
+        Command command = DeleteCommand.deleteWaySegment(ws);
         command.executeCommand();
 
@@ -280,5 +280,5 @@
 
     /**
-     * Test {@link DeleteCommand#deleteWaySegment(OsmDataLayer, org.openstreetmap.josm.data.osm.WaySegment)}
+     * Test {@link DeleteCommand#deleteWaySegment(WaySegment)}
      * Delete start of way
      */
@@ -289,5 +289,5 @@
                 testData.createNode(104), n);
         WaySegment ws = new WaySegment(way, 2);
-        Command command = DeleteCommand.deleteWaySegment(testData.layer, ws);
+        Command command = DeleteCommand.deleteWaySegment(ws);
         command.executeCommand();
 
Index: trunk/test/unit/org/openstreetmap/josm/command/PurgeCommandTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/command/PurgeCommandTest.java	(revision 12726)
+++ trunk/test/unit/org/openstreetmap/josm/command/PurgeCommandTest.java	(revision 12727)
@@ -62,5 +62,5 @@
         // to check that algorithm ignores it:
         Relation relationParent3 = testData.createRelation(102, new RelationMember("child", testData.existingRelation));
-        PurgeCommand command = new PurgeCommand(testData.layer,
+        PurgeCommand command = new PurgeCommand(testData.layer.data,
                 Arrays.<OsmPrimitive>asList(testData.existingNode, testData.existingNode2, testData.existingWay,
                         testData.existingRelation, relationParent, relationParent2),
@@ -83,5 +83,5 @@
     @Test
     public void testUndo() {
-        PurgeCommand command = new PurgeCommand(testData.layer,
+        PurgeCommand command = new PurgeCommand(testData.layer.data,
                 Arrays.<OsmPrimitive>asList(testData.existingNode, testData.existingWay),
                 Arrays.<OsmPrimitive>asList(testData.existingWay));
@@ -107,5 +107,5 @@
         ArrayList<OsmPrimitive> deleted = new ArrayList<>();
         ArrayList<OsmPrimitive> added = new ArrayList<>();
-        PurgeCommand command = new PurgeCommand(testData.layer, Arrays.<OsmPrimitive>asList(testData.existingNode),
+        PurgeCommand command = new PurgeCommand(testData.layer.data, Arrays.<OsmPrimitive>asList(testData.existingNode),
                 Arrays.<OsmPrimitive>asList(testData.existingRelation));
         command.fillModifiedData(modified, deleted, added);
@@ -121,5 +121,5 @@
     @Test
     public void testGetParticipatingPrimitives() {
-        PurgeCommand command = new PurgeCommand(testData.layer, Arrays.<OsmPrimitive>asList(testData.existingNode),
+        PurgeCommand command = new PurgeCommand(testData.layer.data, Arrays.<OsmPrimitive>asList(testData.existingNode),
                 Arrays.<OsmPrimitive>asList(testData.existingRelation));
         assertArrayEquals(new Object[] {testData.existingNode }, command.getParticipatingPrimitives().toArray());
@@ -132,9 +132,9 @@
     public void testDescription() {
         List<OsmPrimitive> shortList = Arrays.<OsmPrimitive>asList(testData.existingWay);
-        assertTrue(new PurgeCommand(testData.layer, shortList, Arrays.<OsmPrimitive>asList()).getDescriptionText()
+        assertTrue(new PurgeCommand(testData.layer.data, shortList, Arrays.<OsmPrimitive>asList()).getDescriptionText()
                 .matches("Purged 1 object"));
         List<OsmPrimitive> longList = Arrays.<OsmPrimitive>asList(testData.existingNode, testData.existingNode2,
                 testData.existingWay);
-        assertTrue(new PurgeCommand(testData.layer, longList, Arrays.<OsmPrimitive>asList()).getDescriptionText()
+        assertTrue(new PurgeCommand(testData.layer.data, longList, Arrays.<OsmPrimitive>asList()).getDescriptionText()
                 .matches("Purged 3 objects"));
     }