JAL-3633 refactored/simplified LaunchUtils code

[jalview.git] / getdown / src / getdown / launcher / src / main / java / com / threerings / getdown / launcher / ProxyUtil.java

diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java
index 6295df4..cb51ca4 100644 (file)
--- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java
+++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/ProxyUtil.java
@@ -21,8 +21,7 @@ import java.net.URLConnection;
 import java.util.Iterator;
 import java.util.ServiceLoader;
 
-import jalview.bin.LaunchUtils;
-import jalview.util.ChannelProperties;
+import jalview.util.LaunchUtils;
 
 import ca.beq.util.win32.registry.RegistryKey;
 import ca.beq.util.win32.registry.RegistryValue;
@@ -114,25 +113,17 @@ public class ProxyUtil {
       String port = null;
       boolean proxyAuth = false;
       String username = null;
-      File channelProps = app.getLocalPath(ChannelProperties.CHANNEL_PROPERTIES_FILENAME);
-      if (channelProps.exists()) {
-        try {
-          InputStream is = new FileInputStream(channelProps);
-          ChannelProperties.loadProps(is);
-        } catch (IOException e) {
-          log.error(e.getMessage());
+      LaunchUtils.loadChannelProps(app.getAppDir());
+      if (LaunchUtils.getBooleanUserPreference("USE_PROXY")) {
+        host = LaunchUtils.getUserPreference("PROXY_SERVER_HTTPS");
+        port = LaunchUtils.getUserPreference("PROXY_PORT_HTTPS");
+        if (StringUtil.isBlank(host)) {
+          host = LaunchUtils.getUserPreference("PROXY_SERVER");
+          port = LaunchUtils.getUserPreference("PROXY_PORT");
         }
-        if (Boolean.parseBoolean(LaunchUtils.getUserPreference("USE_PROXY"))) {
-          host = LaunchUtils.getUserPreference("PROXY_SERVER_HTTPS");
-          port = LaunchUtils.getUserPreference("PROXY_PORT_HTTPS");
-          if (StringUtil.isBlank(host)) {
-            host = LaunchUtils.getUserPreference("PROXY_SERVER");
-            port = LaunchUtils.getUserPreference("PROXY_PORT");
-          }
-          proxyAuth = Boolean.parseBoolean(LaunchUtils.getUserPreference("PROXY_AUTH"));
-          if (proxyAuth) {
-            username = LaunchUtils.getUserPreference("PROXY_AUTH_USERNAME");
-          }
+        proxyAuth = LaunchUtils.getBooleanUserPreference("PROXY_AUTH");
+        if (proxyAuth) {
+          username = LaunchUtils.getUserPreference("PROXY_AUTH_USERNAME");
         }
       }
       return new String[]{ host, port, String.valueOf(proxyAuth), username };