Index: trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 6883) +++ trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java (revision 6885) @@ -248,4 +248,14 @@ return cbSaveCredentials.isSelected(); } + + protected final void updateWarningLabel(String url) { + boolean https = url != null && url.startsWith("https"); + if (https) { + lblWarning.setText(null); + } else { + lblWarning.setText(tr("Warning: The password is transferred unencrypted.")); + } + lblWarning.setVisible(!https); + } } @@ -257,8 +267,9 @@ tfUserName.setToolTipText(tr("Please enter the user name of your OSM account")); tfPassword.setToolTipText(tr("Please enter the password of your OSM account")); + String apiUrl = OsmApi.getOsmApi().getBaseUrl(); lblHeading.setText( "" + tr("Authenticating at the OSM API ''{0}'' failed. Please enter a valid username and a valid password.", - OsmApi.getOsmApi().getBaseUrl()) + ""); - lblWarning.setText(tr("Warning: The password is transferred unencrypted.")); + apiUrl) + ""); + updateWarningLabel(apiUrl); } @@ -281,5 +292,5 @@ "" + tr("Authenticating at the host ''{0}'' failed. Please enter a valid username and a valid password.", host) + ""); - lblWarning.setText(tr("Warning: The password is transferred unencrypted.")); + updateWarningLabel(host); }