Changeset 599

Timestamp:

Jan 4, 2013, 1:41:22 PM (12 years ago)

Author:

alloc

Message:

 

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• AEInstaller2.java (modified) (3 diffs)
• backend/oni/Installer.java (modified) (3 diffs)

AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.40
+appversion=0.41
 
 invalidPath.title=Wrong directory

AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

@@ -20 +20 @@
 import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.aeinstaller.backend.Settings;
+import net.oni2.aeinstaller.backend.SizeFormatter;
 import net.oni2.aeinstaller.backend.Settings.Platform;
 import net.oni2.aeinstaller.backend.StuffToRefactorLater;
@@ -136 +137 @@
                 System.out.println("Globalized:" + Installer.isEditionInitialized());
 
+                System.out.println("Free space on temp: " + SizeFormatter.format(Paths.getTempPath().getUsableSpace(), 3));
+                System.out.println("Free space on Jar:  " + SizeFormatter.format(Paths.getInstallerPath().getUsableSpace(), 3));
+                
                 if (!StuffToRefactorLater.verifyRunningDirectory()) {
                         JOptionPane.showMessageDialog(null,
@@ -145 +149 @@
                         }
                 } else {
-//                      Installer.initializeEdition();
+                        Installer.initializeEdition();
                         Installer.install(new TreeSet<Mod>());
                 }

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

@@ -228 +228 @@
                         else if (f.getName().startsWith("ONSK")
                                         || f.getName().startsWith("TXMP")) {
-                                // TODO ? new File(tempFolder, "TexFix").mkdir();
                                 File level0File = new File(level0Folder, f.getName());
                                 moveFileToTargetOrDelete(f, level0File);
@@ -240 +239 @@
                                         || f.getName().startsWith("TRSC")
                                         || f.getName().startsWith("TRAS")) {
-                                // File level0FolderCharactersVanilla = new File(
-                                // level0FolderVanilla, "characters");
-                                // File level0FileVanilla = new File(
-                                // level0FolderCharactersVanilla, f.getName());
-                                // moveFileToTargetOrDelete(f, level0FileVanilla);
-                                // TODO: does this work?
                                 File level0File = new File(level0Folder, f.getName());
                                 moveFileToTargetOrDelete(f, level0File);
@@ -273 +266 @@
                                 f.delete();
                         }
-                        // TODO: needed? ONWC to GDF instead?
-                        // Move matching files to *VANILLADATS*/level0_Final/level0_Final/
-                        // fix for buggy ONWC overriding
+                        // Move matching files to /level0_Final/
                         else if (f.getName().startsWith("ONWC")) {
-                                // File level0FileVanilla = new File(level0FolderVanilla,
-                                // f.getName());
-                                // moveFileToTargetOrDelete(f, level0FileVanilla);
-                                // TODO: does this work?
                                 File level0File = new File(level0Folder, f.getName());
                                 moveFileToTargetOrDelete(f, level0File);