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

Timestamp:

Jan 10, 2013, 4:39:53 PM (12 years ago)

Author:

alloc

Message:

AEI2

Location:

AE/installer2/src/net/oni2/aeinstaller/backend/oni

Files:

• Installer.java (modified) (3 diffs)
• OniSplit.java (modified) (3 diffs)

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

@@ -39 +39 @@
         }
 
+        /**
+         * Install the given set of mods
+         * 
+         * @param mods
+         *            Mods to install
+         * @param listener
+         *            Listener for install progress updates
+         */
         public static void install(TreeSet<Mod> mods,
                         InstallProgressListener listener) {
-
                 Vector<File> folders = new Vector<File>();
                 folders.add(Paths.getVanillaOnisPath());
@@ -65 +72 @@
                 }
 
-                // for (File f : Paths.getModsPath().listFiles()) {
-                // File oni = new File(f, "oni");
-                // if (oni.exists())
-                // folders.add(oni);
-                // }
                 combineBinaryFiles(folders, listener);
 
@@ -140 +142 @@
                                 log.println();
                         }
-                        
+
                         Date end = new Date();
                         log.println("Initialization ended at " + sdf.format(end));

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

@@ -77 +77 @@
 
         /**
+         * @return Is Onisplit installed?
+         */
+        public static boolean isOniSplitInstalled() {
+                return getProgramFile().exists();
+        }
+
+        /**
          * Export given dat-file to target folder
          * 
@@ -112 +119 @@
          * @return OniSplit output
          */
-        public static Vector<String> importLevel(Vector<File> sourceFolders, File targetFile) {
+        public static Vector<String> importLevel(Vector<File> sourceFolders,
+                        File targetFile) {
                 Vector<String> cmdLine = getProgramInvocation();
                 cmdLine.add(getImportParam());
@@ -212 +220 @@
                 if (Settings.getPlatform() != Platform.WIN)
                         res.add("mono");
-                res.add(new File(new File(Paths.getEditionBasePath(), "Tools"),
-                                "Onisplit.exe").getPath());
-                return res;
+                res.add(getProgramFile().getPath());
+                return res;
+        }
+
+        private static File getProgramFile() {
+                return new File(new File(Paths.getEditionBasePath(), "Tools"),
+                                "Onisplit.exe");
         }
 }