Changeset 988 for java/installer2/src/net/oni2

Timestamp:

Mar 29, 2014, 11:26:44 PM (11 years ago)

Author:

alloc

Message:

AEI: Minor code changes

Location:

java/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller2.java (modified) (2 diffs)
• backend/oni/management/Installer.java (modified) (5 diffs)
• backend/oni/management/Logger.java (modified) (1 diff)
• localization/MainWin.properties (modified) (1 diff)

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

@@ -116 +116 @@
          */
         public static void main(String[] args) {
+                if (PlatformInformation.getPlatform() == Platform.MACOS)
+                        initMacOS();
+
                 Paths.getPrefsPath().mkdirs();
                 Paths.getDownloadPath().mkdirs();
@@ -139 +142 @@
                         }
                 }
-
-                if (PlatformInformation.getPlatform() == Platform.MACOS)
-                        initMacOS();
 
                 SettingsManager.deserializeFromFile(Paths.getSettingsFilename());

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

@@ -4 +4 @@
 import java.io.FileFilter;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -22 +25 @@
 import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
 import net.oni2.aeinstaller.backend.Paths;
+import net.oni2.aeinstaller.backend.RuntimeOptions;
 import net.oni2.aeinstaller.backend.oni.OniSplit;
 import net.oni2.aeinstaller.backend.oni.PersistDat;
@@ -485 +489 @@
                         PrintWriter masterpatchWriter = null;
                         try {
-                                masterpatchWriter = new PrintWriter(masterpatch);
+                                masterpatchWriter = new PrintWriter(new OutputStreamWriter(
+                                                new FileOutputStream(masterpatch), "UTF-8"));
                         } catch (FileNotFoundException e) {
+                                e.printStackTrace();
+                        } catch (UnsupportedEncodingException e) {
                                 e.printStackTrace();
                         }
@@ -502 +509 @@
                         // Apply patches through masterpatch in levelFolderXML
                         res = XMLTools.patch(masterpatch);
-                        log.logAppOutput(res, false);
+                        log.logAppOutput(res, true);
 
                         // Create .oni files from XML
@@ -510 +517 @@
                         log.logAppOutput(res, true);
 
-                        // Remove XML folder as import will only require .oni's
-                        try {
-                                FileUtils.deleteDirectory(levelFolderXML);
-                        } catch (IOException e) {
-                                e.printStackTrace();
+                        if (!RuntimeOptions.isDebug()) {
+                                // Remove XML folder as import will only require .oni's
+                                try {
+                                        FileUtils.deleteDirectory(levelFolderXML);
+                                } catch (IOException e) {
+                                        e.printStackTrace();
+                                }
                         }
 

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

@@ -81 +81 @@
                         log.println("\t\t\tDuration: " + result.time + " ms");
                         log.println();
+                } else {
+                        log.println("\t\t\tExecution of external tool failed.");
                 }
         }

java/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties

@@ -26 +26 @@
 menu.copyConfigTooltip=Copies the currently installed mods to clipboard in format for posting on OCF
 
-menu.corePackages=&Show core packages
+menu.corePackages=About core packages
 menu.corePackagesTooltip=View which core packages are used
 menu.reglobalize=&Re-initialize Edition