Changeset 490

Timestamp:

10/23/13 16:01:15 (11 years ago)

Author:

davidb

Message:

Support for specifying where expeditee home should be through the self-named java Property

File:

• trunk/src/org/expeditee/gui/UserSettings.java (modified) (1 diff)

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

@@ -73 +73 @@
         // add default values
         static {
-                String jarPath = getJarLocation();
-                if (jarPath != null){
+                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);
+                    }
                 }
-                else
-                        FrameIO.changeParentFolder("." + File.separator + "expeditee"
-                                        + File.separator);
 
                 UserSettings.FrameDirs.add(FrameIO.FRAME_PATH);