Changeset 2687 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-12-28T00:14:59+01:00 (15 years ago)

Author:

Gubaer

Message:

Partial commit due to issue described in #4137
Breaks the build

File:

• trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.progress;
 
+import java.awt.Component;
 import java.awt.Dialog;
 import java.awt.EventQueue;
@@ -16 +17 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
@@ -32 +32 @@
 
     public PleaseWaitProgressMonitor(String windowTitle) {
-        this(JOptionPane.getFrameForComponent(Main.parent));
+        this(Main.parent);
         this.windowTitle = windowTitle;
     }
 
-    public PleaseWaitProgressMonitor(Window dialogParent) {
+    public PleaseWaitProgressMonitor(Component dialogParent) {
         super(new CancelHandler());
-        this.dialogParent = dialogParent;
+        this.dialogParent = JOptionPane.getFrameForComponent(dialogParent);
+    }
+
+    public PleaseWaitProgressMonitor(Component dialogParent, String windowTitle) {
+        this(JOptionPane.getFrameForComponent(dialogParent));
+        this.windowTitle = windowTitle;
     }