Changeset 852 for java/AEInstaller2-Updater

Timestamp:

May 3, 2013, 2:25:21 PM (12 years ago)

Author:

alloc

Message:

AEI2.08, AEIUpdater:

• Fixes #3

Location:

java/AEInstaller2-Updater

Files:

• .classpath (modified) (1 diff)
• src/net/oni2/aeinstaller/updater/AEInstaller2Updater.java (modified) (2 diffs)
• src/net/oni2/aeinstaller/updater/backend/Paths.java (modified) (1 diff)

java/AEInstaller2-Updater/.classpath

@@ -5 +5 @@
         <classpathentry combineaccessrules="false" kind="src" path="/SVNAccess"/>
         <classpathentry combineaccessrules="false" kind="src" path="/PlatformTools"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/ProxySettings"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

java/AEInstaller2-Updater/src/net/oni2/aeinstaller/updater/AEInstaller2Updater.java

@@ -9 +9 @@
 import javax.swing.UIManager;
 
+import net.oni2.ProxySettings;
 import net.oni2.aeinstaller.updater.backend.Paths;
 import net.oni2.aeinstaller.updater.gui.MainWin;
@@ -41 +42 @@
                 }
 
+                if (Paths.getProxySettingsFilename().exists()) {
+                        ProxySettings.deserializeFromFile(Paths.getProxySettingsFilename());
+                }
+
                 System.setProperty("networkaddress.cache.ttl", "5");
                 System.setProperty("networkaddress.cache.negative.ttl", "1");

java/AEInstaller2-Updater/src/net/oni2/aeinstaller/updater/backend/Paths.java

@@ -33 +33 @@
 
         /**
+         * @return Proxy settings filename of AEI
+         */
+        public static File getProxySettingsFilename() {
+                return new File(getPrefsPath(), "AEI-ProxySettings.xml");
+        }
+
+        /**
          * Get the preferences path
          *