*/
public Preferences()
{
- super();
+ new Preferences(0);
+ }
+
+ public Preferences(int selectTab)
+ {
+ super(selectTab);
frame = new JInternalFrame();
frame.setContentPane(this);
wsPrefs = new WsPreferences();
proxyAuth.setSelected(Cache.getDefault("PROXY_AUTH", false));
proxyAuthUsernameTB
.setText(Cache.getDefault("PROXY_AUTH_USERNAME", ""));
- proxyAuthPasswordTB
- .setText(Cache.getDefault("PROXY_AUTH_PASSWORD", ""));
+ // we are not storing or retrieving proxy password from .jalview_properties
+ proxyAuthPasswordTB.setText(Cache.proxyAuthPassword == null ? ""
+ : Cache.proxyAuthPassword.toString());
setCustomProxyEnabled();
defaultBrowser.setText(Cache.getDefault("DEFAULT_BROWSER", ""));
sequenceUrlLinks.getPrimaryUrlId());
// Proxy settings
- Cache.applicationProperties.setProperty("USE_PROXY",
- customProxy.isSelected() ? Cache.PROXYTYPE_CUSTOM
- : noProxy.isSelected() ? Cache.PROXYTYPE_NONE
- : Cache.PROXYTYPE_SYSTEM);
- Cache.setOrRemove("PROXY_SERVER", proxyServerHttpTB.getText());
- Cache.setOrRemove("PROXY_PORT", proxyPortHttpTB.getText());
- Cache.setOrRemove("PROXY_SERVER_HTTPS", proxyServerHttpsTB.getText());
- Cache.setOrRemove("PROXY_PORT_HTTPS", proxyPortHttpsTB.getText());
- Cache.setOrRemove("PROXY_AUTH",
- Boolean.toString(proxyAuth.isSelected()));
- Cache.setOrRemove("PROXY_AUTH_USERNAME", proxyAuthUsernameTB.getText());
- Cache.setOrRemove("PROXY_AUTH_PASSWORD", proxyAuthPasswordTB.getText());
- setProxyFromSettings();
+ saveProxySettings();
Cache.setProperty("VERSION_CHECK",
Boolean.toString(versioncheck.isSelected()));
if (!previousProxyType.equals(proxyType))
Cache.log.info("Setting no proxy settings");
Cache.setProxyProperties(null, null, null, null, null, null, null,
- null);
+ null, null);
}
else if (proxyType.equals(Cache.PROXYTYPE_CUSTOM))
{
Cache.getDefault("PROXY_PORT_HTTPS", null),
proxyAuthSet ? Cache.getDefault("PROXY_AUTH_USERNAME", "")
: null,
- proxyAuthSet ? Cache.getDefault("PROXY_AUTH_PASSWORD", "")
- : null);
+ proxyAuthSet ? Cache.proxyAuthPassword : null,
+ proxyAuthSet ? Cache.getDefault("PROXY_AUTH_USERNAME", "")
+ : null,
+ proxyAuthSet ? Cache.proxyAuthPassword : null, "localhost");
}
else // systemProxy should be selected and is sensible default anyway
{
}
}
+ public void saveProxySettings()
+ {
+ Cache.applicationProperties.setProperty("USE_PROXY",
+ customProxy.isSelected() ? Cache.PROXYTYPE_CUSTOM
+ : noProxy.isSelected() ? Cache.PROXYTYPE_NONE
+ : Cache.PROXYTYPE_SYSTEM);
+ Cache.setOrRemove("PROXY_SERVER", proxyServerHttpTB.getText());
+ Cache.setOrRemove("PROXY_PORT", proxyPortHttpTB.getText());
+ Cache.setOrRemove("PROXY_SERVER_HTTPS", proxyServerHttpsTB.getText());
+ Cache.setOrRemove("PROXY_PORT_HTTPS", proxyPortHttpsTB.getText());
+ Cache.setOrRemove("PROXY_AUTH",
+ Boolean.toString(proxyAuth.isSelected()));
+ Cache.setOrRemove("PROXY_AUTH_USERNAME", proxyAuthUsernameTB.getText());
+ Cache.proxyAuthPassword = proxyAuthPasswordTB.getPassword();
+ setProxyFromSettings();
+ }
+
/**
* Do any necessary validation before saving settings. Return focus to the
* first tab which fails validation.