Changeset 648 for AE/installer2/src/net/oni2/aeinstaller/backend/oni

Timestamp:

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

Author:

alloc

Message:

AEI2 0.99e:

• Added forced offline mode (argument -offline)
• Fixed bug when displaying dependencies during installation
• Switched from term "mandatory" to "core" for always-install packages

File:

• AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java (modified) (10 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java

@@ -24 +24 @@
 import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.Settings.Platform;
-import net.oni2.aeinstaller.backend.mods.EBSLInstallType;
-import net.oni2.aeinstaller.backend.mods.Mod;
-import net.oni2.aeinstaller.backend.mods.ModManager;
+import net.oni2.aeinstaller.backend.packages.EBSLInstallType;
+import net.oni2.aeinstaller.backend.packages.Package;
+import net.oni2.aeinstaller.backend.packages.PackageManager;
 
 import org.apache.commons.io.FileUtils;
@@ -62 +62 @@
         public static Vector<Integer> getInstalledMods() {
                 File installCfg = new File(Paths.getEditionGDF(), "installed_mods.xml");
-                return ModManager.getInstance().loadModSelection(installCfg);
+                return PackageManager.getInstance().loadModSelection(installCfg);
         }
 
@@ -109 +109 @@
          *            Tools to install
          */
-        public static void installTools(TreeSet<Mod> tools) {
+        public static void installTools(TreeSet<Package> tools) {
                 TreeSet<Integer> installed = getInstalledTools();
-                for (Mod m : tools) {
+                for (Package m : tools) {
                         File plain = new File(m.getLocalPath(), "plain");
                         if (plain.exists()) {
@@ -138 +138 @@
          *            Tools to uninstall
          */
-        public static void uninstallTools(TreeSet<Mod> tools) {
+        public static void uninstallTools(TreeSet<Package> tools) {
                 TreeSet<Integer> installed = getInstalledTools();
-                for (Mod m : tools) {
+                for (Package m : tools) {
                         if (installed.contains(m.getPackageNumber())) {
                                 File plain = new File(m.getLocalPath(), "plain");
@@ -205 +205 @@
          *            Listener for install progress updates
          */
-        public static void install(TreeSet<Mod> mods,
+        public static void install(TreeSet<Package> mods,
                         InstallProgressListener listener) {
                 try {
@@ -214 +214 @@
 
                 File installCfg = new File(Paths.getEditionGDF(), "installed_mods.xml");
-                ModManager.getInstance().saveModSelection(installCfg, mods);
+                PackageManager.getInstance().saveModSelection(installCfg, mods);
 
                 HashSet<Integer> unlockLevels = new HashSet<Integer>();
@@ -221 +221 @@
                 foldersOni.add(Paths.getVanillaOnisPath());
 
-                for (Mod m : mods) {
+                for (Package m : mods) {
                         for (int lev : m.getUnlockLevels())
                                 unlockLevels.add(lev);
@@ -253 +253 @@
         }
 
-        private static void combineBSLFolders(TreeSet<Mod> mods,
+        private static void combineBSLFolders(TreeSet<Package> mods,
                         InstallProgressListener listener) {
                 listener.installProgressUpdate(95, 100, "Installing BSL files");
 
-                HashMap<EBSLInstallType, Vector<Mod>> modsToInclude = new HashMap<EBSLInstallType, Vector<Mod>>();
-                modsToInclude.put(EBSLInstallType.NORMAL, new Vector<Mod>());
-                modsToInclude.put(EBSLInstallType.ADDON, new Vector<Mod>());
-
-                for (Mod m : mods.descendingSet()) {
+                HashMap<EBSLInstallType, Vector<Package>> modsToInclude = new HashMap<EBSLInstallType, Vector<Package>>();
+                modsToInclude.put(EBSLInstallType.NORMAL, new Vector<Package>());
+                modsToInclude.put(EBSLInstallType.ADDON, new Vector<Package>());
+
+                for (Package m : mods.descendingSet()) {
                         File bsl = new File(m.getLocalPath(), "bsl");
                         if (bsl.exists()) {
@@ -281 +281 @@
                 }
 
-                for (Mod m : modsToInclude.get(EBSLInstallType.NORMAL)) {
+                for (Package m : modsToInclude.get(EBSLInstallType.NORMAL)) {
                         copyBSL(m, false);
                 }
-                Vector<Mod> addons = modsToInclude.get(EBSLInstallType.ADDON);
+                Vector<Package> addons = modsToInclude.get(EBSLInstallType.ADDON);
                 for (int i = addons.size() - 1; i >= 0; i--) {
                         copyBSL(addons.get(i), true);
@@ -290 +290 @@
         }
 
-        private static void copyBSL(Mod sourceMod, boolean addon) {
+        private static void copyBSL(Package sourceMod, boolean addon) {
                 File targetBaseFolder = new File(Paths.getEditionGDF(), "IGMD");
                 if (!targetBaseFolder.exists())