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

Timestamp:

Mar 26, 2013, 6:26:41 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99x:

• Refactoring

Location:

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

Files:

• MainWin.java (modified) (9 diffs)
• toolmanager/ToolManager.java (modified) (3 diffs)

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

@@ -45 +45 @@
 import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.aeinstaller.backend.SizeFormatter;
-import net.oni2.aeinstaller.backend.depot.DepotManager;
-import net.oni2.aeinstaller.backend.oni.InstallProgressListener;
-import net.oni2.aeinstaller.backend.oni.Installer;
 import net.oni2.aeinstaller.backend.oni.OniLauncher;
 import net.oni2.aeinstaller.backend.oni.OniSplit;
+import net.oni2.aeinstaller.backend.oni.management.Initializer;
+import net.oni2.aeinstaller.backend.oni.management.InstallProgressListener;
+import net.oni2.aeinstaller.backend.oni.management.Installer;
+import net.oni2.aeinstaller.backend.oni.management.ToolsManager;
 import net.oni2.aeinstaller.backend.packages.Package;
 import net.oni2.aeinstaller.backend.packages.PackageManager;
@@ -67 +68 @@
 import net.oni2.aeinstaller.gui.settings.SettingsDialog;
 import net.oni2.aeinstaller.gui.toolmanager.ToolManager;
+import net.oni2.moddepot.DepotManager;
 import net.oni2.platformtools.PlatformInformation;
 import net.oni2.platformtools.PlatformInformation.Platform;
@@ -205 +207 @@
         @DoInBackground(progressMessage = "updateDepot.title", cancelable = false, indeterminateProgress = false)
         private void execDepotUpdate(final BackgroundEvent evt) {
+                DepotManager.loadFromCacheFile(Paths.getDepotCacheFilename());
+
                 if (!SettingsManager.getInstance().isOfflineMode()
                                 && !SettingsManager.getInstance().isNoCacheUpdateMode()) {
                         long start = new Date().getTime();
 
-                        try {
-                                DepotManager.getInstance().updateInformation();
-                        } catch (Exception e) {
-                                e.printStackTrace();
-                        }
+                        if (DepotManager.getInstance().updateInformation())
+                                DepotManager.getInstance().saveToCacheFile(
+                                                Paths.getDepotCacheFilename());
 
                         System.out.println("Took: " + (new Date().getTime() - start)
@@ -360 +362 @@
                                 dl.setVisible(true);
                                 if (dl.isFinished()) {
-                                        TreeSet<Integer> installed = Installer.getInstalledTools();
+                                        TreeSet<Integer> installed = ToolsManager
+                                                        .getInstalledTools();
                                         TreeSet<Package> tools = new TreeSet<Package>();
                                         for (Package m : execUpdates)
@@ -367 +370 @@
                                                         tools.add(m);
                                         if (tools.size() > 0) {
-                                                Installer.installTools(tools, false);
+                                                ToolsManager.installTools(tools, false);
                                         }
                                 }
@@ -461 +464 @@
         @DoInBackground(progressMessage = "initializingEdition.title", cancelable = false, indeterminateProgress = false)
         private void reglobalize(final BackgroundEvent evt) {
-                Installer.initializeEdition(new InstallProgressListener() {
+                Initializer.initializeEdition(new InstallProgressListener() {
                         @Override
                         public void installProgressUpdate(int done, int total, String step) {
@@ -580 +583 @@
                         }
                         evt.setProgressMessage(bundle.getString("coreToolsInstall.title"));
-                        Installer.installTools(PackageManager.getInstance().getCoreTools(),
-                                        false);
+                        ToolsManager.installTools(PackageManager.getInstance()
+                                        .getCoreTools(), false);
                 }
         }
@@ -731 +734 @@
 
                         if (actuallyTools.size() > 0) {
-                                Installer.installTools(actuallyTools, false);
+                                ToolsManager.installTools(actuallyTools, false);
                         }
                 }
@@ -847 +850 @@
         private void initialize(final BackgroundEvent evt) {
                 if (!Installer.isEditionInitialized()) {
-                        Installer.initializeEdition(new InstallProgressListener() {
+                        Initializer.initializeEdition(new InstallProgressListener() {
                                 @Override
                                 public void installProgressUpdate(int done, int total,

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

@@ -18 +18 @@
 
 import net.oni2.SettingsManager;
-import net.oni2.aeinstaller.backend.oni.Installer;
+import net.oni2.aeinstaller.backend.oni.management.ToolsManager;
 import net.oni2.aeinstaller.backend.packages.Package;
 import net.oni2.aeinstaller.gui.downloadwindow.Downloader;
@@ -97 +97 @@
                                 TreeSet<Package> tools = new TreeSet<Package>();
                                 tools.add(selectedPackage);
-                                Installer.installTools(tools, true);
+                                ToolsManager.installTools(tools, true);
                         } else {
                                 if (!selectedPackage.isLocalAvailable()) {
@@ -123 +123 @@
                                 TreeSet<Package> tools = new TreeSet<Package>();
                                 tools.add(selectedPackage);
-                                Installer.installTools(tools, false);
+                                ToolsManager.installTools(tools, false);
                         }
                 }