Index: /trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/Main.java	(revision 12637)
+++ /trunk/src/org/openstreetmap/josm/Main.java	(revision 12638)
@@ -48,8 +48,6 @@
 import org.openstreetmap.josm.gui.MapFrameListener;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
-import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.io.FileWatcher;
 import org.openstreetmap.josm.io.OnlineResource;
@@ -147,9 +145,4 @@
 
     /**
-     * The progress monitor being currently displayed.
-     */
-    public static PleaseWaitProgressMonitor currentProgressMonitor;
-
-    /**
      * The main menu bar at top of screen.
      */
@@ -726,12 +719,4 @@
     //  Implementation part
     ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Listener that sets the enabled state of undo/redo menu entries.
-     */
-    protected final CommandQueueListener redoUndoListener = (queueSize, redoSize) -> {
-            menu.undo.setEnabled(queueSize > 0);
-            menu.redo.setEnabled(redoSize > 0);
-        };
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 12637)
+++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 12638)
@@ -76,4 +76,5 @@
 import org.openstreetmap.josm.gui.layer.AutosaveTask;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
@@ -152,4 +153,12 @@
      */
     private static final MainLayerManager layerManager = new MainLayerManager();
+
+    /**
+     * Listener that sets the enabled state of undo/redo menu entries.
+     */
+    private final CommandQueueListener redoUndoListener = (queueSize, redoSize) -> {
+            menu.undo.setEnabled(queueSize > 0);
+            menu.redo.setEnabled(redoSize > 0);
+        };
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/MainPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainPanel.java	(revision 12637)
+++ /trunk/src/org/openstreetmap/josm/gui/MainPanel.java	(revision 12638)
@@ -14,4 +14,5 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.LayerAvailabilityEvent;
 import org.openstreetmap.josm.gui.layer.MainLayerManager.LayerAvailabilityListener;
+import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 
@@ -80,6 +81,6 @@
             listener.mapFrameInitialized(old, map);
         }
-        if (map == null && Main.currentProgressMonitor != null) {
-            Main.currentProgressMonitor.showForegroundDialog();
+        if (map == null && PleaseWaitProgressMonitor.getCurrent() != null) {
+            PleaseWaitProgressMonitor.getCurrent().showForegroundDialog();
         }
     }
Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 12637)
+++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 12638)
@@ -139,5 +139,5 @@
         @Override
         public void mouseClicked(MouseEvent e) {
-            PleaseWaitProgressMonitor monitor = Main.currentProgressMonitor;
+            PleaseWaitProgressMonitor monitor = PleaseWaitProgressMonitor.getCurrent();
             if (monitor != null) {
                 monitor.showForegroundDialog();
Index: /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java	(revision 12637)
+++ /trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java	(revision 12638)
@@ -73,4 +73,10 @@
      */
     public static final int PROGRESS_BAR_MAX = 10_000;
+
+    /**
+     * The progress monitor being currently displayed.
+     */
+    static PleaseWaitProgressMonitor currentProgressMonitor;
+
     private final Component dialogParent;
 
@@ -86,4 +92,13 @@
 
     private boolean cancelable;
+
+    /**
+     * Returns the progress monitor being currently displayed.
+     * @return the progress monitor being currently displayed
+     * @since 12638
+     */
+    public static PleaseWaitProgressMonitor getCurrent() {
+        return currentProgressMonitor;
+    }
 
     private void doInEDT(Runnable runnable) {
@@ -215,5 +230,5 @@
     public void doBeginTask() {
         doInEDT(() -> {
-            Main.currentProgressMonitor = this;
+            currentProgressMonitor = this;
             if (GraphicsEnvironment.isHeadless()) {
                 return;
@@ -339,5 +354,5 @@
                 dialog.dispose();
                 dialog = null;
-                Main.currentProgressMonitor = null;
+                currentProgressMonitor = null;
                 MapFrame map = MainApplication.getMap();
                 if (map != null) {
Index: /trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitorExecutor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitorExecutor.java	(revision 12637)
+++ /trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitorExecutor.java	(revision 12638)
@@ -6,5 +6,4 @@
 import java.util.concurrent.TimeUnit;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -30,7 +29,7 @@
     @Override
     public void execute(Runnable command) {
-        if (Main.currentProgressMonitor != null) {
+        if (PleaseWaitProgressMonitor.currentProgressMonitor != null) {
             //TODO show only if this can't be in background or better if always in background is not checked
-            Main.currentProgressMonitor.showForegroundDialog();
+            PleaseWaitProgressMonitor.currentProgressMonitor.showForegroundDialog();
         }
         super.execute(command);