Changeset 4386 in josm


Ignore:
Timestamp:
Aug 31, 2011 4:16:54 PM (21 months ago)
Author:
bastiK
Message:

applied #6706 - CredentialDialog.java - correct output for proxy-auth-failure (patch by robinro)

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r4249 r4386  
    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; 
    … …  
    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        } 
Note: See TracChangeset for help on using the changeset viewer.