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

Timestamp:

2014-08-30T12:58:39+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10441 - wrong parsing of changesets list in API URL test task + fix EDT violations

File:

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

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

@@ -211 +211 @@
      * @return the index of the selected option or {@link JOptionPane#CLOSED_OPTION}
      */
-    public static int showOptionDialog(Component parentComponent, Object msg, String title, int messageType, Icon icon, final ButtonSpec[] options, final ButtonSpec defaultOption, final String helpTopic)  {
+    public static int showOptionDialog(Component parentComponent, Object msg, String title, int messageType,
+            Icon icon, final ButtonSpec[] options, final ButtonSpec defaultOption, final String helpTopic)  {
         final List<JButton> buttons = createOptionButtons(options, helpTopic);
         if (helpTopic != null) {
@@ -318 +319 @@
      * @see #showOptionDialog(Component, Object, String, int, Icon, ButtonSpec[], ButtonSpec, String)
      */
-    public static int showOptionDialog(Component parentComponent, Object msg, String title, int messageType,final String helpTopic)  {
-        return showOptionDialog(parentComponent, msg, title, messageType, null,null,null, helpTopic);
+    public static int showOptionDialog(Component parentComponent, Object msg, String title, int messageType, String helpTopic)  {
+        return showOptionDialog(parentComponent, msg, title, messageType, null, null, null, helpTopic);
     }
 
     /**
      * Run it in Event Dispatch Thread.
-     * This version does not return anything, so it is more like showMessageDialog.
+     * This version does not return anything, so it is more like {@code showMessageDialog}.
      *
      * It can be used, when you need to show a message dialog from a worker thread,
-     * e.g. from PleaseWaitRunnable
+     * e.g. from {@code PleaseWaitRunnable}.
+     *
+     * @param parentComponent the parent component
+     * @param msg the message
+     * @param title the title
+     * @param messageType the message type (see {@link JOptionPane})
+     * @param helpTopic the help topic. Can be null.
      */
     public static void showMessageDialogInEDT(final Component parentComponent, final Object msg, final String title, final int messageType, final String helpTopic)  {