Changeset 8939 in josm for trunk/src

Timestamp:

2015-10-24T15:22:02+02:00 (9 years ago)

Author:

Don-vip

Message:

fix problems seen in headless environment for jenkins

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/progress/PleaseWaitProgressMonitor.java (modified) (1 diff)
• plugins/PluginHandler.java (modified) (2 diffs)
• tools/PlatformHookUnixoid.java (modified) (1 diff)

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

@@ -174 +174 @@
             public void run() {
                 Main.currentProgressMonitor = PleaseWaitProgressMonitor.this;
+                if (GraphicsEnvironment.isHeadless()) {
+                    return;
+                }
                 if (dialogParent != null && dialog == null) {
                     dialog = new PleaseWaitDialog(dialogParent);

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -8 +8 @@
 import java.awt.Component;
 import java.awt.Font;
+import java.awt.GraphicsEnvironment;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -1099 +1100 @@
                 )
         };
-        int ret = HelpAwareOptionPane.showOptionDialog(
-                parent,
-                reason,
-                tr("Disable plugin"),
-                JOptionPane.WARNING_MESSAGE,
-                null,
-                options,
-                options[0],
-                null // FIXME: add help topic
-        );
+        int ret = -1;
+        if (!GraphicsEnvironment.isHeadless()) {
+            ret = HelpAwareOptionPane.showOptionDialog(
+                    parent,
+                    reason,
+                    tr("Disable plugin"),
+                    JOptionPane.WARNING_MESSAGE,
+                    null,
+                    options,
+                    options[0],
+                    null // FIXME: add help topic
+            );
+        }
         return ret == 0;
     }

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -392 +392 @@
 
     protected void askUpdateJava(String version) {
-        askUpdateJava(version, "https://www.java.com/download");
+        if (!GraphicsEnvironment.isHeadless()) {
+            askUpdateJava(version, "https://www.java.com/download");
+        }
     }