Changeset 9917 in josm for trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java

Timestamp:

2016-03-03T23:06:36+01:00 (10 years ago)

Author:

Don-vip

Message:

better handling of HelpAwareOptionPane.showOptionDialog in headless mode

File:

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

trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java

@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.Dialog.ModalityType;
+import java.awt.GraphicsEnvironment;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -241 +242 @@
         );
 
+        if (!GraphicsEnvironment.isHeadless()) {
+            doShowOptionDialog(parentComponent, title, options, defaultOption, helpTopic, buttons, pane);
+        }
+        return (Integer) pane.getValue();
+    }
+
+    private static void doShowOptionDialog(Component parentComponent, String title, final ButtonSpec[] options,
+            final ButtonSpec defaultOption, final String helpTopic, final List<JButton> buttons,
+            final JOptionPane pane) {
         final JDialog dialog = new JDialog(
                 JOptionPane.getFrameForComponent(parentComponent),
@@ -302 +312 @@
         }
         dialog.setVisible(true);
-        return (Integer) pane.getValue();
     }