Index: /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntries.java
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntries.java	(revision 33560)
+++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntries.java	(revision 33561)
@@ -9,6 +9,6 @@
 
 import org.insignificant.josm.plugins.imagewaypoint.ImageEntry.IImageReadyListener;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -77,5 +77,5 @@
         this.locatedImages.clear();
 
-        final Collection<Layer> layerCollection = Main.getLayerManager().getLayers();
+        final Collection<Layer> layerCollection = MainApplication.getLayerManager().getLayers();
         final Layer[] layers = layerCollection.toArray(new Layer[layerCollection.size()]);
 
Index: /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java	(revision 33560)
+++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java	(revision 33561)
@@ -15,5 +15,5 @@
 import org.insignificant.josm.plugins.imagewaypoint.actions.RotateLeftAction;
 import org.insignificant.josm.plugins.imagewaypoint.actions.RotateRightAction;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -70,6 +70,6 @@
         this.rotateRightAction.setEnabled(null != ImageEntries.getInstance().getCurrentImageEntry());
 
-        if (null != Main.map) {
-            Main.map.repaint();
+        if (null != MainApplication.getMap()) {
+            MainApplication.getMap().repaint();
         }
     }
Index: /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java	(revision 33560)
+++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java	(revision 33561)
@@ -13,7 +13,7 @@
 import javax.swing.Icon;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -40,5 +40,5 @@
                     // partly obscures another will match the click first
                     for (int index = images.length - 1; !found && index >= 0; index--) {
-                        final Rectangle bounds = images[index].getBounds(Main.map.mapView);
+                        final Rectangle bounds = images[index].getBounds(MainApplication.getMap().mapView);
                         if (null != bounds && bounds.contains(event.getPoint())) {
                             found = true;
@@ -55,10 +55,10 @@
         @Override
         public void onAvailableImageEntriesChanged(final ImageEntries entries) {
-            Main.map.repaint();
+            MainApplication.getMap().repaint();
         }
 
         @Override
         public void onSelectedImageEntryChanged(final ImageEntries entries) {
-            Main.map.repaint();
+            MainApplication.getMap().repaint();
         }
     }
@@ -70,8 +70,8 @@
         super(tr("Imported Images"));
 
-        Main.getLayerManager().addLayer(this);
+        MainApplication.getLayerManager().addLayer(this);
 
         this.layerMouseListener = new ImageWayPointMouseListener(this);
-        Main.map.mapView.addMouseListener(this.layerMouseListener);
+        MainApplication.getMap().mapView.addMouseListener(this.layerMouseListener);
 
         this.imageChangeListener = new ImageChangeListener();
@@ -156,5 +156,5 @@
         super.destroy();
 
-        Main.map.mapView.removeMouseListener(this.layerMouseListener);
+        MainApplication.getMap().mapView.removeMouseListener(this.layerMouseListener);
         ImageEntries.getInstance().removeListener(this.imageChangeListener);
     }
Index: /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java	(revision 33560)
+++ /applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java	(revision 33561)
@@ -10,6 +10,6 @@
 import java.util.Locale;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.io.importexport.FileImporter;
@@ -50,5 +50,5 @@
                 // check to see whether there's already an ImageWayPointLayer
                 boolean foundImageWayPointLayer = false;
-                final Collection<Layer> layerCollection = Main.getLayerManager().getLayers();
+                final Collection<Layer> layerCollection = MainApplication.getLayerManager().getLayers();
                 final Iterator<Layer> layerIterator = layerCollection.iterator();
                 while (layerIterator.hasNext() && !foundImageWayPointLayer) {