Changeset 13586 for trunk/gli/src/org/greenstone/gatherer/cdm/MacrosManager.java

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.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/MacrosManager.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/MacrosManager.java

@@ -41 +41 @@
 import java.io.OutputStreamWriter;
 
-import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.gui.DesignPaneHeader;
 import org.greenstone.gatherer.gui.GLIButton;
@@ -217 +217 @@
         // Users need to wait until the upload has finished before pressing Preview Collection!
         if (Gatherer.isGsdlRemote) {
-            String collection_name = Gatherer.c_man.getCollection().getName();
-            RemoteGreenstoneServer.uploadCollectionFile(collection_name, extra_dm_file);
+            RemoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), extra_dm_file);
         }
         }