Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsLayer.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsLayer.java	(revision 33829)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsLayer.java	(revision 33830)
@@ -11,7 +11,7 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
@@ -56,13 +56,13 @@
 
     private static final JosmAction[] ACTIONS_TO_DISABLE = new JosmAction[] {
-        Main.main.menu.download,
-        Main.main.menu.downloadPrimitive,
-        Main.main.menu.downloadReferrers,
-        Main.main.menu.upload,
-        Main.main.menu.uploadSelection,
-        Main.main.menu.update,
-        Main.main.menu.updateModified,
-        Main.main.menu.updateSelection,
-        Main.main.menu.openLocation
+        MainApplication.getMenu().download,
+        MainApplication.getMenu().downloadPrimitive,
+        MainApplication.getMenu().downloadReferrers,
+        MainApplication.getMenu().upload,
+        MainApplication.getMenu().uploadSelection,
+        MainApplication.getMenu().update,
+        MainApplication.getMenu().updateModified,
+        MainApplication.getMenu().updateSelection,
+        MainApplication.getMenu().openLocation
     };
 
@@ -85,6 +85,6 @@
     public XmlBoundsLayer(DataSet data, String name, File associatedFile) {
         super(data, name, associatedFile);
-        Main.getLayerManager().addLayerChangeListener(this);
-        Main.getLayerManager().addActiveLayerChangeListener(this);
+        MainApplication.getLayerManager().addLayerChangeListener(this);
+        MainApplication.getLayerManager().addActiveLayerChangeListener(this);
     }
 
@@ -106,5 +106,5 @@
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-        Layer newLayer = Main.getLayerManager().getActiveLayer();
+        Layer newLayer = MainApplication.getLayerManager().getActiveLayer();
         Layer oldLayer = e.getPreviousActiveLayer();
         if (newLayer == this && !(oldLayer instanceof XmlBoundsLayer)) {
@@ -132,5 +132,5 @@
     @Override
     public void layerRemoving(LayerRemoveEvent e) {
-        if (Main.getLayerManager().getEditLayer() instanceof XmlBoundsLayer) {
+        if (MainApplication.getLayerManager().getEditLayer() instanceof XmlBoundsLayer) {
             for (JosmAction action : ACTIONS_TO_DISABLE) {
                 action.setEnabled(false);
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java	(revision 33829)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java	(revision 33830)
@@ -23,5 +23,4 @@
 import javax.swing.AbstractAction;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
@@ -37,4 +36,5 @@
 import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsConstants;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -201,5 +201,5 @@
             }
         } catch(IOException e) {
-        	Main.warn(e);
+        	Logging.warn(e);
         }
         StringBuilder result = new StringBuilder(256);
@@ -412,6 +412,6 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        if (Main.isDebugEnabled()) {
-            Main.debug(getXml());
+        if (Logging.isDebugEnabled()) {
+            Logging.debug(getXml());
         }
     }
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/EditEntriesAction.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/EditEntriesAction.java	(revision 33829)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/EditEntriesAction.java	(revision 33830)
@@ -12,7 +12,7 @@
 import javax.swing.event.ListSelectionListener;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference.ImageryProvidersPanel.ImageryDefaultLayerTableModel;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -55,5 +55,5 @@
                 XmlBoundsConverter.convertImageryEntries(entries));
         GuiHelper.runInEDT(() -> {
-		    Main.getLayerManager().addLayer(layer);
+		    MainApplication.getLayerManager().addLayer(layer);
 		    layer.onPostLoadFromFile();
 		});
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/downloadtask/DownloadXmlBoundsTask.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/downloadtask/DownloadXmlBoundsTask.java	(revision 33829)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/downloadtask/DownloadXmlBoundsTask.java	(revision 33830)
@@ -6,7 +6,7 @@
 import java.util.concurrent.Future;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -35,5 +35,5 @@
         // We need submit instead of execute so we can wait for it to finish and get the error
         // message if necessary. If no one calls getErrorMessage() it just behaves like execute.
-        return Main.worker.submit(downloadTask);
+        return MainApplication.worker.submit(downloadTask);
     }
 
@@ -72,6 +72,6 @@
         protected int getNumDataLayers() {
             int count = 0;
-            if (!Main.isDisplayingMapView()) return 0;
-            for (Layer layer : Main.getLayerManager().getLayers()) {
+            if (!MainApplication.isDisplayingMapView()) return 0;
+            for (Layer layer : MainApplication.getLayerManager().getLayers()) {
                 if (layer instanceof XmlBoundsLayer) {
                     count++;
@@ -83,6 +83,6 @@
         @Override
         protected OsmDataLayer getFirstDataLayer() {
-            if (!Main.isDisplayingMapView()) return null;
-            for (Layer layer : Main.getLayerManager().getLayers()) {
+            if (!MainApplication.isDisplayingMapView()) return null;
+            for (Layer layer : MainApplication.getLayerManager().getLayers()) {
                 if (layer instanceof XmlBoundsLayer)
                     return (XmlBoundsLayer) layer;