Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/OdDialog.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/OdDialog.java	(revision 32524)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/gui/OdDialog.java	(revision 32525)
@@ -49,5 +49,5 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            if (Main.main.getEditLayer() instanceof OdLayer) {
+            if (Main.getLayerManager().getEditLayer() instanceof OdLayer) {
                 dataLayer.downloadOsmData();
                 diffButton.setEnabled(dataLayer.osmLayer != null);
@@ -72,5 +72,5 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            if (Main.main.getEditLayer() instanceof OdLayer) {
+            if (Main.getLayerManager().getEditLayer() instanceof OdLayer) {
                 dataLayer.makeDiff();
             }
@@ -103,5 +103,5 @@
             @Override
             public void mousePressed(MouseEvent e) {
-                if (Main.main.getEditLayer() instanceof OdLayer) {
+                if (Main.getLayerManager().getEditLayer() instanceof OdLayer) {
                     JPopupMenu popup = new JPopupMenu();
                     for (JosmAction tool : dataLayer.handler.getTools()) {
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java	(revision 32524)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/layers/OdDataLayer.java	(revision 32525)
@@ -65,10 +65,10 @@
         removeOsmLayer();
         osmLayer = layer;
-        Main.main.addLayer(osmLayer);
+        Main.getLayerManager().addLayer(osmLayer);
     }
 
     public void removeOsmLayer() {
         if (osmLayer != null) {
-            Main.main.removeLayer(osmLayer);
+            Main.getLayerManager().removeLayer(osmLayer);
             osmLayer = null;
         }
@@ -78,10 +78,10 @@
         removeDiffLayer();
         diffLayer = layer;
-        Main.main.addLayer(diffLayer);
+        Main.getLayerManager().addLayer(diffLayer);
     }
     
     public void removeDiffLayer() {
         if (diffLayer != null) {
-            Main.main.removeLayer(diffLayer);
+            Main.getLayerManager().removeLayer(diffLayer);
             diffLayer = null;
         }