Changeset 810 for java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java

Timestamp:

Apr 12, 2013, 8:05:40 PM (12 years ago)

Author:

alloc

Message:

AEI2.03:

• Fixes #7
• Fixes regression introduced by fixing #8

File:

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

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

@@ -113 +113 @@
                 }
                 HashSet<String> levelsAffectedNow = new HashSet<String>();
-                // TODO: fill set
 
                 File IGMD = new File(Paths.getEditionGDF(), "IGMD");
@@ -234 +233 @@
                 applyPatches(levels, foldersPatches, listener, log);
 
-                TreeSet<String> levelsAffectedBoth = new TreeSet<String>();
-                levelsAffectedBoth.addAll(levelsAffectedBefore);
-                levelsAffectedBoth.addAll(levelsAffectedNow);
+                TreeSet<String> levelsAffectedBoth = null;
+                if (levelsAffectedBefore != null) {
+                        levelsAffectedBoth = new TreeSet<String>();
+                        levelsAffectedBoth.addAll(levelsAffectedBefore);
+                        levelsAffectedBoth.addAll(levelsAffectedNow);
+                }
+
                 combineBinaryFiles(levels, levelsAffectedBoth, listener, log);
                 combineBSLFolders(mods, listener, log);
@@ -539 +542 @@
                                         "Installing level " + l);
 
-                        if (levelsUpdated.contains(l.toLowerCase())) {
+                        if ((levelsUpdated == null)
+                                        || levelsUpdated.contains(l.toLowerCase())) {
                                 ApplicationInvocationResult res = OniSplit.packLevel(
                                                 oniLevelFolders.get(l), new File(Paths.getEditionGDF(),