Changeset 649 for AE/installer2/src/net

Timestamp:

Jan 25, 2013, 1:25:29 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99e:

• Added "-nocacheupdate" argument to prevent from updating local Depot cache

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller2.java (modified) (4 diffs)
• backend/Settings.java (modified) (2 diffs)
• gui/MainWin.java (modified) (1 diff)

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

@@ -70 +70 @@
 
                 boolean debug = false;
-                for (String a : args)
+                boolean noCacheUpdate = false;
+                for (String a : args) {
                         if (a.equalsIgnoreCase("-debug"))
                                 debug = true;
+                        if (a.equalsIgnoreCase("-nocacheupdate"))
+                                noCacheUpdate = true;
+                }
                 if (!debug) {
                         try {
@@ -90 +94 @@
                 Settings.deserializeFromFile();
                 Settings.setDebug(debug);
+                Settings.getInstance().setNoCacheUpdateMode(noCacheUpdate);
 
                 SwingJavaBuilder.getConfig().addResourceBundle(imagesBundle);
@@ -185 +190 @@
                 }
 
-                boolean forcedOffline = false;
+                boolean offline = false;
                 for (String a : args)
                         if (a.equalsIgnoreCase("-offline"))
-                                forcedOffline = true;
-
-                boolean offline = !DepotManager.getInstance().checkConnection();
-
-                if (forcedOffline || offline) {
+                                offline = true;
+                if (!offline) {
+                        offline = !DepotManager.getInstance().checkConnection();
+                }
+                if (offline) {
                         JOptionPane.showMessageDialog(null,
                                         globalBundle.getString("offlineModeStartup.text"),
@@ -198 +203 @@
                                         JOptionPane.INFORMATION_MESSAGE);
                 }
-                Settings.getInstance().setOfflineMode(forcedOffline || offline);
+                Settings.getInstance().setOfflineMode(offline);
 
                 SwingUtilities.invokeLater(new Runnable() {

AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java

@@ -67 +67 @@
 
         private boolean offlineMode = false;
+        private boolean noCacheUpdate = false;
 
         /**
@@ -178 +179 @@
 
         /**
+         * @return Is in noCacheUpdate mode?
+         */
+        public boolean isNoCacheUpdateMode() {
+                return noCacheUpdate;
+        }
+
+        /**
+         * @param noCacheUpdate
+         *            Is in noCacheUpdate mode?
+         */
+        public void setNoCacheUpdateMode(boolean noCacheUpdate) {
+                this.noCacheUpdate = noCacheUpdate;
+        }
+
+        /**
          * @return Mod Depot cache filename
          */

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

@@ -174 +174 @@
         @DoInBackground(progressMessage = "updateDepot.title", cancelable = false, indeterminateProgress = false)
         private void execDepotUpdate(final BackgroundEvent evt) {
-                if (!Settings.getInstance().isOfflineMode()) {
+                if (!Settings.getInstance().isOfflineMode() && !Settings.getInstance().isNoCacheUpdateMode()) {
                         long start = new Date().getTime();