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

Timestamp:

2014-05-08T02:40:40+02:00 (10 years ago)

Author:

Don-vip

Message:

Robustness to allow to run more unit tests in headless mode

File:

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

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io.auth;
 
+import java.awt.GraphicsEnvironment;
 import java.net.Authenticator.RequestorType;
 import java.net.PasswordAuthentication;
@@ -44 +45 @@
          */
         } else if (noSuccessWithLastResponse || username.isEmpty() || password.isEmpty()) {
-            GuiHelper.runInEDTAndWait(new Runnable() {
-                @Override
-                public void run() {
-                    CredentialDialog dialog = null;
-                    if (requestorType.equals(RequestorType.PROXY))
-                        dialog = CredentialDialog.getHttpProxyCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText());
-                    else
-                        dialog = CredentialDialog.getOsmApiCredentialDialog(username, password, host, getSaveUsernameAndPasswordCheckboxText());
-                    dialog.setVisible(true);
-                    response.setCanceled(dialog.isCanceled());
-                    if (dialog.isCanceled())
-                        return;
-                    response.setUsername(dialog.getUsername());
-                    response.setPassword(dialog.getPassword());
-                    response.setSaveCredentials(dialog.isSaveCredentials());
-                }
-            });
+            if (!GraphicsEnvironment.isHeadless()) {
+                GuiHelper.runInEDTAndWait(new Runnable() {
+                    @Override
+                    public void run() {
+                        CredentialDialog dialog = null;
+                        if (requestorType.equals(RequestorType.PROXY))
+                            dialog = CredentialDialog.getHttpProxyCredentialDialog(
+                                    username, password, host, getSaveUsernameAndPasswordCheckboxText());
+                        else
+                            dialog = CredentialDialog.getOsmApiCredentialDialog(
+                                    username, password, host, getSaveUsernameAndPasswordCheckboxText());
+                        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() || response.getUsername() == null || response.getPassword() == null) {
                 return response;