JAL-3633 Set proxy preferences before web calls in jalview.bin.Jalview. Fixed call...

[jalview.git] / src / jalview / gui / Preferences.java

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 3cada85..da33f39 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -198,7 +198,12 @@ public class Preferences extends GPreferences
 
   public Preferences(int selectTab)
   {
-    super(selectTab);
+    new Preferences(selectTab, null);
+  }
+
+  public Preferences(int selectTab, String message)
+  {
+    super(selectTab, message);
     frame = new JInternalFrame();
     frame.setContentPane(this);
     if (!Platform.isJS())
@@ -557,9 +562,9 @@ public class Preferences extends GPreferences
       proxyType.setSelected(customProxy.getModel(), true);
       break;
     default:
-      String message = "Incorrect PROXY_TYPE - should be 'none' (clear proxy properties), 'false' (system settings), 'true' (custom settings): "
-              + proxyTypeString;
-      Cache.log.warn(message);
+      Cache.log.warn(
+              "Incorrect PROXY_TYPE - should be 'none' (clear proxy properties), 'false' (system settings), 'true' (custom settings): "
+                      + proxyTypeString);
     }
     proxyServerHttpTB.setText(Cache.getDefault("PROXY_SERVER", ""));
     proxyPortHttpTB.setText(Cache.getDefault("PROXY_PORT", ""));
@@ -570,7 +575,7 @@ public class Preferences extends GPreferences
             .setText(Cache.getDefault("PROXY_AUTH_USERNAME", ""));
     // we are not storing or retrieving proxy password from .jalview_properties
     proxyAuthPasswordTB.setText(Cache.proxyAuthPassword == null ? ""
-            : Cache.proxyAuthPassword.toString());
+            : new String(Cache.proxyAuthPassword));
     setCustomProxyEnabled();
 
     defaultBrowser.setText(Cache.getDefault("DEFAULT_BROWSER", ""));
@@ -942,41 +947,6 @@ public class Preferences extends GPreferences
     }
   }
 
-  public void setProxyFromSettings()
-  {
-    String proxyType = Cache.getDefault("USE_PROXY",
-            Cache.PROXYTYPE_SYSTEM);
-    if (proxyType.equals(Cache.PROXYTYPE_NONE))
-    {
-      if (!previousProxyType.equals(proxyType))
-        Cache.log.info("Setting no proxy settings");
-      Cache.setProxyProperties(null, null, null, null, null, null, null,
-              null, null);
-    }
-    else if (proxyType.equals(Cache.PROXYTYPE_CUSTOM))
-    {
-      if (!previousProxyType.equals(proxyType))
-        Cache.log.info("Setting custom proxy settings");
-      boolean proxyAuthSet = Cache.getDefault("PROXY_AUTH", false);
-      Cache.setProxyProperties(Cache.getDefault("PROXY_SERVER", null),
-              Cache.getDefault("PROXY_PORT", null),
-              Cache.getDefault("PROXY_SERVER_HTTPS", null),
-              Cache.getDefault("PROXY_PORT_HTTPS", null),
-              proxyAuthSet ? Cache.getDefault("PROXY_AUTH_USERNAME", "")
-                      : 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
-    {
-      if (!previousProxyType.equals(proxyType))
-        Cache.log.info("Setting system proxy settings");
-      Cache.resetProxyProperties();
-    }
-  }
-
   public void saveProxySettings()
   {
     Cache.applicationProperties.setProperty("USE_PROXY",
@@ -991,7 +961,7 @@ public class Preferences extends GPreferences
             Boolean.toString(proxyAuth.isSelected()));
     Cache.setOrRemove("PROXY_AUTH_USERNAME", proxyAuthUsernameTB.getText());
     Cache.proxyAuthPassword = proxyAuthPasswordTB.getPassword();
-    setProxyFromSettings();
+    Cache.setProxyPropertiesFromPreferences(previousProxyType);
   }
 
   /**