Changeset 9917 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

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

Author:

Don-vip

Message:

better handling of HelpAwareOptionPane.showOptionDialog in headless mode

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (4 diffs)

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;
@@ -856 +855 @@
                 plugins.size()))
           .append("</html>");
-        if (!GraphicsEnvironment.isHeadless()) {
-            HelpAwareOptionPane.showOptionDialog(
-                    parent,
-                    sb.toString(),
-                    tr("Warning"),
-                    JOptionPane.WARNING_MESSAGE,
-                    HelpUtil.ht("/Plugin/Loading#MissingPluginInfos")
-            );
-        }
+        HelpAwareOptionPane.showOptionDialog(
+                parent,
+                sb.toString(),
+                tr("Warning"),
+                JOptionPane.WARNING_MESSAGE,
+                HelpUtil.ht("/Plugin/Loading#MissingPluginInfos")
+        );
     }
 
@@ -1109 +1106 @@
                 )
         };
-        int ret = -1;
-        if (!GraphicsEnvironment.isHeadless()) {
-            ret = HelpAwareOptionPane.showOptionDialog(
+        return 0 == HelpAwareOptionPane.showOptionDialog(
                     parent,
                     reason,
@@ -1121 +1116 @@
                     null // FIXME: add help topic
             );
-        }
-        return ret == 0;
     }