Index: /trunk/src/org/openstreetmap/josm/actions/DeleteLayerAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/DeleteLayerAction.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/actions/DeleteLayerAction.java	(revision 10436)
@@ -37,5 +37,5 @@
             return;
         }
-        Main.main.removeLayer(activeLayer);
+        Main.getLayerManager().removeLayer(activeLayer);
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/actions/MapRectifierWMSmenuAction.java	(revision 10436)
@@ -234,5 +234,5 @@
     private static void addWMSLayer(String title, String url) {
         WMSLayer layer = new WMSLayer(new ImageryInfo(title, url));
-        Main.main.addLayer(layer);
+        Main.getLayerManager().addLayer(layer);
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java	(revision 10436)
@@ -57,5 +57,5 @@
                             @Override
                             public void run() {
-                                Main.main.removeLayer(sourceLayer);
+                                Main.getLayerManager().removeLayer(sourceLayer);
                             }
                         });
Index: /trunk/src/org/openstreetmap/josm/actions/NewAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/NewAction.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/actions/NewAction.java	(revision 10436)
@@ -30,5 +30,5 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Main.main.addLayer(new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null));
+        Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null));
     }
 }
Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java	(revision 10436)
@@ -117,5 +117,5 @@
                 noteLayers.get(0).getNoteData().addNotes(notesData);
             } else {
-                Main.main.addLayer(new NoteLayer(notesData, tr("Notes")));
+                Main.getLayerManager().addLayer(new NoteLayer(notesData, tr("Notes")));
             }
         }
Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java	(revision 10436)
@@ -261,5 +261,5 @@
                 final OsmDataLayer layer = createNewLayer(newLayerName);
                 if (Main.main != null)
-                    Main.main.addLayer(layer);
+                    Main.getLayerManager().addLayer(layer);
                 return layer;
             }
Index: /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTaskList.java	(revision 10436)
@@ -72,5 +72,5 @@
         if (newLayer) {
             Layer l = new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null);
-            Main.main.addLayer(l);
+            Main.getLayerManager().addLayer(l);
             Main.getLayerManager().setActiveLayer(l);
         }
Index: /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java	(revision 10436)
@@ -222,5 +222,5 @@
         if (errorLayer == null) {
             errorLayer = new ValidatorLayer();
-            Main.main.addLayer(errorLayer);
+            Main.getLayerManager().addLayer(errorLayer);
         }
     }
@@ -367,5 +367,5 @@
         if (e.getSource().getLayersOfType(OsmDataLayer.class).isEmpty()) {
             if (errorLayer != null) {
-                Main.main.removeLayer(errorLayer);
+                Main.getLayerManager().removeLayer(errorLayer);
             }
         }
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DeleteLayerAction.java	(revision 10436)
@@ -46,5 +46,5 @@
             return;
         for (Layer l: selectedLayers) {
-            Main.main.removeLayer(l);
+            Main.getLayerManager().removeLayer(l);
         }
     }
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/layer/DuplicateAction.java	(revision 10436)
@@ -70,5 +70,5 @@
                 i++;
             }
-            Main.main.addLayer(new OsmDataLayer(new DataSet(oldLayer.data), newName, null));
+            Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(oldLayer.data), newName, null));
         }
     }
Index: /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java	(revision 10436)
@@ -131,5 +131,5 @@
         OsmDataLayer layer = Main.getLayerManager().getEditLayer();
         if (layer == null || this.newLayer)
-            Main.main.addLayer(tmpLayer);
+            Main.getLayerManager().addLayer(tmpLayer);
         else
             layer.mergeFrom(tmpLayer);
Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 10436)
@@ -821,9 +821,9 @@
                 gpxLayer.setAssociatedFile(new File(getAssociatedFile().getParentFile(), filename));
             }
-            Main.main.addLayer(gpxLayer);
+            Main.getLayerManager().addLayer(gpxLayer);
             if (Main.pref.getBoolean("marker.makeautomarkers", true) && !gpxData.waypoints.isEmpty()) {
-                Main.main.addLayer(new MarkerLayer(gpxData, tr("Converted from: {0}", getName()), null, gpxLayer));
-            }
-            Main.main.removeLayer(OsmDataLayer.this);
+                Main.getLayerManager().addLayer(new MarkerLayer(gpxData, tr("Converted from: {0}", getName()), null, gpxLayer));
+            }
+            Main.getLayerManager().removeLayer(OsmDataLayer.this);
         }
     }
Index: /trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java	(revision 10436)
@@ -164,5 +164,5 @@
     public void layerRemoving(LayerRemoveEvent e) {
         if (e.getRemovedLayer() instanceof OsmDataLayer && Main.isDisplayingMapView() && !Main.main.hasEditLayer()) {
-            Main.main.removeLayer(this);
+            Main.getLayerManager().removeLayer(this);
         } else if (e.getRemovedLayer() == this) {
             Main.getLayerManager().removeLayerChangeListener(this);
Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java	(revision 10436)
@@ -283,5 +283,5 @@
             }
             if (layer != null) {
-                Main.main.addLayer(layer);
+                Main.getLayerManager().addLayer(layer);
 
                 if (!canceled && layer.data != null && !layer.data.isEmpty()) {
Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java	(revision 10436)
@@ -135,6 +135,6 @@
         }
         layer.setUploadDiscouraged(true);
-        Main.main.addLayer(layer);
-        Main.main.removeLayer(this.layer);
+        Main.getLayerManager().addLayer(layer);
+        Main.getLayerManager().removeLayer(this.layer);
     }
 }
Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java	(revision 10436)
@@ -115,5 +115,5 @@
                 importAudio(file, ml, firstStartTime, m);
             }
-            Main.main.addLayer(ml);
+            Main.getLayerManager().addLayer(ml);
             Main.map.repaint();
         }
Index: /trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/gpx/MarkersFromNamedPointsAction.java	(revision 10436)
@@ -41,5 +41,5 @@
         MarkerLayer ml = new MarkerLayer(namedTrackPoints, tr("Named Trackpoints from {0}", layer.getName()), layer.getAssociatedFile(), layer);
         if (!ml.data.isEmpty()) {
-            Main.main.addLayer(ml);
+            Main.getLayerManager().addLayer(ml);
         }
     }
Index: /trunk/src/org/openstreetmap/josm/io/GpxImporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GpxImporter.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/io/GpxImporter.java	(revision 10436)
@@ -121,8 +121,8 @@
             public void run() {
                 if (data.markerLayer != null) {
-                    Main.main.addLayer(data.markerLayer);
+                    Main.getLayerManager().addLayer(data.markerLayer);
                 }
                 if (data.gpxLayer != null) {
-                    Main.main.addLayer(data.gpxLayer);
+                    Main.getLayerManager().addLayer(data.gpxLayer);
                 }
                 data.postLayerTask.run();
Index: /trunk/src/org/openstreetmap/josm/io/NMEAImporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/NMEAImporter.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/io/NMEAImporter.java	(revision 10436)
@@ -53,9 +53,9 @@
                     @Override
                     public void run() {
-                        Main.main.addLayer(gpxLayer);
+                        Main.getLayerManager().addLayer(gpxLayer);
                         if (Main.pref.getBoolean("marker.makeautomarkers", true)) {
                             MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", fn), fileFinal, gpxLayer);
                             if (!ml.data.isEmpty()) {
-                                Main.main.addLayer(ml);
+                                Main.getLayerManager().addLayer(ml);
                             }
                         }
Index: /trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 10436)
@@ -256,5 +256,5 @@
                     if (((ImageryLayer) l).getInfo().isBlacklisted()) {
                         Main.info(tr("Removed layer {0} because it is not allowed by the configured API.", l.getName()));
-                        Main.main.removeLayer(l);
+                        Main.getLayerManager().removeLayer(l);
                     }
                 }
Index: /trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/io/OsmChangeImporter.java	(revision 10436)
@@ -63,5 +63,5 @@
                             JOptionPane.INFORMATION_MESSAGE);
                 }
-                Main.main.addLayer(layer);
+                Main.getLayerManager().addLayer(layer);
                 layer.onPostLoadFromFile();
             }
Index: /trunk/src/org/openstreetmap/josm/io/OsmImporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmImporter.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/io/OsmImporter.java	(revision 10436)
@@ -96,5 +96,5 @@
             public void run() {
                 OsmDataLayer layer = data.getLayer();
-                Main.main.addLayer(layer);
+                Main.getLayerManager().addLayer(layer);
                 data.getPostLayerTask().run();
                 data.getLayer().onPostLoadFromFile();
Index: /trunk/src/org/openstreetmap/josm/io/WMSLayerImporter.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/WMSLayerImporter.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/io/WMSLayerImporter.java	(revision 10436)
@@ -88,5 +88,5 @@
             @Override
             public void run() {
-                Main.main.addLayer(layer);
+                Main.getLayerManager().addLayer(layer);
                 if (zoomTo != null) {
                     Main.map.mapView.zoomTo(zoomTo);
Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java	(revision 10435)
+++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java	(revision 10436)
@@ -106,5 +106,5 @@
             public void run() {
                 try {
-                    Main.main.addLayer(ImageryLayer.create(imgInfo));
+                    Main.getLayerManager().addLayer(ImageryLayer.create(imgInfo));
                 } catch (IllegalArgumentException e) {
                     Main.error(e, false);
Index: /trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java	(revision 10436)
@@ -59,5 +59,5 @@
 
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
 
             // Create an open way.
@@ -70,5 +70,5 @@
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
 
@@ -99,5 +99,5 @@
 
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
 
             // Create a closed way.
@@ -109,5 +109,5 @@
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
 
@@ -139,5 +139,5 @@
 
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
 
             // Create 2 ways.
@@ -152,5 +152,5 @@
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
 
Index: /trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java	(revision 10436)
@@ -94,9 +94,9 @@
         action.setEnabled(true);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             action.actionPerformed(null);
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
 
@@ -170,9 +170,9 @@
         action.setEnabled(true);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             action.actionPerformed(null);
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
 
Index: /trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java	(revision 10436)
@@ -42,5 +42,5 @@
             DataSet ds = OsmReader.parseDataSet(is, null);
             Layer layer = new OsmDataLayer(ds, null, null);
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             // FIXME enable this test after we fix the bug. Test disabled for now
             // try {
@@ -48,5 +48,5 @@
             // } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
             // }
         }
@@ -64,5 +64,5 @@
             assertEquals(10, ds.getWays().size());
             Layer layer = new OsmDataLayer(ds, null, null);
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             try {
                 for (String ref : new String[]{"A", "B", "C", "D", "E"}) {
@@ -76,5 +76,5 @@
             } finally {
                 // Ensure we clean the place before leaving, even if test fails.
-                Main.main.removeLayer(layer);
+                Main.getLayerManager().removeLayer(layer);
             }
         }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java	(revision 10436)
@@ -44,5 +44,5 @@
             DataSet ds = OsmReader.parseDataSet(is, null);
             OsmDataLayer layer = new OsmDataLayer(ds, null, null);
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             try {
                 for (Way w : ds.getWays()) {
@@ -60,5 +60,5 @@
             } finally {
                 // Ensure we clean the place before leaving, even if test fails.
-                Main.main.removeLayer(layer);
+                Main.getLayerManager().removeLayer(layer);
             }
         }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java	(revision 10436)
@@ -39,5 +39,5 @@
     public void testNoDataSet() {
         while (Main.main.hasEditLayer()) {
-            Main.main.removeLayer(Main.getLayerManager().getEditLayer());
+            Main.getLayerManager().removeLayer(Main.getLayerManager().getEditLayer());
         }
         assertNull(JosmAction.getCurrentDataSet());
@@ -69,5 +69,5 @@
         ds.addPrimitive(r);
         OsmDataLayer layer = new OsmDataLayer(ds, "", null);
-        Main.main.addLayer(layer);
+        Main.getLayerManager().addLayer(layer);
         return layer;
     }
@@ -86,5 +86,5 @@
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
@@ -101,5 +101,5 @@
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
@@ -130,5 +130,5 @@
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/SimplifyWayActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/SimplifyWayActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/SimplifyWayActionTest.java	(revision 10436)
@@ -54,9 +54,9 @@
         OsmDataLayer layer = new OsmDataLayer(ds, "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             assertTrue(ds.getSelected().isEmpty());
             action.actionPerformed(null);
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
@@ -71,9 +71,9 @@
         OsmDataLayer layer = new OsmDataLayer(ds, "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             assertEquals(1, ds.getSelected().size());
             action.actionPerformed(null);
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
@@ -90,9 +90,9 @@
         OsmDataLayer layer = new OsmDataLayer(ds, "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             assertEquals(11, ds.getSelected().size());
             action.actionPerformed(null);
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java	(revision 10436)
@@ -79,9 +79,9 @@
 
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             action.actionPerformed(null);
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
 
Index: /trunk/test/unit/org/openstreetmap/josm/actions/UnGlueActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/UnGlueActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/UnGlueActionTest.java	(revision 10436)
@@ -41,5 +41,5 @@
         OsmDataLayer layer = new OsmDataLayer(ds, "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             assertTrue(ds.getSelected().isEmpty());
             assertTrue(ds.allPrimitives().isEmpty());
@@ -47,5 +47,5 @@
             assertTrue(ds.allPrimitives().isEmpty());
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
@@ -62,5 +62,5 @@
         ds.setSelected(n);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             assertEquals(1, ds.getSelected().size());
             assertEquals(1, ds.allPrimitives().size());
@@ -68,5 +68,5 @@
             assertEquals(1, ds.allPrimitives().size());
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
@@ -89,5 +89,5 @@
         ds.setSelected(n1);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             assertEquals(1, ds.getSelected().size());
             assertEquals(3, ds.allPrimitives().size());
@@ -95,5 +95,5 @@
             assertEquals(3, ds.allPrimitives().size());
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
@@ -122,5 +122,5 @@
         ds.setSelected(n1);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             assertEquals(1, ds.getSelected().size());
             assertEquals(5, ds.allPrimitives().size());
@@ -128,5 +128,5 @@
             assertEquals(6, ds.allPrimitives().size());
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java	(revision 10436)
@@ -74,9 +74,9 @@
         action.setEnabled(true);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             action.actionPerformed(null);
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
 
Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.java	(revision 10436)
@@ -36,5 +36,5 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             AddNoteAction mapMode = new AddNoteAction(Main.map, new NoteData(Collections.<Note>emptyList()));
             MapMode oldMapMode = Main.map.mapMode;
@@ -43,5 +43,5 @@
             assertTrue(Main.map.selectMapMode(oldMapMode));
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DeleteActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DeleteActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DeleteActionTest.java	(revision 10436)
@@ -32,5 +32,5 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             DeleteAction mapMode = new DeleteAction(Main.map);
             MapMode oldMapMode = Main.map.mapMode;
@@ -39,5 +39,5 @@
             assertTrue(Main.map.selectMapMode(oldMapMode));
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java	(revision 10436)
@@ -68,5 +68,5 @@
         dataSet.addPrimitive(w);
 
-        Main.main.addLayer(layer);
+        Main.getLayerManager().addLayer(layer);
         try {
             assertTrue(Main.map.selectDrawTool(false));
@@ -99,5 +99,5 @@
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ExtrudeActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ExtrudeActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ExtrudeActionTest.java	(revision 10436)
@@ -32,5 +32,5 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             ExtrudeAction mapMode = new ExtrudeAction(Main.map);
             MapMode oldMapMode = Main.map.mapMode;
@@ -39,5 +39,5 @@
             assertTrue(Main.map.selectMapMode(oldMapMode));
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.java	(revision 10436)
@@ -32,5 +32,5 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             ImproveWayAccuracyAction mapMode = new ImproveWayAccuracyAction(Main.map);
             MapMode oldMapMode = Main.map.mapMode;
@@ -39,5 +39,5 @@
             assertTrue(Main.map.selectMapMode(oldMapMode));
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.java	(revision 10436)
@@ -32,5 +32,5 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             ParallelWayAction mapMode = new ParallelWayAction(Main.map);
             MapMode oldMapMode = Main.map.mapMode;
@@ -39,5 +39,5 @@
             assertTrue(Main.map.selectMapMode(oldMapMode));
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/PlayHeadDragModeTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/PlayHeadDragModeTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/PlayHeadDragModeTest.java	(revision 10436)
@@ -33,5 +33,5 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             PlayHeadDragMode mapMode = new PlayHeadDragMode(PlayHeadMarker.create());
             MapMode oldMapMode = Main.map.mapMode;
@@ -40,5 +40,5 @@
             assertTrue(Main.map.selectMapMode(oldMapMode));
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java	(revision 10436)
@@ -105,5 +105,5 @@
 
         Main.pref = new PreferencesMock();
-        Main.main.addLayer(layer);
+        Main.getLayerManager().addLayer(layer);
         try {
             SelectAction action = new SelectActionMock(Main.map, dataSet, layer);
@@ -160,5 +160,5 @@
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/ConflictAddCommandTest.java	(revision 10436)
@@ -35,5 +35,5 @@
         JOSMFixture.createUnitTestFixture().init(true);
         layer = new OsmDataLayer(new DataSet(), null, null);
-        Main.main.addLayer(layer);
+        Main.getLayerManager().addLayer(layer);
     }
 
@@ -43,5 +43,5 @@
     @AfterClass
     public static void tearDownAfterClass() {
-        Main.main.removeLayer(layer);
+        Main.getLayerManager().removeLayer(layer);
     }
 
Index: /trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/command/conflict/CoordinateConflictResolveCommandTest.java	(revision 10436)
@@ -37,5 +37,5 @@
         JOSMFixture.createUnitTestFixture().init(true);
         layer = new OsmDataLayer(new DataSet(), null, null);
-        Main.main.addLayer(layer);
+        Main.getLayerManager().addLayer(layer);
     }
 
@@ -45,5 +45,5 @@
     @AfterClass
     public static void tearDownAfterClass() {
-        Main.main.removeLayer(layer);
+        Main.getLayerManager().removeLayer(layer);
     }
 
Index: /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java	(revision 10436)
@@ -112,5 +112,5 @@
 
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             assertEquals("", InspectPrimitiveDialog.buildMapPaintText());
             Node n = new Node(LatLon.ZERO);
@@ -126,5 +126,5 @@
                     InspectPrimitiveDialog.buildMapPaintText().replaceAll("@(\\p{XDigit})+", ""));
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableTest.java	(revision 10436)
@@ -49,5 +49,5 @@
         OsmDataLayer layer = new OsmDataLayer(ds, "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             // Constructs models and table
             MemberTableModel memberTableModel = new MemberTableModel(r, layer, null);
@@ -84,5 +84,5 @@
             }
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java	(revision 10436)
@@ -196,9 +196,9 @@
         GpxLayer layer = getMinimalGpxLayer();
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             assertTrue(layer.getMenuEntries().length > 0);
             layer.paint(TestUtils.newGraphics(), Main.map.mapView, layer.data.getMetaBounds());
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java	(revision 10436)
@@ -44,5 +44,5 @@
         OsmDataLayer layer = new OsmDataLayer(ds, "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             int n = OsmDataLayer.PROPERTY_RECENT_RELATIONS_NUMBER.get();
             assertTrue(n > 0);
@@ -60,5 +60,5 @@
             assertTrue(layer.getRecentRelations().isEmpty());
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
@@ -134,9 +134,9 @@
         OsmDataLayer layer = new OsmDataLayer(ds, "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             assertTrue(layer.getMenuEntries().length > 0);
             layer.paint(TestUtils.newGraphics(), Main.map.mapView, new Bounds(LatLon.ZERO));
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java	(revision 10436)
@@ -50,9 +50,9 @@
     private static void test(ImageryType expected, TMSLayer layer) {
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             assertEquals(expected, layer.getInfo().getImageryType());
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/ValidatorLayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/ValidatorLayerTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/ValidatorLayerTest.java	(revision 10436)
@@ -33,5 +33,5 @@
         try {
             layer = new ValidatorLayer();
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             assertFalse(layer.isMergable(null));
             assertNotNull(layer.getIcon());
@@ -42,5 +42,5 @@
             // Ensure we clean the place before leaving, even if test fails.
             if (layer != null) {
-                Main.main.removeLayer(layer);
+                Main.getLayerManager().removeLayer(layer);
             }
         }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java	(revision 10436)
@@ -30,10 +30,10 @@
     public void testWMSLayer() {
         WMSLayer wms = new WMSLayer(new ImageryInfo("test wms", "http://localhost"));
-        Main.main.addLayer(wms);
+        Main.getLayerManager().addLayer(wms);
         try {
             assertEquals(ImageryType.WMS, wms.getInfo().getImageryType());
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(wms);
+            Main.getLayerManager().removeLayer(wms);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java	(revision 10436)
@@ -43,5 +43,5 @@
             GpxLayer gpxLayer = new GpxLayer(reader.getGpxData());
             try {
-                Main.main.addLayer(gpxLayer);
+                Main.getLayerManager().addLayer(gpxLayer);
                 assertEquals(1, Main.getLayerManager().getLayers().size());
                 new Loader(
@@ -62,5 +62,5 @@
             } finally {
                 // Ensure we clean the place before leaving, even if test fails.
-                Main.main.removeLayer(gpxLayer);
+                Main.getLayerManager().removeLayer(gpxLayer);
             }
         }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackActionTest.java	(revision 10436)
@@ -32,5 +32,5 @@
         final OsmDataLayer layer = new OsmDataLayer(new DataSet(), DownloadAlongTrackActionTest.class.getName(), null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             // Perform action
             final GpxData gpx = GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + file);
@@ -38,5 +38,5 @@
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java	(revision 10436)
@@ -47,5 +47,5 @@
         TMSLayer layer = new TMSLayer(new ImageryInfo("OSM TMS", "https://a.tile.openstreetmap.org/{zoom}/{x}/{y}.png", "tms", null, null));
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             TMSLayer.getCache().clear();
             assertTrue(TMSLayer.getCache().getMatching(".*").isEmpty());
@@ -58,5 +58,5 @@
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java	(revision 10436)
@@ -59,8 +59,8 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             newHandler(null).handle();
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
@@ -96,8 +96,8 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             newHandler("https://localhost?lat=0&lon=0").handle();
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandlerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandlerTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandlerTest.java	(revision 10436)
@@ -59,8 +59,8 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             newHandler(null).handle();
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
@@ -96,8 +96,8 @@
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
         try {
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             newHandler("https://localhost?way=0,0;1,1").handle();
         } finally {
-            Main.main.removeLayer(layer);
+            Main.getLayerManager().removeLayer(layer);
         }
     }
Index: /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java	(revision 10435)
+++ /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandlerTest.java	(revision 10436)
@@ -96,5 +96,5 @@
         } finally {
             for (OsmDataLayer layer : Main.getLayerManager().getLayersOfType(OsmDataLayer.class)) {
-                Main.main.removeLayer(layer);
+                Main.getLayerManager().removeLayer(layer);
             }
         }