Changeset 852 for java/installer2/src/net/oni2/aeinstaller/gui

Timestamp:

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

Author:

alloc

Message:

AEI2.08, AEIUpdater:

• Fixes #3

Location:

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

Files:

• MainWin.java (modified) (5 diffs)
• settings/SettingsDialog.java (modified) (2 diffs)
• toolmanager/ToolManager.java (modified) (2 diffs)

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"),