Index: trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java	(revision 9916)
+++ trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java	(revision 9917)
@@ -85,5 +85,5 @@
                 )
         };
-        int ret = HelpAwareOptionPane.showOptionDialog(
+        return 0 == HelpAwareOptionPane.showOptionDialog(
                 Main.parent,
                 msg,
@@ -95,5 +95,4 @@
                 HelpUtil.ht("/WarningMessages#ToManyBrowsersToOpen")
         );
-        return ret == 0;
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java	(revision 9916)
+++ trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java	(revision 9917)
@@ -78,5 +78,5 @@
                                 )
         };
-        int ret = HelpAwareOptionPane.showOptionDialog(
+        return 0 == HelpAwareOptionPane.showOptionDialog(
                 Main.parent,
                 tr(
@@ -91,5 +91,4 @@
                         HelpUtil.ht("/Action/SimplifyWay#ConfirmSimplifyAll")
                 );
-        return ret == 0;
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java	(revision 9916)
+++ trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java	(revision 9917)
@@ -6,4 +6,5 @@
 import java.awt.Component;
 import java.awt.Dialog.ModalityType;
+import java.awt.GraphicsEnvironment;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -241,4 +242,13 @@
         );
 
+        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,5 +312,4 @@
         }
         dialog.setVisible(true);
-        return (Integer) pane.getValue();
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java	(revision 9916)
+++ trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java	(revision 9917)
@@ -243,5 +243,5 @@
                 options[0],
                 "/Action/Upload#NodeStillInUseInWay"
-);
+        );
         if (ret == 0) {
             DownloadReferrersAction.downloadReferrers(Main.main.getEditLayer(), Arrays.asList(conflict.a));
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java	(revision 9916)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java	(revision 9917)
@@ -5,5 +5,4 @@
 
 import java.awt.Dimension;
-import java.awt.GraphicsEnvironment;
 import java.awt.GridBagLayout;
 
@@ -186,9 +185,6 @@
         });
 
-        int ret = 0;
-        if (!GraphicsEnvironment.isHeadless()) {
-            ret = HelpAwareOptionPane.showOptionDialog(Main.parent, this, title,
+        int ret = HelpAwareOptionPane.showOptionDialog(Main.parent, this, title,
                     JOptionPane.QUESTION_MESSAGE, null, options, options[0], helpTopic);
-        }
         if (0 == ret) {
             rememberSettings();
Index: trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java	(revision 9916)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java	(revision 9917)
@@ -171,5 +171,5 @@
                 )
         };
-        int ret = HelpAwareOptionPane.showOptionDialog(
+        return 0 == HelpAwareOptionPane.showOptionDialog(
                 this,
                 tr(
@@ -184,6 +184,4 @@
                 HelpUtil.ht("/Dialog/OAuthAuthorisationWizard")
         );
-
-        return ret == 0; // OK button clicked
     }
 
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 9916)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 9917)
@@ -8,5 +8,4 @@
 import java.awt.Component;
 import java.awt.Font;
-import java.awt.GraphicsEnvironment;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -856,13 +855,11 @@
                 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,7 +1106,5 @@
                 )
         };
-        int ret = -1;
-        if (!GraphicsEnvironment.isHeadless()) {
-            ret = HelpAwareOptionPane.showOptionDialog(
+        return 0 == HelpAwareOptionPane.showOptionDialog(
                     parent,
                     reason,
@@ -1121,6 +1116,4 @@
                     null // FIXME: add help topic
             );
-        }
-        return ret == 0;
     }