Changeset 13586 for trunk/gli/src/org/greenstone/gatherer/gui

Timestamp:

2007-01-12T14:05:00+13:00 (17 years ago)

Author:

mdewsnip

Message:

Added a static getLoadedCollectionName() function into CollectionManager, as part of making CollectionManager fully static.

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• DeleteCollectionPrompt.java (modified) (2 diffs)
• ExplodeMetadataDatabasePrompt.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/DeleteCollectionPrompt.java

@@ -48 +48 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
+import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.file.WorkspaceTree;  // !!! Don't like this here
 import org.greenstone.gatherer.util.ArrayTools;
@@ -293 +294 @@
         Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED);
 
-        if (Gatherer.c_man.getCollection() != null && collection.getShortName().equals(Gatherer.c_man.getCollection().getName())) {
+        if (Gatherer.c_man.getCollection() != null && collection.getShortName().equals(CollectionManager.getLoadedCollectionName())) {
             current_coll_deleted = true;
         }

trunk/gli/src/org/greenstone/gatherer/gui/ExplodeMetadataDatabasePrompt.java

@@ -271 +271 @@
     else {
         // Add in the filename, relative to the collection directory
-        String collection_name = Gatherer.c_man.getCollection().getName();
+        String collection_name = CollectionManager.getLoadedCollectionName();
         String collection_directory_path = CollectionManager.getCollectionDirectoryPath(collection_name);
         String metadata_file_relative_path = RemoteGreenstoneServer.getPathRelativeToDirectory(metadata_file, collection_directory_path);
@@ -344 +344 @@
         if (Gatherer.isGsdlRemote) {
             Utility.delete(metadata_file.getParentFile());
-            RemoteGreenstoneServer.downloadCollectionFile(Gatherer.c_man.getCollection().getName(), metadata_file.getParentFile());
+            RemoteGreenstoneServer.downloadCollectionFile(CollectionManager.getLoadedCollectionName(), metadata_file.getParentFile());
         }