Index: applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintDialog.java
===================================================================
--- applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintDialog.java	(revision 33260)
+++ applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintDialog.java	(revision 33579)
@@ -59,7 +59,9 @@
 import org.openstreetmap.gui.jmapviewer.tilesources.AbstractOsmTileSource;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.WindowGeometry;
 
 /**
@@ -233,5 +235,5 @@
                             printPreview.repaint();
                         } catch (ParseException e) {
-                            Main.error(e);
+                            Logging.error(e);
                         }
                     }
@@ -261,5 +263,5 @@
                             printPreview.repaint();
                         } catch (ParseException e) {
-                            Main.error(e);
+                            Logging.error(e);
                         }
                     }
@@ -343,5 +345,5 @@
         JScrollPane previewPane = new JScrollPane(printPreview,
                 JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        previewPane.setPreferredSize(Main.main != null ? Main.map.mapView.getSize() : new Dimension(210, 297));
+        previewPane.setPreferredSize(MainApplication.getMap() != null ? MainApplication.getMap().mapView.getSize() : new Dimension(210, 297));
         add(previewPane, GBC.std(0, 0).span(1, GBC.RELATIVE).fill().weight(5.0, 5.0));
 
@@ -479,5 +481,5 @@
             } else if (!ignoredAttributes.contains(a.getName())) {
                 // TODO: Add support for DateTimeSyntax, SetOfIntegerSyntax, ResolutionSyntax if needed
-                Main.warn("Print request attribute not supported: "+a.getName() +": "+a.getCategory()+" - "+a.toString());
+                Logging.warn("Print request attribute not supported: "+a.getName() +": "+a.getCategory()+" - "+a.toString());
             }
             if (setting != null) {
@@ -531,5 +533,5 @@
             return realClass.getConstructor(int.class).newInstance(Integer.parseInt(value));
         } else {
-            Main.warn("Attribute syntax not supported: "+syntax);
+            Logging.warn("Attribute syntax not supported: "+syntax);
         }
         return null;
@@ -544,5 +546,5 @@
                 }
             } catch (PrinterException | ReflectiveOperationException e) {
-                Main.warn(e.getClass().getSimpleName()+": "+e.getMessage());
+                Logging.warn(e.getClass().getSimpleName()+": "+e.getMessage());
             }
         }
@@ -551,5 +553,5 @@
                 attrs.add(unmarshallPrintSetting(setting));
             } catch (ReflectiveOperationException e) {
-                Main.warn(e.getClass().getSimpleName()+": "+e.getMessage());
+                Logging.warn(e.getClass().getSimpleName()+": "+e.getMessage());
             }
         }
Index: applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintPlugin.java
===================================================================
--- applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintPlugin.java	(revision 33260)
+++ applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintPlugin.java	(revision 33579)
@@ -7,4 +7,5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -41,5 +42,5 @@
         super(info);
 
-        JMenu fileMenu = Main.main.menu.fileMenu;
+        JMenu fileMenu = MainApplication.getMenu().fileMenu;
         int pos = fileMenu.getItemCount();
         do {
Index: applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintPreview.java
===================================================================
--- applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintPreview.java	(revision 33260)
+++ applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintPreview.java	(revision 33579)
@@ -19,5 +19,5 @@
 import javax.swing.RepaintManager;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -281,5 +281,5 @@
             } catch (PrinterException e) {
                 // should never happen since we are not printing
-                Main.error(e);
+                Logging.error(e);
             }
         } else {
Index: applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintableLayerManager.java
===================================================================
--- applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintableLayerManager.java	(revision 33260)
+++ applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintableLayerManager.java	(revision 33579)
@@ -7,6 +7,6 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 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.MainLayerManager;
@@ -15,5 +15,5 @@
 public class PrintableLayerManager extends MainLayerManager {
 
-    private static final MainLayerManager layerManager = Main.getLayerManager();
+    private static final MainLayerManager layerManager = MainApplication.getLayerManager();
 
     @Override
Index: applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintableMapView.java
===================================================================
--- applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintableMapView.java	(revision 33260)
+++ applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintableMapView.java	(revision 33579)
@@ -25,4 +25,5 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SystemOfMeasurement;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -122,5 +123,5 @@
         if (dim.width != width || dim.height != height) {
             super.setSize(width, height);
-            zoomTo(Main.map.mapView.getRealBounds());
+            zoomTo(MainApplication.getMap().mapView.getRealBounds());
             rezoomToFixedScale();
         }
@@ -135,5 +136,5 @@
         if (dim.width != newSize.width || dim.height != newSize.height) {
             super.setSize(newSize);
-            zoomTo(Main.map.mapView.getRealBounds());
+            zoomTo(MainApplication.getMap().mapView.getRealBounds());
             rezoomToFixedScale();
         }