Changeset 776

Timestamp:

Apr 2, 2013, 2:16:52 AM (12 years ago)

Author:

alloc

Message:

AEI2.00:

• Added "-usewd" param to use working directory instead of jar path

Location:

java

Files:

• ProgramSettings/src/net/oni2/SettingsManager.java (modified) (3 diffs)
• installer2/src/net/oni2/aeinstaller/AEInstaller2.java (modified) (4 diffs)
• installer2/src/net/oni2/aeinstaller/backend/Paths.java (modified) (2 diffs)

java/ProgramSettings/src/net/oni2/SettingsManager.java

@@ -9 +9 @@
 import java.util.HashMap;
 
-
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.StaxDriver;
@@ -25 +24 @@
 
         private static boolean debugRun = false;
+        private static boolean useWorkingDir = false;
 
         private HashMap<String, Object> prefs = new HashMap<String, Object>();
@@ -55 +55 @@
         public static boolean isDebug() {
                 return debugRun;
+        }
+
+        /**
+         * @param useWd
+         *            Use working directory instead of jar path
+         */
+        public static void setUseWorkingDir(boolean useWd) {
+                useWorkingDir = useWd;
+        }
+
+        /**
+         * @return Do we want to use working directory
+         */
+        public static boolean getUseWorkingDir() {
+                return useWorkingDir;
         }
 

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

@@ -116 +116 @@
 
                 boolean debug = false;
+                boolean useWd = false;
                 boolean noCacheUpdate = false;
                 boolean offline = false;
@@ -125 +126 @@
                         if (a.equalsIgnoreCase("-offline"))
                                 offline = true;
+                        if (a.equalsIgnoreCase("-usewd"))
+                                useWd = true;
                 }
                 if (!debug) {
@@ -140 +143 @@
                 SettingsManager.deserializeFromFile(Paths.getSettingsFilename());
                 SettingsManager.setDebug(debug);
+                SettingsManager.setUseWorkingDir(useWd);
                 SettingsManager.getInstance().setNoCacheUpdateMode(noCacheUpdate);
 
@@ -257 +261 @@
                         try {
                                 int x = svn.checkSVN("http://svn.aei.oni2.net",
-                                                new File(Paths.getPrefsPath(), "bin"));
+                                                Paths.getJarPath());
                                 if (x > 0) {
                                         // Update available or missing files

java/installer2/src/net/oni2/aeinstaller/backend/Paths.java

@@ -32 +32 @@
          */
         public static File getInstallerPath() {
-                if (SettingsManager.isDebug()) {
+                if (SettingsManager.isDebug() || SettingsManager.getUseWorkingDir()) {
                         String wd = System.getProperty("user.dir");
                         return new File(wd);
                 } else {
-                        String jarPath = Paths.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().getParentFile();
+                        return getJarPath();
                 }
+        }
+
+        /**
+         * @return Path of jar
+         */
+        public static File getJarPath() {
+                String jarPath = Paths.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().getParentFile();
         }
 
@@ -108 +115 @@
          */
         public static File getVanillaGDF() {
-                return CaseInsensitiveFile.getCaseInsensitiveFile(getOniBasePath(), "GameDataFolder");
+                return CaseInsensitiveFile.getCaseInsensitiveFile(getOniBasePath(),
+                                "GameDataFolder");
         }