Index: trunk/src/org/openstreetmap/josm/actions/DeleteLayerAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DeleteLayerAction.java	(revision 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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 10433)
+++ 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);