Changeset 4762 in josm for trunk/src/org

Timestamp:

2012-01-04T08:43:23+01:00 (13 years ago)

Author:

jttt

Message:

Add method getWindowParent to ProgressMonitor (see #7208)

Location:

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

Files:

• ChildProgress.java (modified) (2 diffs)
• NullProgressMonitor.java (modified) (2 diffs)
• PleaseWaitProgressMonitor.java (modified) (1 diff)
• ProgressMonitor.java (modified) (2 diffs)
• SwingRenderingProgressMonitor.java (modified) (2 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.progress;
+
+import java.awt.Component;
 
 public class ChildProgress extends AbstractProgressMonitor {
@@ -65 +67 @@
         return parent.getProgressTaskId();
     }
+
+    @Override
+    public Component getWindowParent() {
+        return parent.getWindowParent();
+    }
 }

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.progress;
+
+import java.awt.Component;
+
+import org.openstreetmap.josm.Main;
 
 public class NullProgressMonitor implements ProgressMonitor {
@@ -89 +93 @@
         return null;
     }
+
+    @Override
+    public Component getWindowParent() {
+        return Main.parent;
+    }
 }

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

@@ -322 +322 @@
     }
 
+
+    @Override
+    public Component getWindowParent() {
+        Component parent = dialog;
+        if (isInBackground || parent == null)
+            return Main.parent;
+        else
+            return parent;
+    }
 }

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.progress;
+
+import java.awt.Component;
 
 /**
@@ -140 +142 @@
      */
     ProgressTaskId getProgressTaskId();
+
+    /**
+     *
+     * @return component suitable as parent for dialogs that wants to be shown in front of progress dialog
+     */
+    Component getWindowParent();
 }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.progress;
 
+import java.awt.Component;
+
 import javax.swing.SwingUtilities;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -102 +105 @@
         return null;
     }
+
+    @Override
+    public Component getWindowParent() {
+        return Main.parent;
+    }
 }