Ticket #6706: 20110815_CredentialDialog_patch.diff

File 20110815_CredentialDialog_patch.diff, 1.6 KB (added by josm-tickets@…, 15 years ago)

patch

  • src/org/openstreetmap/josm/gui/io/CredentialDialog.java 

    diff --git a/src/org/openstreetmap/josm/gui/io/CredentialDialog.java b/src/org/openstreetmap/josm/gui/io/CredentialDialog.java
old mode 100644
new mode 100755
index 5406ce9..cde3e51
    a b import org.openstreetmap.josm.gui.JMultilineLabel;  
    3434import org.openstreetmap.josm.gui.SideButton;
    3535import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
    3636import org.openstreetmap.josm.gui.help.HelpUtil;
     37import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
    3738import org.openstreetmap.josm.io.OsmApi;
    3839import org.openstreetmap.josm.tools.ImageProvider;
    3940import org.openstreetmap.josm.tools.WindowGeometry;
    … … public class CredentialDialog extends JDialog {  
    263264            tfPassword.setToolTipText(tr("Please enter the password for authenticating at your proxy server"));
    264265            lblHeading.setText(
    265266                    "<html>" + tr("Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid username and a valid password.",
    266                             System.getProperty("http.proxyHost") + ":" + System.getProperty("http.proxyPort")) + "</html>");
     267                            Main.pref.get(ProxyPreferencesPanel.PROXY_HTTP_HOST) + ":" + Main.pref.get(ProxyPreferencesPanel.PROXY_HTTP_PORT)) + "</html>");
    267268            lblWarning.setText("<html>" + tr("Warning: depending on the authentication method the proxy server uses the password may be transferred unencrypted.") + "</html>");
    268269        }
    269270