Changeset 852 for java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

Timestamp:

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

Author:

alloc

Message:

AEI2.08, AEIUpdater:

• Fixes #3

File:

• java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (modified) (7 diffs)

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 {