Changeset 14153 in josm for trunk/src/org/openstreetmap/josm/gui/progress

Timestamp:

2018-08-13T02:18:54+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main.parent and Main itself

Location:

trunk/src/org/openstreetmap/josm/gui/progress

Files:

• NullProgressMonitor.java (modified) (2 diffs)
• swing/PleaseWaitProgressMonitor.java (modified) (3 diffs)
• swing/SwingRenderingProgressMonitor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java

@@ -4 +4 @@
 import java.awt.Component;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -127 +127 @@
     @Override
     public Component getWindowParent() {
-        return Main.parent;
+        return MainApplication.getMainFrame();
     }
 }

trunk/src/org/openstreetmap/josm/gui/progress/swing/PleaseWaitProgressMonitor.java

@@ -11 +11 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -171 +170 @@
      */
     public PleaseWaitProgressMonitor(String windowTitle) {
-        this(Main.parent);
+        this(MainApplication.getMainFrame());
         this.windowTitle = windowTitle;
     }
@@ -401 +400 @@
         Component parent = dialog;
         if (isInBackground || parent == null)
-            return Main.parent;
+            return MainApplication.getMainFrame();
         else
             return parent;

trunk/src/org/openstreetmap/josm/gui/progress/swing/SwingRenderingProgressMonitor.java

@@ -4 +4 @@
 import java.awt.Component;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.AbstractProgressMonitor;
 import org.openstreetmap.josm.gui.progress.CancelHandler;
@@ -85 +85 @@
     @Override
     public Component getWindowParent() {
-        return Main.parent;
+        return MainApplication.getMainFrame();
     }
 }