Changeset 13586 for trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.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/GeneralManager.java (modified) (5 diffs)

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

@@ -38 +38 @@
 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.EmailField;
@@ -152 +153 @@
         
         JLabel short_name_label = new JLabel(Dictionary.get("NewCollectionPrompt.Collection_Name"));
-        JTextField short_name_textfield = new JTextField(Gatherer.c_man.getCollection().getName());
+        JTextField short_name_textfield = new JTextField(CollectionManager.getLoadedCollectionName());
         short_name_textfield.setEditable(false);
         short_name_textfield.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
@@ -317 +318 @@
 
         public BrowseListener(String prefix_raw) {
-        this.prefix = prefix_raw.replaceAll(StaticStrings.COLNAME_PATTERN, Gatherer.c_man.getCollection().getName());
+        this.prefix = prefix_raw.replaceAll(StaticStrings.COLNAME_PATTERN, CollectionManager.getLoadedCollectionName());
         }
 
@@ -346 +347 @@
                 // If we're using a remote Greenstone server, upload the image
                 if (Gatherer.isGsdlRemote) {
-                RemoteGreenstoneServer.uploadCollectionFile(Gatherer.c_man.getCollection().getName(), collection_image_file);
+                RemoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), collection_image_file);
                 }
             }
@@ -415 +416 @@
         // Set the title
         String collection_title = name_textfield.getText();
-        String collection_name = Gatherer.c_man.getCollection().getName();
+        String collection_name = CollectionManager.getLoadedCollectionName();
         Gatherer.g_man.setTitle(collection_title, collection_name);
                 collection_name_collectionmeta.setValue(name_textfield.getText());