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

Timestamp:

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

Author:

alloc

Message:

AEI: OniSplit / globalization

Location:

AE/installer2/src/net/oni2/aeinstaller/backend

Files:

• OniSplit.java (deleted)
• Paths.java (added)
• Settings.java (modified) (2 diffs)
• StuffToRefactorLater.java (modified) (2 diffs)
• oni (added)
• oni/Installer.java (added)
• oni/OniSplit.java (added)

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();
         }
 }