Changeset 9256 in josm for trunk

Timestamp:

2016-01-02T12:25:57+01:00 (9 years ago)

Author:

simon04

Message:

Fix EDT violations in OAuth wizard

Location:

trunk/src/org/openstreetmap/josm/gui/oauth

Files:

• RetrieveAccessTokenTask.java (modified) (2 diffs)
• SemiAutomaticAuthorizationUI.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -87 +88 @@
         } catch (OsmTransferCanceledException e) {
             return;
-        } catch (OsmOAuthAuthorizationException e) {
+        } catch (final OsmOAuthAuthorizationException e) {
             Main.error(e);
-            alertRetrievingAccessTokenFailed(e);
+            GuiHelper.runInEDT(new Runnable() {
+                @Override
+                public void run() {
+                    alertRetrievingAccessTokenFailed(e);
+                }
+            });
             accessToken = null;
         } finally {

trunk/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java

@@ -20 +20 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -26 +25 @@
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
@@ -403 +403 @@
                     if (task.getRequestToken() == null) return;
                     requestToken = task.getRequestToken();
-                    SwingUtilities.invokeLater(new Runnable() {
+                    GuiHelper.runInEDT(new Runnable() {
                         @Override
                         public void run() {
@@ -439 +439 @@
                     if (task.isCanceled()) return;
                     if (task.getAccessToken() == null) return;
-                    setAccessToken(task.getAccessToken());
-                    SwingUtilities.invokeLater(new Runnable() {
+                    GuiHelper.runInEDT(new Runnable() {
                         @Override
                         public void run() {
+                            setAccessToken(task.getAccessToken());
                             transitionToShowAccessToken();
                         }