Changeset 13595

Timestamp:

2007-01-12T15:36:27+13:00 (17 years ago)

Author:

mdewsnip

Message:

Removed some more occurrences of Gatherer.c_man.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• file/WorkspaceTreeNode.java (modified) (2 diffs)
• gui/CreatePane.java (modified) (1 diff)
• gui/DeleteCollectionPrompt.java (modified) (1 diff)
• gui/PreviewButton.java (modified) (2 diffs)

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

@@ -35 +35 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.BasicCollectionConfiguration;  // !!! Don't like this here
-import org.greenstone.gatherer.collection.Collection;  // !!! Don't like this here
+import org.greenstone.gatherer.collection.CollectionManager;  // !!! Don't like this here
 import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -153 +153 @@
 
             // One last piece of magic so we can determine the current collection
-            Collection collection = Gatherer.c_man.getCollection();
-            if (collection != null) {
-                collection_root.is_in_loaded_collection = cols[i].getName().equals(collection.getName());
-            }
+            collection_root.is_in_loaded_collection = cols[i].getName().equals(CollectionManager.getLoadedCollectionName());
             child_nodes.add(collection_root);
             }

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

@@ -162 +162 @@
      */
     public CreatePane() {
-    Collection collection = Gatherer.c_man.getCollection();
     log_textarea = new JTextArea();
     log_scroll = new JScrollPane(log_textarea);

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

@@ -294 +294 @@
         Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED);
 
-        if (Gatherer.c_man.getCollection() != null && collection.getShortName().equals(CollectionManager.getLoadedCollectionName())) {
+        if (collection.getShortName().equals(CollectionManager.getLoadedCollectionName())) {
             current_coll_deleted = true;
         }

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

@@ -36 +36 @@
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.collection.Collection;
+import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.greenstone.LocalLibraryServer;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -74 +74 @@
     protected void configureHomeURL() {
     // set up the home page for the current collection
-    Collection current_collection = Gatherer.c_man.getCollection();
     if (Gatherer.GS3) {
         // don't do anything fancy here
-        preview_address = Configuration.library_url.toString() + Configuration.getServletPath()+ "?a=p&sa=about&c=" + current_collection.getName()+"&l="+Configuration.getLanguage();
+        preview_address = Configuration.library_url.toString() + Configuration.getServletPath() + "?a=p&sa=about&c=" + CollectionManager.getLoadedCollectionName() + "&l=" + Configuration.getLanguage();
         return;
     }
-    preview_address = Configuration.library_url.toString()+"?c="+current_collection.getName()+"&l="+Configuration.getLanguage();
+    preview_address = Configuration.library_url.toString() + "?c=" + CollectionManager.getLoadedCollectionName() + "&l=" + Configuration.getLanguage();
 
     String main_args = "&a=p&p=about";