Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ImageryXmlBoundsPlugin.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ImageryXmlBoundsPlugin.java	(revision 33559)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/ImageryXmlBoundsPlugin.java	(revision 33560)
@@ -2,7 +2,7 @@
 package org.openstreetmap.josm.plugins.imageryxmlbounds;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
@@ -60,7 +60,7 @@
         ShowBoundsSelectionAction selectionAction = new ShowBoundsSelectionAction();
         DataSet.addSelectionListener(selectionAction);
-        Main.toolbar.register(selectionAction);
+        MainApplication.getToolbar().register(selectionAction);
         // Allow JOSM to download *.imagery.xml files
-        Main.main.menu.openLocation.addDownloadTaskClass(DownloadXmlBoundsTask.class);
+        MainApplication.getMenu().openLocation.addDownloadTaskClass(DownloadXmlBoundsTask.class);
     }
 
Index: /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/io/XmlBoundsImporter.java
===================================================================
--- /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/io/XmlBoundsImporter.java	(revision 33559)
+++ /applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/io/XmlBoundsImporter.java	(revision 33560)
@@ -13,4 +13,5 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.io.importexport.FileImporter;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -21,4 +22,5 @@
 import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsLayer;
 import org.openstreetmap.josm.plugins.imageryxmlbounds.data.XmlBoundsConverter;
+import org.openstreetmap.josm.tools.Logging;
 import org.xml.sax.SAXException;
 
@@ -63,7 +65,5 @@
             entries = reader.parse();
         } catch (SAXException e) {
-        	if (Main.isTraceEnabled()) {
-        		Main.trace(e);
-        	}
+      	    Logging.trace(e);
             if (JOptionPane.showConfirmDialog(
                     Main.parent,
@@ -94,9 +94,9 @@
 			                tr("Open Imagery XML file"), JOptionPane.INFORMATION_MESSAGE);
 			    }
-			    Main.getLayerManager().addLayer(layer);
+			    MainApplication.getLayerManager().addLayer(layer);
 			    layer.onPostLoadFromFile();
 			});
         } catch (SAXException e) {
-            Main.error(e);
+            Logging.error(e);
         }
     }