Changeset 737 for java/installer2

Timestamp:

Mar 23, 2013, 1:21:28 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99w:

• Correct ordering when processing levels when initializing / installing

Location:

java/installer2

Files:

• .classpath (modified) (1 diff)
• src/net/oni2/aeinstaller/backend/oni/Installer.java (modified) (15 diffs)

java/installer2/.classpath

@@ -24 +24 @@
         <classpathentry kind="lib" path="/_ThirdPartyLibs/xstream-1.4.3.jar"/>
         <classpathentry combineaccessrules="false" kind="src" path="/SVNAccess"/>
+        <classpathentry kind="lib" path="/_ThirdPartyLibs/NaturalOrderComparator.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

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

@@ -37 +37 @@
 import org.javabuilders.swing.SwingJavaBuilder;
 
+import com.paour.NaturalOrderComparator;
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.StaxDriver;
@@ -226 +227 @@
                                                 || s.endsWith(".raw")
                                                 || s.endsWith(".sep")
-                                                || (s.equals("intro.bik") && !SettingsManager.getInstance()
-                                                                .get("copyintro", false))
-                                                || (s.equals("outro.bik") && !SettingsManager.getInstance()
-                                                                .get("copyoutro", false));
+                                                || (s.equals("intro.bik") && !SettingsManager
+                                                                .getInstance().get("copyintro", false))
+                                                || (s.equals("outro.bik") && !SettingsManager
+                                                                .getInstance().get("copyoutro", false));
                         }
                 })) {
@@ -313 +314 @@
                 }
 
-                TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>();
+                TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>(new NaturalOrderComparator());
                 for (File path : foldersOni) {
                         for (File levelF : path.listFiles()) {
@@ -407 +408 @@
                         File bslWin = CaseInsensitiveFile.getCaseInsensitiveFile(bsl,
                                         "win_only");
-                        if (PlatformInformation.getPlatform() == Platform.MACOS && bslMac.exists()) {
+                        if (PlatformInformation.getPlatform() == Platform.MACOS
+                                        && bslMac.exists()) {
                                 for (File f : bslMac.listFiles(dirFileFilter)) {
                                         File targetBSL = new File(targetBaseFolder, f.getName());
@@ -477 +479 @@
                 tmpFolder.mkdir();
 
-                HashMap<String, Vector<File>> patches = new HashMap<String, Vector<File>>();
+                TreeMap<String, Vector<File>> patches = new TreeMap<String, Vector<File>>(new NaturalOrderComparator());
                 for (File patchFolder : patchFolders) {
                         for (File levelFolder : patchFolder.listFiles(dirFileFilter)) {
@@ -509 +511 @@
                                         if (srcFolder.getPath().toLowerCase().contains("vanilla")) {
                                                 // Extract from .dat
-                                                ApplicationInvocationResult res = OniSplit.export(levelFolder,
-                                                                srcFolder, exportPatterns);
+                                                ApplicationInvocationResult res = OniSplit.export(
+                                                                levelFolder, srcFolder, exportPatterns);
                                                 logAppOutput(res, log);
                                         }
@@ -557 +559 @@
                         Vector<File> files = new Vector<File>();
                         files.add(new File(levelFolder, "*.oni"));
-                        ApplicationInvocationResult res = OniSplit.convertOniToXML(levelFolderXML,
-                                        files);
+                        ApplicationInvocationResult res = OniSplit.convertOniToXML(
+                                        levelFolderXML, files);
                         logAppOutput(res, log);
 
@@ -599 +601 @@
                 long startMS = new Date().getTime();
 
-                int totalSteps = 0;
+                int totalSteps = oniLevelFolders.size() + 1;
                 int stepsDone = 0;
-
-                for (@SuppressWarnings("unused")
-                String s : oniLevelFolders.keySet())
-                        totalSteps++;
-                totalSteps++;
 
                 log.println();
@@ -614 +611 @@
                                         "Installing level " + l);
 
-                        ApplicationInvocationResult res = OniSplit.packLevel(oniLevelFolders.get(l),
-                                        new File(Paths.getEditionGDF(), sanitizeLevelName(l)
-                                                        + ".dat"));
+                        ApplicationInvocationResult res = OniSplit.packLevel(
+                                        oniLevelFolders.get(l), new File(Paths.getEditionGDF(),
+                                                        sanitizeLevelName(l) + ".dat"));
                         logAppOutput(res, log);
 
@@ -690 +687 @@
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
-                for (@SuppressWarnings("unused")
-                File f : Paths.getVanillaGDF().listFiles(new FilenameFilter() {
+                TreeSet<File> levelFiles = new TreeSet<File>(
+                                new NaturalOrderComparator());
+
+                for (File f : Paths.getVanillaGDF().listFiles(new FilenameFilter() {
                         @Override
                         public boolean accept(File dir, String name) {
@@ -698 +697 @@
                 })) {
                         totalSteps++;
+                        levelFiles.add(f);
                 }
                 totalSteps = totalSteps * 2 + 2;
@@ -722 +722 @@
                         log.println("Exporting levels and moving files to level0");
 
-                        for (File f : Paths.getVanillaGDF().listFiles(new FilenameFilter() {
-                                @Override
-                                public boolean accept(File dir, String name) {
-                                        return name.endsWith(".dat");
-                                }
-                        })) {
+                        for (File f : levelFiles) {
                                 String levelName = f.getName().substring(0,
                                                 f.getName().indexOf('.'));
@@ -742 +737 @@
 
                                 // Export Vanilla-Level-Dat -> Temp/Level
-                                ApplicationInvocationResult res = OniSplit.export(tempLevelFolder, f);
+                                ApplicationInvocationResult res = OniSplit.export(
+                                                tempLevelFolder, f);
                                 logAppOutput(res, log);
 
@@ -753 +749 @@
 
                         log.println("Reimporting levels");
-
+                        TreeSet<File> initFolders = new TreeSet<File>(new NaturalOrderComparator());
                         for (File f : init.listFiles()) {
+                                initFolders.add(f);
+                        }
+
+                        for (File f : initFolders) {
                                 String levelName = f.getName();
 
@@ -923 +923 @@
         }
 
-        private static void logAppOutput(ApplicationInvocationResult result, PrintWriter log) {
+        private static void logAppOutput(ApplicationInvocationResult result,
+                        PrintWriter log) {
                 if (result != null) {
                         log.println("\t\t\tCalled:");