Changeset 504 for trunk/src/org/expeditee/gui/UserSettings.java

Timestamp:

11/19/13 12:01:52 (11 years ago)

Author:

jts21

Message:

New copy/paste handling, add pdfImporter, add dictionary and documentation to resources, other small changes

File:

• trunk/src/org/expeditee/gui/UserSettings.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/UserSettings.java

@@ -74 +74 @@
         static {
                 String expeditee_home = System.getProperty("expeditee.home");
-
                 if (expeditee_home != null) {
-                    FrameIO.changeParentFolder(expeditee_home + File.separator);
-                }
-                else {
-                    String jarPath = getJarLocation();
-
-                    if (jarPath != null){
-                        FrameIO.changeParentFolder(jarPath);
-                    }
-                    else {
-
-                        FrameIO.changeParentFolder("." + File.separator + "expeditee"
-                                                   + File.separator);
-                    }
-                }
-
+            FrameIO.changeParentFolder(expeditee_home + File.separator);
+        } else {
+                FrameIO.changeParentFolder(getSaveLocation());
+        }
+          
                 UserSettings.FrameDirs.add(FrameIO.FRAME_PATH);
                 UserSettings.FrameDirs.add(FrameIO.PUBLIC_PATH);
@@ -100 +89 @@
 
         /**
-         * Find where abouts the Jar is located that is running expeditee. The
-         * reason for this was so that the framesets could be stored in the same
-         * location as the jar file for now. Using the current directory fails to
-         * achieve this as the current directory not the same as the directory the
-         * jar is stored in if the user double clicks on the jar file in Linux or
-         * runs the jar from the command line from another directory.
-         * 
-         * @return the full path location of the Jar
+         * Find the appropriate directory to store application settings in for
+         * the current OS.
+         * This has only been tested on Linux so far, so if it doesn't work it
+         * may need to be modified or reverted. Should return:
+         *      Linux: ~/.expeditee
+         *      Windows: %appdata%\.expeditee
+         *      Mac: ~/Library/Application\ Support/.expeditee
+         * @return the path to store expeditee's settings
          */
-        public static String getJarLocation() {
-                // Get a File object for the package
-                File directory = null;
-
-                ClassLoader cld = Thread.currentThread().getContextClassLoader();
-                URL resource = cld.getResource("org");
-                directory = new File(resource.getFile());
-
-                int splitPoint = directory.getPath().indexOf('!');
-                if (splitPoint > 0) {
-                        String jarName = directory.getPath().substring("file:".length(),
-                                        splitPoint);
-                        // Windows HACK
-                        if (jarName.indexOf(":") >= 0)
-                                jarName = jarName.substring(1);
-
-                        if (jarName.indexOf("%20") > 0) {
-                                jarName = jarName.replace("%20", " ");
-                        }
-
-                        int lastFileSeparator = jarName.lastIndexOf(File.separator);
-                        
-                        DisplayIO.TITLE = jarName.substring(lastFileSeparator + 1, jarName.length() - 4);
-                        
-                        return jarName.substring(0, lastFileSeparator + 1);
+        public static String getSaveLocation() {
+                String OS=System.getProperty("os.name").toLowerCase();
+                if(OS.indexOf("win")>0) {                       //windoze
+                        return System.getenv("APPDATA")+File.separator+".expeditee"+File.separator;
+                } else if(OS.indexOf("mac")>0) {        //mac
+                        return System.getProperty("user.home")+File.separator+"Library"+File.separator+"Application Support"+File.separator+".expeditee"+File.separator;
+                } else {                                                        //linux or other
+                        return System.getProperty("user.home")+File.separator+".expeditee"+File.separator;
                 }
-                return null;
         }
 }