Changeset 13584

Timestamp:

2007-01-12T13:21:37+13:00 (17 years ago)

Author:

mdewsnip

Message:

Moved the code to deal with the local library when deleting a collection out of DeleteCollectionPrompt and into CollectionManager.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (1 diff)
• gui/DeleteCollectionPrompt.java (modified) (2 diffs)

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

@@ -533 +533 @@
     public boolean deleteCollection(String collection_name)
     {
+    // First we must release the collection from the local library, if it's running
+    if (LocalLibraryServer.isRunning() == true) {
+        LocalLibraryServer.releaseCollection(collection_name);
+    }
+
+    // Delete the collection on the server if we're using a remote Greenstone
+    if (Gatherer.isGsdlRemote) {
+        RemoteGreenstoneServer.deleteCollection(collection_name);
+    }
+
+    // Now delete the collection directory
     return Utility.delete(new File(getCollectionDirectoryPath(collection_name)));
     }

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

@@ -47 +47 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.LocalLibraryServer;
 import org.greenstone.gatherer.collection.BasicCollectionConfiguration;
 import org.greenstone.gatherer.file.WorkspaceTree;  // !!! Don't like this here
-import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -288 +286 @@
      * @see org.greenstone.gatherer.util.Utility
      */
-    public void actionPerformed(ActionEvent event) {
+    public void actionPerformed(ActionEvent event)
+    {
         // Delete the selected collection.
-        // !! This should all go into CollectionManager !!
-
-        // First we must release it from the local library
-        if (LocalLibraryServer.isRunning() == true) {
-        LocalLibraryServer.releaseCollection(collection.getShortName());
-        }
-
-        if (Gatherer.isGsdlRemote) {
-        RemoteGreenstoneServer.deleteCollection(collection.getShortName());
-        }
-
         if (Gatherer.c_man.deleteCollection(collection.getShortName())) {
         // Refresh the collections shown in the workspace tree