Changeset 23015 for main/trunk/gli/src/org/greenstone/gatherer/gui

Timestamp:

2010-10-02T22:11:29+13:00 (14 years ago)

Author:

ak19

Message:

Again for ticket 152 (moveable collectdir). If the default GS collectdir is the one active in GLI (but all collections are closed) when exiting GLI, this default GS collectdir is not stored in config.xml (in the User Data location). Instead of the last opened collection or last open collectdir, an empty value is written out in the case of the default GS collectdir. This will allow other GS installations to open in their own collectdir. The benefits do not extend to if a collection in another GS' default collectdir was left open. In that case, the collection path is written out to the config.xml file, and the collectdir that a different GLI loads will be the old GLI's collect dir.

File:

• main/trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

@@ -510 +510 @@
     else {
         // if there was no open collection, then write out the collect dir path for next time
-        Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), 
-                    true, Gatherer.getCollectDirectoryPath()); // null
+        // IF this is not the default collect directory
+        if(Gatherer.getCollectDirectoryPath().equals(
+                Gatherer.getDefaultGSCollectDirectoryPath(true))) { 
+            Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), 
+                    true, "");
+        } else {
+            Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), 
+                    true, Gatherer.getCollectDirectoryPath());
+        }
     }