Changeset 13586 for trunk

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

Files:

• cdm/CollectionConfiguration.java (modified) (2 diffs)
• cdm/GeneralManager.java (modified) (5 diffs)
• cdm/MacrosManager.java (modified) (2 diffs)
• cdm/SuperCollectionManager.java (modified) (2 diffs)
• collection/CollectionManager.java (modified) (1 diff)
• file/FileManager.java (modified) (5 diffs)
• gui/DeleteCollectionPrompt.java (modified) (2 diffs)
• gui/ExplodeMetadataDatabasePrompt.java (modified) (2 diffs)
• metadata/MetadataXMLFileManager.java (modified) (2 diffs)

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

@@ -36 +36 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.LocalLibraryServer;
+import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.metadata.MetadataElement;
@@ -484 +485 @@
 
     // If we're using the Local Library we must release the collection before writing to the collect.cfg file
-    String collection_name = Gatherer.c_man.getCollection().getName();
+    String collection_name = CollectionManager.getLoadedCollectionName();
     boolean collection_released = false;
     if (Gatherer.c_man.built() && LocalLibraryServer.isRunning() == true) {

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());

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);
         }
         }

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

@@ -36 +36 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
+import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.util.CheckList;
 import org.greenstone.gatherer.util.CheckListEntry;
@@ -207 +208 @@
     {
         collection_checklist_model = new ArrayList();
-        current_coll_name = Gatherer.c_man.getCollection().getName();
+        current_coll_name = CollectionManager.getLoadedCollectionName();
 
         File collect_directory = new File(Gatherer.getCollectDirectoryPath());

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -562 +562 @@
     public Collection getCollection() {
     return collection;
+    }
+
+
+    /** Returns the name of the loaded collection.
+     */
+    static public String getLoadedCollectionName()
+    {
+    if (collection != null) {
+        return collection.getName();
+    }
+
+    return null;
     }
 

trunk/gli/src/org/greenstone/gatherer/file/FileManager.java

@@ -41 +41 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.collection.CollectionTree;
 import org.greenstone.gatherer.collection.CollectionTreeNode;
@@ -169 +170 @@
         file_queue.addJob(id, source, source_nodes, target, target_node, type);
         if (Gatherer.isGsdlRemote) {
-            String collection_name = Gatherer.c_man.getCollection().getName();
+            String collection_name = CollectionManager.getLoadedCollectionName();
 
             // Perform the appropriate action based on the job type (RemoteGreenstoneServer will queue)
@@ -248 +249 @@
         // ... but only if it is inside the collection and we haven't already downloaded it
         if (file.getAbsolutePath().startsWith(Gatherer.getCollectDirectoryPath()) && file.length() == 0) {
-            if (RemoteGreenstoneServer.downloadCollectionFile(Gatherer.c_man.getCollection().getName(), file).equals("")) {
+            if (RemoteGreenstoneServer.downloadCollectionFile(CollectionManager.getLoadedCollectionName(), file).equals("")) {
             // Something has gone wrong downloading the file
             return;
@@ -323 +324 @@
                 folder_file.createNewFile();
                 if (Gatherer.isGsdlRemote) {
-                RemoteGreenstoneServer.uploadCollectionFile(Gatherer.c_man.getCollection().getName(), folder_file);
+                RemoteGreenstoneServer.uploadCollectionFile(CollectionManager.getLoadedCollectionName(), folder_file);
                 }
             }
@@ -329 +330 @@
                 folder_file.mkdirs();
                 if (Gatherer.isGsdlRemote) {
-                RemoteGreenstoneServer.newCollectionDirectory(Gatherer.c_man.getCollection().getName(), folder_file);
+                RemoteGreenstoneServer.newCollectionDirectory(CollectionManager.getLoadedCollectionName(), folder_file);
                 }
             }

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());
         }
 

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataXMLFileManager.java

@@ -32 +32 @@
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.collection.CollectionTreeNode;
 import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
@@ -377 +378 @@
 
         // Upload the files modified since last time, then reset the list
-        RemoteGreenstoneServer.uploadCollectionFiles(Gatherer.c_man.getCollection().getName(), (File[]) modified_metadata_xml_files.toArray(new File[0]));
+        RemoteGreenstoneServer.uploadCollectionFiles(CollectionManager.getLoadedCollectionName(), (File[]) modified_metadata_xml_files.toArray(new File[0]));
         modified_metadata_xml_files.clear();
     }