Changeset 12803 in josm for trunk/src/org/openstreetmap/josm/gui/oauth

Timestamp:

2017-09-09T16:45:41+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - remove GUI references from OsmConnection

File:

• trunk/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java (modified) (4 diffs)

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

@@ -21 +21 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.lang.reflect.InvocationTargetException;
+import java.net.URL;
 import java.util.concurrent.Executor;
+import java.util.concurrent.FutureTask;
 
 import javax.swing.AbstractAction;
@@ -30 +33 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.event.HyperlinkEvent;
@@ -51 +55 @@
 import org.openstreetmap.josm.tools.OpenBrowser;
 import org.openstreetmap.josm.tools.UserCancelException;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -333 +338 @@
     }
 
+    /**
+     * Obtains an OAuth access token for the connection. Afterwards, the token is accessible via {@link OAuthAccessTokenHolder}.
+     * @param serverUrl the URL to OSM server
+     * @throws InterruptedException if we're interrupted while waiting for the event dispatching thread to finish OAuth authorization task
+     * @throws InvocationTargetException if an exception is thrown while running OAuth authorization task
+     * @since 12803
+     */
+    public static void obtainAccessToken(final URL serverUrl) throws InvocationTargetException, InterruptedException {
+        final Runnable authTask = new FutureTask<>(() -> {
+            // Concerning Utils.newDirectExecutor: Main worker cannot be used since this connection is already
+            // executed via main worker. The OAuth connections would block otherwise.
+            final OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
+                    Main.parent, serverUrl.toExternalForm(), Utils.newDirectExecutor());
+            wizard.showDialog();
+            return wizard;
+        });
+        // exception handling differs from implementation at GuiHelper.runInEDTAndWait()
+        if (SwingUtilities.isEventDispatchThread()) {
+            authTask.run();
+        } else {
+            SwingUtilities.invokeAndWait(authTask);
+        }
+    }
+
     class AuthorisationProcedureChangeListener implements ItemListener {
         @Override