Changeset 852 for java/installer2

Timestamp:

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

Author:

alloc

Message:

AEI2.08, AEIUpdater:

• Fixes #3

Location:

java/installer2

Files:

• .classpath (modified) (1 diff)
• src/net/oni2/aeinstaller/AEInstaller2.java (modified) (7 diffs)
• src/net/oni2/aeinstaller/backend/Paths.java (modified) (3 diffs)
• src/net/oni2/aeinstaller/backend/RuntimeOptions.java (added)
• src/net/oni2/aeinstaller/gui/MainWin.java (modified) (5 diffs)
• src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java (modified) (2 diffs)
• src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java (modified) (2 diffs)

java/installer2/.classpath

@@ -28 +28 @@
         <classpathentry combineaccessrules="false" kind="src" path="/SwingComponents"/>
         <classpathentry combineaccessrules="false" kind="src" path="/NaturalOrderComparator"/>
+        <classpathentry combineaccessrules="false" kind="src" path="/ProxySettings"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

@@ -21 +21 @@
 import javax.swing.UIManager.LookAndFeelInfo;
 
+import net.oni2.ProxySettings;
 import net.oni2.SettingsManager;
 import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
 import net.oni2.aeinstaller.backend.Paths;
+import net.oni2.aeinstaller.backend.RuntimeOptions;
 import net.oni2.aeinstaller.backend.SizeFormatter;
 import net.oni2.aeinstaller.backend.oni.OniSplit;
@@ -47 +49 @@
 public class AEInstaller2 {
 
-        private static ResourceBundle imagesBundle;
-        private static ResourceBundle basicBundle;
+        private static ResourceBundle imagesBundle = ResourceBundle
+                        .getBundle("net.oni2.aeinstaller.Images");
+        private static ResourceBundle basicBundle = ResourceBundle
+                        .getBundle("net.oni2.aeinstaller.AEInstaller");
         private static ResourceBundle globalBundle;
 
@@ -82 +86 @@
                         }
                 }
-                imagesBundle = ResourceBundle.getBundle("net.oni2.aeinstaller.Images");
-                basicBundle = ResourceBundle
-                                .getBundle("net.oni2.aeinstaller.AEInstaller");
                 globalBundle = UTF8ResourceBundleLoader
                                 .getBundle("net.oni2.aeinstaller.localization.Global");
@@ -116 +117 @@
                 Paths.getDownloadPath().mkdirs();
 
-                boolean debug = false;
-                boolean useWd = false;
-                boolean noCacheUpdate = false;
-                boolean offline = false;
                 for (String a : args) {
                         if (a.equalsIgnoreCase("-debug"))
-                                debug = true;
+                                RuntimeOptions.setDebug(true);
                         if (a.equalsIgnoreCase("-nocacheupdate"))
-                                noCacheUpdate = true;
+                                RuntimeOptions.setNoCacheUpdateMode(true);
                         if (a.equalsIgnoreCase("-offline"))
-                                offline = true;
+                                RuntimeOptions.setOfflineMode(true);
                         if (a.equalsIgnoreCase("-usewd"))
-                                useWd = true;
-                }
-                if (!debug) {
+                                RuntimeOptions.setUseWorkingDir(true);
+                }
+                if (!RuntimeOptions.isDebug()) {
                         try {
                                 PrintStream ps = new PrintStream(new File(Paths.getPrefsPath(),
@@ -141 +138 @@
                 }
 
-                SettingsManager.setDebug(debug);
-                SettingsManager.deserializeFromFile(Paths.getSettingsFilename());
-                SettingsManager.setDebug(debug);
-                SettingsManager.setUseWorkingDir(useWd);
-                SettingsManager.getInstance().setNoCacheUpdateMode(noCacheUpdate);
-
-                initBundles();
-
                 if (PlatformInformation.getPlatform() == Platform.MACOS)
                         initMacOS();
+
+                SettingsManager.deserializeFromFile(Paths.getSettingsFilename());
+                
+                if (Paths.getProxySettingsFilename().exists()) {
+                        ProxySettings.deserializeFromFile(Paths.getProxySettingsFilename());
+                }
+
+                initBundles();
 
                 SwingJavaBuilder.getConfig().addResourceBundle(imagesBundle);
@@ -242 +239 @@
                                         globalBundle.getString("invalidPath.title"),
                                         JOptionPane.ERROR_MESSAGE);
-                        if (!SettingsManager.isDebug()) {
+                        if (!RuntimeOptions.isDebug()) {
                                 return;
                         }
                 }
 
-                if (!offline) {
-                        offline = !DepotManager.getInstance().checkConnection();
-                }
-                if (offline) {
+                if (!RuntimeOptions.isOfflineMode()) {
+                        RuntimeOptions.setOfflineMode(!DepotManager.getInstance()
+                                        .checkConnection());
+                }
+                if (RuntimeOptions.isOfflineMode()) {
                         JOptionPane.showMessageDialog(null,
                                         globalBundle.getString("offlineModeStartup.text"),
@@ -256 +254 @@
                                         JOptionPane.INFORMATION_MESSAGE);
                 }
-                SettingsManager.getInstance().setOfflineMode(offline);
-
-                if (!offline) {
+
+                if (!RuntimeOptions.isOfflineMode()) {
                         SVN svn = new SVN();
                         try {

java/installer2/src/net/oni2/aeinstaller/backend/Paths.java

@@ -4 +4 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-
-import net.oni2.SettingsManager;
 
 /**
@@ -27 +25 @@
 
         /**
+         * @return Proxy settings filename of AEI
+         */
+        public static File getProxySettingsFilename() {
+                return new File(getPrefsPath(), "AEI-ProxySettings.xml");
+        }
+
+        /**
          * Get the Jar path
          * 
@@ -32 +37 @@
          */
         public static File getInstallerPath() {
-                if (SettingsManager.isDebug() || SettingsManager.getUseWorkingDir()) {
+                if (RuntimeOptions.isDebug() || RuntimeOptions.getUseWorkingDir()) {
                         String wd = System.getProperty("user.dir");
                         return new File(wd);

java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

@@ -50 +50 @@
 import net.oni2.aeinstaller.backend.ImageResizer;
 import net.oni2.aeinstaller.backend.Paths;
+import net.oni2.aeinstaller.backend.RuntimeOptions;
 import net.oni2.aeinstaller.backend.SizeFormatter;
 import net.oni2.aeinstaller.backend.oni.OniLauncher;
@@ -217 +218 @@
                 DepotManager.loadFromCacheFile(Paths.getDepotCacheFilename());
 
-                if (!SettingsManager.getInstance().isOfflineMode()
-                                && !SettingsManager.getInstance().isNoCacheUpdateMode()) {
+                if (!RuntimeOptions.isOfflineMode()
+                                && !RuntimeOptions.isNoCacheUpdateMode()) {
                         long start = new Date().getTime();
 
@@ -240 +241 @@
                 if ((evtSource != this)
                                 || SettingsManager.getInstance().get("notifyupdates", true)) {
-                        if (SettingsManager.getInstance().isOfflineMode()) {
+                        if (RuntimeOptions.isOfflineMode()) {
                                 if (evtSource != this) {
                                         JOptionPane.showMessageDialog(
@@ -584 +585 @@
         @SuppressWarnings("unused")
         private void checkCorePackages() {
-                if (!SettingsManager.getInstance().isOfflineMode()) {
+                if (!RuntimeOptions.isOfflineMode()) {
                         TreeSet<Package> tools = new TreeSet<Package>();
                         for (Package m : PackageManager.getInstance().getCoreTools()) {
@@ -649 +650 @@
                         }
 
-                        if (toDownload.size() > 0
-                                        && SettingsManager.getInstance().isOfflineMode()) {
+                        if (toDownload.size() > 0 && RuntimeOptions.isOfflineMode()) {
                                 installState = EInstallState.OFFLINE;
                                 break;

java/installer2/src/net/oni2/aeinstaller/gui/settings/SettingsDialog.java

@@ -14 +14 @@
 import javax.swing.UIManager;
 
+import net.oni2.ProxySettings;
 import net.oni2.SettingsManager;
+import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.resourcebundle.UTF8ResourceBundleLoader;
 
@@ -100 +102 @@
                                         JOptionPane.INFORMATION_MESSAGE);
                 }
+                
+                ProxySettings prox = ProxySettings.getInstance();
+                prox.serializeToFile(Paths.getProxySettingsFilename());
 
                 return true;

java/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java

@@ -18 +18 @@
 
 import net.oni2.SettingsManager;
+import net.oni2.aeinstaller.backend.RuntimeOptions;
 import net.oni2.aeinstaller.backend.oni.management.tools.ToolsManager;
 import net.oni2.aeinstaller.backend.packages.Package;
@@ -103 +104 @@
                         } else {
                                 if (!selectedPackage.isLocalAvailable()) {
-                                        if (SettingsManager.getInstance().isOfflineMode()) {
+                                        if (RuntimeOptions.isOfflineMode()) {
                                                 JOptionPane.showMessageDialog(this,
                                                                 bundle.getString("offlineMode.text"),