Changeset 7401 in josm for trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

Timestamp:

2014-08-15T17:45:34+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10175 - ask for JOSM update in case of crash with old version

File:

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

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

@@ -28 +28 @@
 import javax.swing.JScrollPane;
 import javax.swing.KeyStroke;
-import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 
 import org.openstreetmap.josm.gui.help.HelpBrowser;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.tools.GBC;
@@ -538 +538 @@
     /**
      * Sets the button that will react to ENTER.
-     * @param defaultButtonIdx The button index (starts to )
+     * @param defaultButtonIdx The button index (starts to 1)
      * @return {@code this}
      */
@@ -558 +558 @@
 
     /**
-     * Don't focus the "do not show this again" check box, but the default button.
+     * Always makes sure the default button has initial focus.
      */
     protected void fixFocus() {
-        if (toggleable && defaultButton != null) {
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override public void run() {
+        if (defaultButton != null) {
+            GuiHelper.runInEDT(new Runnable() {
+                @Override
+                public void run() {
                     defaultButton.requestFocusInWindow();
                 }