Changeset 12803 in josm for trunk/src/org/openstreetmap/josm/io

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/io/OsmConnection.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/OsmConnection.java

@@ -11 +11 @@
 import java.util.Base64;
 import java.util.Objects;
-import java.util.concurrent.FutureTask;
-
-import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.oauth.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.data.oauth.OAuthParameters;
-import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard;
 import org.openstreetmap.josm.io.auth.CredentialsAgentException;
 import org.openstreetmap.josm.io.auth.CredentialsAgentResponse;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
 import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.Utils;
 
 import oauth.signpost.OAuthConsumer;
@@ -39 +35 @@
     protected HttpClient activeConnection;
     protected OAuthParameters oauthParameters;
+
+    /**
+     * Retrieves OAuth access token.
+     * @since 12803
+     */
+    public interface OAuthAccessTokenFetcher {
+        /**
+         * 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
+         */
+        void obtainAccessToken(URL serverUrl) throws InvocationTargetException, InterruptedException;
+    }
+
+    static OAuthAccessTokenFetcher fetcher = u -> {
+        throw new JosmRuntimeException("OsmConnection.setOAuthAccessTokenFetcher() has not been called");
+    };
+
+    /**
+     * Sets the OAuth access token fetcher.
+     * @param tokenFetcher new OAuth access token fetcher. Cannot be null
+     * @since 12803
+     */
+    public static void setOAuthAccessTokenFetcher(OAuthAccessTokenFetcher tokenFetcher) {
+        fetcher = Objects.requireNonNull(tokenFetcher, "tokenFetcher");
+    }
 
     /**
@@ -110 +133 @@
 
     /**
-     * Obtains an OAuth access token for the connection. Afterwards, the token is accessible via {@link OAuthAccessTokenHolder}.
+     * Obtains an OAuth access token for the connection.
+     * Afterwards, the token is accessible via {@link OAuthAccessTokenHolder} / {@link CredentialsManager}.
      * @param connection connection for which the access token should be obtained
-     * @throws MissingOAuthAccessTokenException if the process cannot be completec successfully
+     * @throws MissingOAuthAccessTokenException if the process cannot be completed successfully
      */
     protected void obtainAccessToken(final HttpClient connection) throws MissingOAuthAccessTokenException {
@@ -120 +144 @@
                 throw new MissingOAuthAccessTokenException();
             }
-            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, apiUrl.toExternalForm(), Utils.newDirectExecutor());
-                wizard.showDialog();
-                OAuthAccessTokenHolder.getInstance().setSaveToPreferences(true);
-                OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
-                return wizard;
-            });
-            // exception handling differs from implementation at GuiHelper.runInEDTAndWait()
-            if (SwingUtilities.isEventDispatchThread()) {
-                authTask.run();
-            } else {
-                SwingUtilities.invokeAndWait(authTask);
-            }
+            fetcher.obtainAccessToken(apiUrl);
+            OAuthAccessTokenHolder.getInstance().setSaveToPreferences(true);
+            OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManager.getInstance());
         } catch (MalformedURLException | InterruptedException | InvocationTargetException e) {
             throw new MissingOAuthAccessTokenException(e);