Changeset 8692 in josm for trunk

Timestamp:

2015-08-25T02:32:50+02:00 (9 years ago)

Author:

Don-vip

Message:

see #11795 - fix HeadlessException with Jenkins

File:

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

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

@@ -3 +3 @@
 
 import java.awt.Component;
+import java.awt.GraphicsEnvironment;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -98 +99 @@
     }
 
+    /**
+     * Constructs a new {@code PleaseWaitProgressMonitor}.
+     */
     public PleaseWaitProgressMonitor() {
         this("");
     }
 
+    /**
+     * Constructs a new {@code PleaseWaitProgressMonitor}.
+     */
     public PleaseWaitProgressMonitor(String windowTitle) {
         this(Main.parent);
@@ -107 +114 @@
     }
 
+    /**
+     * Constructs a new {@code PleaseWaitProgressMonitor}.
+     */
     public PleaseWaitProgressMonitor(Component dialogParent) {
         super(new CancelHandler());
-        this.dialogParent = JOptionPane.getFrameForComponent(dialogParent);
+        if (GraphicsEnvironment.isHeadless()) {
+            this.dialogParent = dialogParent;
+        } else {
+            this.dialogParent = JOptionPane.getFrameForComponent(dialogParent);
+        }
         this.cancelable = true;
     }
 
+    /**
+     * Constructs a new {@code PleaseWaitProgressMonitor}.
+     */
     public PleaseWaitProgressMonitor(Component dialogParent, String windowTitle) {
         this(JOptionPane.getFrameForComponent(dialogParent));