Index: /applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModelTest.groovy
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModelTest.groovy	(revision 32376)
+++ /applications/editors/josm/plugins/turnrestrictions/test/unit/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionListModelTest.groovy	(revision 32377)
@@ -1,21 +1,14 @@
 package org.openstreetmap.josm.plugins.turnrestrictions.editor;
 
-import groovy.util.GroovyTestCase;
+import static org.junit.Assert.*
 
-import org.openstreetmap.josm.gui.MainApplication;
+import javax.swing.DefaultListSelectionModel
+
+import org.junit.*
+import org.openstreetmap.josm.Main
+import org.openstreetmap.josm.data.coor.*
+import org.openstreetmap.josm.data.osm.*
 import org.openstreetmap.josm.gui.layer.OsmDataLayer
-import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import javax.swing.DefaultListSelectionModel;
-import org.openstreetmap.josm.data.osm.*;
-import org.openstreetmap.josm.data.coor.*;
-import org.openstreetmap.josm.JOSMFixture;
-
-import static org.junit.Assert.*;
-import org.junit.*;
-import javax.swing.JFrame;
-
-import junit.framework.TestCase;
-import junit.framework.TestResult;
+import org.openstreetmap.josm.testutils.JOSMTestRules
 
 /**
@@ -23,8 +16,9 @@
  */
 class JosmSelectionListModelTest extends GroovyTestCase {
-    final shouldFail = new GroovyTestCase().&shouldFail
 
     @Rule
     public JOSMTestRules rules = new JOSMTestRules().preferences();
+
+    final shouldFail = new GroovyTestCase().&shouldFail
 
 	@Test
@@ -32,11 +26,11 @@
 		DataSet ds = new DataSet()
 		OsmDataLayer layer = new OsmDataLayer(ds, "test", null)
-		JosmSelectionListModel model = new JosmSelectionListModel(layer);		
-		
+		JosmSelectionListModel model = new JosmSelectionListModel(layer);
+
 		shouldFail(IllegalArgumentException){
 			model = new JosmSelectionListModel(null)
 		}
 	}
-	
+
 	@Test
 	public void test_setJOSMSelection() {
@@ -44,15 +38,15 @@
 		OsmDataLayer layer = new OsmDataLayer(ds, "test", null)
 		JosmSelectionListModel model = new JosmSelectionListModel(layer);
-		
-		// set a selection with three objects 
+
+		// set a selection with three objects
 		def objects = [new Node(new LatLon(1,1)), new Way(), new Relation()]
 		model.setJOSMSelection objects
 		assert model.getSize() == 3
-		
-		// null is allowed 
+
+		// null is allowed
 		model.setJOSMSelection(null)
 		assert model.getSize() == 0
 		assert model.getSelected().isEmpty()
-		
+
 		// empty has the same effect
 		model.setJOSMSelection([])
@@ -60,5 +54,5 @@
 		assert model.getSelected().isEmpty()
 	}
-	
+
 	@Test
 	public void test_setJOSMSelection_withSelected() {
@@ -66,44 +60,44 @@
 		OsmDataLayer layer = new OsmDataLayer(ds, "test", null)
 		JosmSelectionListModel model = new JosmSelectionListModel(layer);
-		def objects = [new Node(new LatLon(1,1)), new Way(), new Relation()]	
+		def objects = [new Node(new LatLon(1,1)), new Way(), new Relation()]
 		model.setJOSMSelection(objects)
 		model.setSelected(objects[0..1])
 		assert model.getSelected().asList() as Set == objects[0..1] as Set
-		
-		// set new selection which includes one object which is currently
+
+        // set new selection which includes one object which is currently
         // selected in the model. Should still be selected after setting
-		// the new JOSM selection
-		objects = objects[1..2] 
+        // the new JOSM selection
+		objects = objects[1..2]
 		model.setJOSMSelection(objects)
 		assert model.getSelected().asList() == [objects[0]]
-	}	
-	
+	}
+
 	@Test
 	public void test_getSelected() {
 		DataSet ds = new DataSet()
 		OsmDataLayer layer = new OsmDataLayer(ds, "test", null)
-		
+
 		JosmSelectionListModel model = new JosmSelectionListModel(layer);
 		DefaultListSelectionModel selectionModel = model.getListSelectionModel()
-		
+
 		assert model.getSelected() != null
 		assert model.getSelected().isEmpty()
-	
-		// select one element 
-		def objects = [new Node(new LatLon(1,1)), new Way(), new Relation()]	
+
+		// select one element
+		def objects = [new Node(new LatLon(1,1)), new Way(), new Relation()]
 		model.setJOSMSelection(objects)
 		selectionModel.setSelectionInterval(0, 0)
 		assert model.getSelected().asList() == [model.getElementAt(0)];
-		
+
 		// select two elements
 		selectionModel.setSelectionInterval(1,2)
 		assert model.getSelected().asList() as Set == [model.getElementAt(1),model.getElementAt(2)] as Set;
 	}
-	
+
 	@Test
 	public void test_setSelected() {
 		DataSet ds = new DataSet()
 		OsmDataLayer layer = new OsmDataLayer(ds, "test", null)
-		
+
 		// set selected with null is OK - nothing selected thereafter
 		JosmSelectionListModel model = new JosmSelectionListModel(layer);
@@ -111,48 +105,53 @@
 		model.setSelected(null)
 		assert model.getSelected().isEmpty()
-		
+
 		// set selected with empty list is OK - nothing selected thereafter
 		model.setSelected([])
 		assert model.getSelected().isEmpty()
-		
-		// select an object existing in the list of displayed objects 
-		def objects = [new Node(new LatLon(1,1)), new Way(), new Relation()]	
+
+		// select an object existing in the list of displayed objects
+		def objects = [new Node(new LatLon(1,1)), new Way(), new Relation()]
 		model.setJOSMSelection(objects)
 		model.setSelected([objects[0]])
 		assert model.getSelected().asList() == [objects[0]];
-		
-		// select an object not-existing in the list of displayed objects 	
+
+		// select an object not-existing in the list of displayed objects
 		model.setJOSMSelection(objects)
 		model.setSelected([new Way()])
 		assert model.getSelected().isEmpty()
 	}
-	
-	@Test 
+
+	@Test
 	public void test_editLayerChanged() {
 		DataSet ds = new DataSet()
-			
-		def objects = [new Node(new LatLon(1,1)), new Way(), new Relation()]	
+
+		def objects = [new Node(new LatLon(1,1)), new Way(), new Relation()]
 		objects.each {ds.addPrimitive(it)}
-		
+
 		OsmDataLayer layer1 = new OsmDataLayer(ds,"layer1", null)
 		OsmDataLayer layer2 = new OsmDataLayer(new DataSet(),"layer2", null)
-		
+
+        Main.getLayerManager().addLayer(layer1)
+        Main.getLayerManager().addLayer(layer2)
+
 		JosmSelectionListModel model = new JosmSelectionListModel(layer1);
 		DefaultListSelectionModel selectionModel = model.getListSelectionModel()
-		// switch from edit layer1 to edit layer2. content of the JOSM selection 
-		// should be empty thereafter 
-		model.editLayerChanged(layer1, layer2)
+		// switch from edit layer1 to edit layer2. content of the JOSM selection
+		// should be empty thereafter
+        Main.getLayerManager().setActiveLayer(layer1)
+        Main.getLayerManager().setActiveLayer(layer2)
 		assert model.getSize() == 0
-		
+
 		// switch from layer2 to layer1 which has one object selected. Object should
-		// be displayed in the JOSM selection list 
+		// be displayed in the JOSM selection list
 		ds.setSelected([objects[0]])
-		model.editLayerChanged(layer2, layer1)
+        Main.getLayerManager().setActiveLayer(layer1)
 		assert model.getSize() == 1
 		assert model.getElementAt(0) == objects[0];
-		
+
 		// switch to a "null" edit layer (i.e. no edit layer)- nothing should
-		// be displayed in the selection list 
-		model.editLayerChanged(layer1, null)
+		// be displayed in the selection list
+        Main.getLayerManager().removeLayer(layer2)
+        Main.getLayerManager().removeLayer(layer1)
 		assert model.getSize() == 0
 	}