Changeset 8783 for trunk/gli/src/org/greenstone/gatherer/collection

Timestamp:

2004-12-13T12:01:25+13:00 (19 years ago)

Author:

mdewsnip

Message:

Big tidy up of the workspace and collection trees (Gather/Enrich panes). Still a few more changes and bug fixes to come.

Location:

trunk/gli/src/org/greenstone/gatherer/collection

Files:

• Collection.java (modified) (2 diffs)
• CollectionManager.java (modified) (11 diffs)
• CollectionTreeModel.java (added)
• CollectionTreeNode.java (added)
• DeleteCollectionPrompt.java (modified) (2 diffs)
• DownloadJob.java (modified) (4 diffs)

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

@@ -47 +47 @@
 import org.greenstone.gatherer.cdm.CollectionMeta;
 import org.greenstone.gatherer.cdm.CollectionMetaManager;
-import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -302 +301 @@
     private int getCount(TreeNode node, boolean count_folders, boolean count_files) {
     int count = 0;
-    File file = ((FileNode)node).getFile();
+    File file = ((CollectionTreeNode)node).getFile();
     if(file.isFile() && count_files) {
         count++;

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

@@ -38 +38 @@
 
 import java.io.*;
-import java.lang.Class;
 import java.util.*;
 import javax.swing.*;
@@ -54 +53 @@
 import org.greenstone.gatherer.cdm.CollectionMetaManager;
 import org.greenstone.gatherer.cdm.CommandTokenizer;
-import org.greenstone.gatherer.file.FileNode;
-import org.greenstone.gatherer.file.FileQueue;
-import org.greenstone.gatherer.file.FileSystemModel;
+import org.greenstone.gatherer.file.WorkspaceTree;  // !!! Don't like this here
 import org.greenstone.gatherer.gui.LockFileDialog;
 import org.greenstone.gatherer.gui.NewCollectionMetadataPrompt;
 import org.greenstone.gatherer.gui.ExternalCollectionPrompt;
 import org.greenstone.gatherer.gui.WarningDialog;
-import org.greenstone.gatherer.gui.tree.WorkspaceTree;
 import org.greenstone.gatherer.metadata.DocXMLFileManager;
 import org.greenstone.gatherer.metadata.MetadataSet;
@@ -94 +90 @@
     static private Collection collection = null;
     /** The collection_model. */
-    private FileSystemModel collection_model = null;
+    private CollectionTreeModel collection_model = null;
     /** An inner class listener responsible for noting tree changes and resetting saved when they occur. */
     private FMTreeModelListener fm_tree_model_listener = null;
@@ -126 +122 @@
     {
     collection_contents_changed_listeners.add(listener);
-    }
-
-
-    /** Add a special directory mapping.
-     * @param name The name for this directory mapping as a <strong>String</strong>.
-     * @param file The directory this mapping maps to as a <strong>File</strong>.
-     */
-    public void addDirectoryMapping(String name, File file)
-    {
-    // Update the information stored in the Gatherer config
-    Configuration.addDirectoryMapping(name, file);
-    // Now update the tree
-    Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.FOLDER_SHORTCUTS_CHANGED);
     }
 
@@ -291 +274 @@
     }
     DebugStream.println("Copying images and macros dirs from the base collection");
-    FileQueue fq = Gatherer.f_man.getQueue();
     try {
         // do the images dir
@@ -301 +283 @@
         
         // copy the contents over
-        fq.copyDirectoryContents(base_coll_images, new_coll_images, null);
-        } 
-    } catch (Exception e) {
+        Gatherer.f_man.getQueue().copyDirectoryContents(base_coll_images, new_coll_images, null);
+        }
+    }
+    catch (Exception e) {
         DebugStream.println("Couldn't copy over the images dir from the base collection: "+e.toString());
     }
@@ -315 +298 @@
         
         // copy the contents over
-        fq.copyDirectoryContents(base_coll_macros, new_coll_macros, null);
+        Gatherer.f_man.getQueue().copyDirectoryContents(base_coll_macros, new_coll_macros, null);
         } 
-    } catch (Exception e) {
+    }
+    catch (Exception e) {
         DebugStream.println("Couldn't copy over the macros dir from the base collection: "+e.toString());
     }
@@ -529 +513 @@
 
 
+    public boolean deleteCollection(String collection_name)
+    {
+    File collection_directory = null;
+    if (Gatherer.GS3) {
+        collection_directory = new File(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection_name));
+    }
+    else {
+        collection_directory = new File(Utility.getCollectionDir(Configuration.gsdl_path, collection_name));
+    }
+
+    if (Utility.delete(collection_directory)) {
+        // Refresh the collections shown in the workspace tree
+        Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED);
+        return true;
+    }
+
+    return false;
+    }
+
+
     public void fireFileAddedToCollection(File file)
     {
@@ -706 +710 @@
     /** Retrieve the record set (tree model) associated with the current collection. */
     public TreeModel getRecordSet() {
-    if(collection_model == null && collection != null) {
-        // Use the import directory to generate a new FileSystemModel
-        collection_model = new FileSystemModel(new FileNode(new File(getCollectionImport()), false));
+    if (collection_model == null && collection != null) {
+        // Use the import directory to generate a new CollectionTreeModel
+        collection_model = new CollectionTreeModel(new CollectionTreeNode(new File(getCollectionImport())));
         // Ensure that the manager is a change listener for the tree.
-        if(fm_tree_model_listener == null) {
+        if (fm_tree_model_listener == null) {
         fm_tree_model_listener = new FMTreeModelListener();
         }
@@ -716 +720 @@
     }
     return collection_model;
-    }
-
-
-    static public FileNode getGreenstoneCollectionsMapping()
-    {
-    FileNode greenstone_collections_node = new FileNode(Dictionary.get("Tree.World"));
-    greenstone_collections_node.unmap();
-    return greenstone_collections_node;
-    }
-
-
-    static public FileNode[] getFolderShortcuts()
-    {
-    // Return any predefined special directories
-    HashMap mappings = Configuration.getDirectoryMappings();
-    FileNode[] mapping_nodes = new FileNode[mappings.size()];
-    Iterator mappings_iterator = mappings.keySet().iterator();
-    for (int i = 0; mappings_iterator.hasNext(); i++) {
-        String mapping_name = (String) mappings_iterator.next();
-        File mapping_file = (File) mappings.get(mapping_name);
-        mapping_nodes[i] = new FileNode(mapping_file, mapping_name);
-    }
-    return mapping_nodes;
     }
 
@@ -1204 +1185 @@
     public void registerImportMonitor(GShellProgressMonitor monitor) {
     import_monitor = monitor;
-    }
-    /** Remove a previously assigned special directory mapping.
-     * @param target The <string>FileNode</strong> representing the special directory mapping to remove as a <strong>String</strong>.
-     * @return The <strong>File</strong> of the mapping removed.
-     * @see org.greenstone.gatherer.file.FileNode
-     */
-    public File removeDirectoryMapping(FileNode target) {
-    // Remove from config, remembering file
-    File file = Configuration.removeDirectoryMapping(target.toString());
-    // Update tree.
-    Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.FOLDER_SHORTCUTS_CHANGED);
-    return file;
     }
 

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

@@ -51 +51 @@
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
-import org.greenstone.gatherer.gui.tree.WorkspaceTree;
 import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -351 +350 @@
         }
 
-        File delete_me;
-        if (Gatherer.GS3) {
-        delete_me = new File(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getShortName()));
-        } else {
-        delete_me = new File(Utility.getCollectionDir(Configuration.gsdl_path, collection.getShortName()));
-        }
-        if (Utility.delete(delete_me)) {
+        if (Gatherer.c_man.deleteCollection(collection.getShortName())) {
         if (Gatherer.c_man.getCollection() != null && collection.getShortName().equals(Gatherer.c_man.getCollection().getName())) {
             current_coll_deleted = true;
         }
         list_model.removeElement(collection);
-
-        // Refresh the collections shown in the workspace tree
-        Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED);
 
         resultPrompt(true);

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

@@ -47 +47 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.WGet;
+import org.greenstone.gatherer.file.WorkspaceTree;
 import org.greenstone.gatherer.gui.DownloadProgressBar;
-import org.greenstone.gatherer.gui.tree.WorkspaceTree;
 import org.greenstone.gatherer.util.AppendLineOnlyFileDocument;
 import org.greenstone.gatherer.util.GURL;
@@ -486 +486 @@
     }
 
-    public void downloadComplete(String current_file_downloading) {
+
+    public void downloadComplete(String current_file_downloading)
+    {
     progress.downloadComplete();
-    DebugStream.println("Current File: " + current_file_downloading);
-    // !! TEMPORARILY DISABLED !!
-    //WorkspaceTreeModel.refreshWebCacheMappings();
-//      if(Gatherer.g_man.gather_pane.workspace_tree != null) {
-//          FileSystemModel tree_model = (FileSystemModel) Gatherer.g_man.gather_pane.workspace_tree.getModel();
-//          File new_file = new File(current_file_downloading);
-//          File parent_file = new_file.getParentFile();
-//          String download_cache = Utility.getCacheDir().getAbsolutePath();
-//          ArrayList raw_path = new ArrayList();
-//          while(parent_file != null && !parent_file.getAbsolutePath().equals(download_cache)) {
-//          raw_path.add(0, parent_file.getName());
-//          parent_file = parent_file.getParentFile();
-//          }
-//          download_cache = null;
-//          // Add download cache name 
-//          /** @todo - add to dictionary */
-//          raw_path.add(0, "Mirroring.Mirror_Cache");
-//          // And the root node
-//          raw_path.add(0, tree_model.getRoot());
-//          TreePath destination_path = new TreePath(raw_path.toArray());
-//          raw_path = null;
-//          // Retrieve the destination node
-//          FileNode destination_node = (FileNode) tree_model.getNode(destination_path);
-//          // destination_path = null;
-//          //FileNode new_file_node = new FileNode(new_file);
-
-//          // It suddenly occurs to me that by retrieving the destination path, we are causing the potential destination node to map its children which includes the file which I am about to add. Hence I was ending up with two copies.
-//          ///atherer.println("Ready to insert new FileNode.");
-//          DebugStream.println("Model:            " + tree_model);
-//          DebugStream.println("Destination path: " + destination_path);
-//          destination_node.unmap();
-//          ///atherer.println("Destination node: " + destination_node);
-//          ///atherer.println("New node:         " + new_file_node);
-//          //SynchronizedTreeModelTools.insertNodeInto(tree_model, destination_node, new_file_node);
-
-//          //new_file_node = null;
-//          destination_node = null;
-//          tree_model = null;
-//      }
-//      url = null;
-//      current_url = null;
-    }
+    DebugStream.println("Download complete: " + current_file_downloading);
+    }
+
 
     /** Called by the WGet native code when the requested download returns
@@ -535 +498 @@
      */
     public void downloadFailed() {
-    ///ystem.out.println("downloadFailed("+current_url+")");
-    failed_urls.add(current_url); // Its the current url thats failed.
+    failed_urls.add(current_url); // It is the current url that failed
     progress.downloadFailed();
+    DebugStream.println("Download failed: " + current_url);
     } 
      
@@ -546 +509 @@
     }
 
-    /** 
-     * @return A String representing the currently downloading url.
-     */
-    /* private String getCurrent() {
-    return current_url;
-    } */
 
     /**