Changeset 596 for AE/installer2/src/net/oni2/aeinstaller

Timestamp:

Jan 2, 2013, 6:00:16 PM (12 years ago)

Author:

alloc

Message:

AEI: OniSplit / globalization

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller2.java (modified) (8 diffs)
• backend/OniSplit.java (deleted)
• backend/Paths.java (added)
• backend/Settings.java (modified) (2 diffs)
• backend/StuffToRefactorLater.java (modified) (2 diffs)
• backend/oni (added)
• backend/oni/Installer.java (added)
• backend/oni/OniSplit.java (added)
• gui/MainWin.java (modified) (4 diffs)

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

@@ -17 +17 @@
 import javax.swing.UIManager.LookAndFeelInfo;
 
-import net.oni2.aeinstaller.backend.OniSplit;
+import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.Settings.Platform;
 import net.oni2.aeinstaller.backend.StuffToRefactorLater;
 import net.oni2.aeinstaller.backend.depot.DepotManager;
+import net.oni2.aeinstaller.backend.oni.Installer;
+import net.oni2.aeinstaller.backend.oni.OniSplit;
 import net.oni2.aeinstaller.gui.MainWin;
 
@@ -62 +64 @@
          */
         public static void main(String[] args) {
-                new File(Settings.getPrefsPath()).mkdirs();
-                new File(Settings.getDownloadPath()).mkdirs();
+                Paths.getPrefsPath().mkdirs();
+                Paths.getDownloadPath().mkdirs();
 
                 boolean debug = false;
@@ -71 +73 @@
                 if (!debug) {
                         try {
-                                System.setOut(new PrintStream(Settings.getPrefsPath()
-                                                + "aei_output.log"));
-                                System.setErr(new PrintStream(Settings.getPrefsPath()
-                                                + "aei_error.log"));
+                                System.setOut(new PrintStream(new File(Paths.getPrefsPath(),
+                                                "aei_output.log")));
+                                System.setErr(new PrintStream(new File(Paths.getPrefsPath(),
+                                                "aei_error.log")));
                         } catch (FileNotFoundException e1) {
                                 e1.printStackTrace();
@@ -86 +88 @@
                 Settings.setDebug(debug);
                 DepotManager.getInstance().loadFromFile(
-                                new File(Settings.getDepotCacheFilename()));
+                                Settings.getDepotCacheFilename());
 
                 SwingJavaBuilder.getConfig().addResourceBundle(imagesBundle);
@@ -96 +98 @@
                 System.setProperty("networkaddress.cache.ttl", "5");
                 System.setProperty("networkaddress.cache.negative.ttl", "1");
-                
+
                 try {
                         String laf = Settings.getInstance().get("lookandfeel",
@@ -120 +122 @@
 
                 // TODO
-                System.out.println("JarPath:   " + Settings.getJarPath());
-                System.out.println("PrefsPath: " + Settings.getPrefsPath());
-                System.out.println("DataPath:  " + Settings.getDataPath());
-                System.out.println("DownPath:  " + Settings.getDownloadPath());
-                System.out.println("TempPath:  " + Settings.getTempPath());
+                System.out.println("JarPath:   " + Paths.getInstallerPath());
+                System.out.println("PrefsPath: " + Paths.getPrefsPath());
+                System.out.println("DataPath:  " + Paths.getModsPath());
+                System.out.println("DownPath:  " + Paths.getDownloadPath());
+                System.out.println("TempPath:  " + Paths.getTempPath());
                 System.out.println("ValidPath: "
                                 + StuffToRefactorLater.verifyRunningDirectory());
@@ -130 +132 @@
                 System.out.println("Architect: " + Settings.getArchitecture());
                 System.out.println(".NET:      " + OniSplit.isDotNETInstalled());
+                System.out.println("Globalized:" + Installer.isEditionInitialized());
 
                 if (!StuffToRefactorLater.verifyRunningDirectory()) {
@@ -139 +142 @@
                                 return;
                         }
+                } else {
+                        Installer.initializeEdition();
                 }
 

AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java

@@ -7 +7 @@
 import java.io.IOException;
 import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.Vector;
@@ -142 +140 @@
 
         /**
-         * Get the Jar path
-         * 
-         * @return Path
-         */
-        public static String getJarPath() {
-                String jarPath = Settings.class.getProtectionDomain().getCodeSource()
-                                .getLocation().getPath();
-                String decodedPath = null;
-                try {
-                        decodedPath = URLDecoder.decode(jarPath, "UTF-8");
-                } catch (UnsupportedEncodingException e) {
-                        e.printStackTrace();
-                }
-                return new File(decodedPath).getParentFile().getPath() + "/";
-        }
-
-        /**
-         * Get the preferences path
-         * 
-         * @return Path
-         */
-        public static String getPrefsPath() {
-                return getJarPath();
-        }
-
-        /**
-         * Get the path to store downloaded files
-         * 
-         * @return Download path
-         */
-        public static String getDownloadPath() {
-                return getTempPath() + "oni_aei/";
-        }
-
-        /**
-         * Get the path to store game information data
-         * 
-         * @return Data path
-         */
-        public static String getDataPath() {
-                return getJarPath() + "mods/";
-        }
-
-        /**
-         * Get the systems temp-path
-         * 
-         * @return Path
-         */
-        public static String getTempPath() {
-                return new File(System.getProperty("java.io.tmpdir")).getPath() + "/";
-        }
-
-        /**
          * @return Mod Depot cache filename
          */
-        public static String getDepotCacheFilename() {
-                return Settings.getPrefsPath() + "ModDepotCache.xml";
-        }
-
-        private static String getSettingsFilename() {
-                return Settings.getPrefsPath() + "AEI-Settings.xml";
+        public static File getDepotCacheFilename() {
+                return new File(Paths.getPrefsPath(), "ModDepotCache.xml");
+        }
+
+        private static File getSettingsFilename() {
+                return new File(Paths.getPrefsPath(), "AEI-Settings.xml");
         }
 

AE/installer2/src/net/oni2/aeinstaller/backend/StuffToRefactorLater.java

@@ -1 +1 @@
 package net.oni2.aeinstaller.backend;
 
-import java.io.File;
 
 public class StuffToRefactorLater {
@@ -9 +8 @@
          */
         public static boolean verifyRunningDirectory() {
-                File jarPath = new File(Settings.getJarPath());
-                File parentPath = jarPath.getParentFile().getParentFile();
-                File gdf = new File(parentPath, "GameDataFolder");
-                return gdf.exists() && gdf.isDirectory();
+                return Paths.getVanillaGDF().exists() && Paths.getVanillaGDF().isDirectory();
         }
 }

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

@@ -2 +2 @@
 
 import java.awt.Frame;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -190 +189 @@
         private void saveLocalData() {
                 Settings.getInstance().serializeToFile();
-                DepotManager.getInstance().saveToFile(
-                                new File(Settings.getDepotCacheFilename()));
+                DepotManager.getInstance().saveToFile(Settings.getDepotCacheFilename());
         }
 
@@ -264 +262 @@
                                 JOptionPane.INFORMATION_MESSAGE);
         }
-        
+
         @SuppressWarnings("unused")
         private void revertSelection() {
@@ -271 +269 @@
                                 JOptionPane.INFORMATION_MESSAGE);
         }
-        
-        
 
         private void modSelection(NodeMod n) {