Changeset 5692 in josm for trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java

Timestamp:

2013-01-30T02:25:13+01:00 (12 years ago)

Author:

Don-vip

Message:

fix EDT violation, javadoc

File:

• trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/auth/AbstractCredentialsAgent.java

@@ -8 +8 @@
 
 import org.openstreetmap.josm.gui.io.CredentialDialog;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 
 abstract public class AbstractCredentialsAgent implements CredentialsAgent {
@@ -14 +15 @@
 
     /**
-     * @see CredentialsAgent#getCredentials(RequestorType, boolean)
+     * @see CredentialsAgent#getCredentials(RequestorType, String, boolean)
      */
     @Override
-    public CredentialsAgentResponse getCredentials(RequestorType requestorType, String host, boolean noSuccessWithLastResponse) throws CredentialsAgentException{
+    public CredentialsAgentResponse getCredentials(final RequestorType requestorType, final String host, boolean noSuccessWithLastResponse) throws CredentialsAgentException{
         if (requestorType == null)
             return null;
         PasswordAuthentication credentials =  lookup(requestorType, host);
-        String username = (credentials == null || credentials.getUserName() == null) ? "" : credentials.getUserName();
-        String password = (credentials == null || credentials.getPassword() == null) ? "" : String.valueOf(credentials.getPassword());
+        final String username = (credentials == null || credentials.getUserName() == null) ? "" : credentials.getUserName();
+        final String password = (credentials == null || credentials.getPassword() == null) ? "" : String.valueOf(credentials.getPassword());
 
-        CredentialsAgentResponse response = new CredentialsAgentResponse();
+        final CredentialsAgentResponse response = new CredentialsAgentResponse();
 
         /*
@@ -45 +46 @@
          */
         } else if (noSuccessWithLastResponse || username.equals("") || password.equals("")) {
-            CredentialDialog dialog = null;
-            switch(requestorType) {
-            case SERVER: dialog = CredentialDialog.getOsmApiCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText()); break;
-            case PROXY: dialog = CredentialDialog.getHttpProxyCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText()); break;
+            GuiHelper.runInEDTAndWait(new Runnable() {
+                @Override
+                public void run() {
+                    CredentialDialog dialog = null;
+                    switch(requestorType) {
+                    case SERVER: dialog = CredentialDialog.getOsmApiCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText()); break;
+                    case PROXY: dialog = CredentialDialog.getHttpProxyCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText()); break;
+                    }
+                    dialog.setVisible(true);
+                    response.setCanceled(dialog.isCanceled());
+                    if (dialog.isCanceled())
+                        return;
+                    response.setUsername(dialog.getUsername());
+                    response.setPassword(dialog.getPassword());
+                    response.setSaveCredentials(dialog.isSaveCredentials());
+                }
+            });
+            if (response.isCanceled()) {
+                return response;
             }
-            dialog.setVisible(true);
-            response.setCanceled(dialog.isCanceled());
-            if (dialog.isCanceled())
-                return response;
-            response.setUsername(dialog.getUsername());
-            response.setPassword(dialog.getPassword());
-            if (dialog.isSaveCredentials()) {
+            if (response.isSaveCredentials()) {
                 store(requestorType, host, new PasswordAuthentication(
                         response.getUsername(),
@@ -66 +76 @@
              */
             } else {
-                PasswordAuthentication pa = new PasswordAuthentication(dialog.getUsername(), dialog.getPassword());
+                PasswordAuthentication pa = new PasswordAuthentication(response.getUsername(), response.getPassword());
                 memoryCredentialsCache.put(requestorType, pa);
             }