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

Timestamp:

2010-10-04T15:49:27+13:00 (14 years ago)

Author:

ak19

Message:

More changes to 2. Gatherer.java to allow empty string into config.xml for when the current collect dir is the default collect dir and 2. swapping between user names in applet (no longer loads open collections, because all collections are closed on exiting the applet).

File:

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

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

@@ -507 +507 @@
         // in applets when other users on a machine want to use an applet and GLI wants to load
         // a collection left open from a previous session and *requires* the old user to authenticate
-        if(!Gatherer.isGsdlRemote) {
+        if(Gatherer.isGsdlRemote) {
+            Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), 
+                    true, "");          
+        } else {
             Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(), 
                     true, CollectionManager.getLoadedCollectionColFilePath());
@@ -515 +518 @@
     else {
         // if there was no open collection, then write out the collect dir path for next time
-        // IF this is not the default collect directory
-        if(Gatherer.getCollectDirectoryPath().equals(
+        // IF this is not the default collect directory and not a remote GLI/applet
+        if(Gatherer.isGsdlRemote || Gatherer.getCollectDirectoryPath().equals(
                 Gatherer.getDefaultGSCollectDirectoryPath(true))) { 
             Configuration.setString("general.open_collection"+Configuration.gliPropertyNameSuffix(),