Changeset 7482

Timestamp:

2004-05-27T17:12:03+12:00 (20 years ago)

Author:

mdewsnip

Message:

Some tidy ups in preparation for finalising the workspace and collection tree refreshing.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (3 diffs)
• collection/DeleteCollectionPrompt.java (modified) (1 diff)
• collection/Job.java (modified) (1 diff)
• file/FileQueue.java (modified) (1 diff)
• gui/GUIManager.java (modified) (2 diffs)
• gui/GatherPane.java (modified) (4 diffs)
• gui/Preferences.java (modified) (1 diff)
• gui/tree/WorkspaceTree.java (modified) (3 diffs)

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

@@ -138 +138 @@
     Gatherer.config.addDirectoryMapping(name, file);
     // Now update the tree
-    Gatherer.g_man.gather_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
+    Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
     }
     /** This method calls the builcol.pl scripts via a GShell so as to not lock up the processor.
@@ -476 +476 @@
         // workspace_model = null;
         // set the view to Gather pane
-        Gatherer.g_man.setSelectedView(Gatherer.g_man.gather_pane);
+        Gatherer.g_man.returnToInitialPane();
         Gatherer.g_man.collectionChanged(ready());
     }
@@ -1198 +1198 @@
     File file = Gatherer.config.removeDirectoryMapping(target.toString());
     // Update tree.
-    Gatherer.g_man.gather_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
+    Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
     return file;
     }

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

@@ -326 +326 @@
         list_model.removeElement(collection);
 
-        // Refresh the collects shown in the workspace tree
-        Gatherer.g_man.gather_pane.refreshWorkspaceTree(DragTree.LIBRARY_CONTENTS_CHANGED);
+        // Refresh the collections shown in the workspace tree
+        Gatherer.g_man.refreshWorkspaceTree(DragTree.LIBRARY_CONTENTS_CHANGED);
 
         resultPrompt(true);

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

@@ -481 +481 @@
     progress.downloadComplete();
     Gatherer.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.");
-        Gatherer.println("Model:            " + tree_model);
-        Gatherer.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;
+//      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.");
+//          Gatherer.println("Model:            " + tree_model);
+//          Gatherer.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;
     }
 

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

@@ -575 +575 @@
             }
             synchronized(this) {
-            ///ystem.err.println("Queue size = " + queue.size());
-            // Force the trees to refresh (but only if there is something on screen!)
-            if(Gatherer.g_man != null) {
-                Gatherer.g_man.refreshTrees(DragTree.COLLECTION_CONTENTS_CHANGED);
-            }
+            // Force both workspace and collection trees to refresh
+            if (Gatherer.g_man != null) {
+                Gatherer.g_man.refreshWorkspaceTree(DragTree.COLLECTION_CONTENTS_CHANGED);
+                Gatherer.g_man.refreshCollectionTree(DragTree.COLLECTION_CONTENTS_CHANGED);
+            }
+
             // Reset status area
             file_status.setText(Dictionary.get("FileActions.No_Activity"));

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

@@ -91 +91 @@
     public MirrorPane mirror_pane = null;
     /** The gather pane is more like a file manager where you drag files from one tree to another. */
-    public GatherPane gather_pane = null;
+    private GatherPane gather_pane = null;
     /** The enrich pane is used to assign, edit and remove metadata from files within the collection. */
     public EnrichPane enrich_pane = null;
@@ -619 +619 @@
     }
 
-    public void refreshTrees(int refresh_reason)
+
+    public void refreshCollectionTree(int refresh_reason)
+    {
+    if (gather_pane != null) {
+        gather_pane.refreshCollectionTree(refresh_reason);
+    }
+    }
+
+
+    public void refreshWorkspaceTree(int refresh_reason)
     {
     if (gather_pane != null) {
         gather_pane.refreshWorkspaceTree(refresh_reason);
-        gather_pane.refreshCollectionTree(refresh_reason);
-    }
-    }
-
-    /** Allows the system to programatically set the selected tab.
-     * @param component The view you wish to make visable in the tab pane as a <strong>Component</strong>.
-     */
-    public void setSelectedView(Component component) {
-    tab_pane.setSelectedComponent(component);
-    }
+    }
+    }
+
+
+    /** Returns to some "initial" pane (when no collection is loaded) */
+    public void returnToInitialPane()
+    {
+    if (gather_pane != null) {
+        tab_pane.setSelectedComponent(gather_pane);
+    }
+    }
+
 
     /** Specifies whether a certain tab is enabled or not. */

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

@@ -81 +81 @@
     /** The collection model which is used to build, and hold the data of, the collection tree. */
     private TreeModel collection    = null;
-    /** The Tree model used as the data source for the workspace tree. */
-    private TreeModel workspace       =  null;
     /** The button used to cancel all pending file queue jobs. */
     private JButton stop_action        =  null;
@@ -111 +109 @@
     /** Ensures that expansion and selection events between collection trees based on the same model are synchronized. */
     private TreeSynchronizer collection_tree_sync = null;
-    /** Ensures that expansion and selection events between workspace trees based on the same model are synchronized. */
-    private TreeSynchronizer workspace_tree_sync = null;
     /** The button used to delete files, which also doubles as a drop target for files from the Trees. */
     private UndoManager bin_button          =  null;
@@ -125 +121 @@
 
     /** The tree showing the available source workspace. */
-    public WorkspaceTree workspace_tree  =  null;
+    private WorkspaceTree workspace_tree = null;
+
 
     /* Constructor.
@@ -136 +133 @@
     this.file_queue = Gatherer.f_man.getQueue();
     this.collection_tree_sync = collection_tree_sync;
-    this.workspace_tree_sync = workspace_tree_sync;
     
     // Create components.

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

@@ -737 +737 @@
 
         Gatherer.config.set("general.show_file_size", Configuration.COLLECTION_SPECIFIC, show_file_size_checkbox.isSelected());
-        Gatherer.g_man.refreshTrees(DragTree.TREE_DISPLAY_CHANGED);
+        // Force both workspace and collection trees to redraw
+        if (Gatherer.g_man != null) {
+        Gatherer.g_man.refreshWorkspaceTree(DragTree.COLLECTION_CONTENTS_CHANGED);
+        Gatherer.g_man.refreshCollectionTree(DragTree.COLLECTION_CONTENTS_CHANGED);
+        }
 
         Gatherer.config.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, view_extracted_metadata_checkbox.isSelected());

trunk/gli/src/org/greenstone/gatherer/gui/tree/WorkspaceTree.java

@@ -17 +17 @@
 
 
-    public WorkspaceTree(String name) {
+    public WorkspaceTree(String name)
+    {
     super(name, WorkspaceTreeModel.getWorkspaceTreeModel(), null, true);
     }
 
 
-    public void refresh(int refresh_reason) {
+    public void refresh(int refresh_reason)
+    {
     Gatherer.println("WorkspaceTree::refresh()... ");
 
@@ -47 +49 @@
 
     // The method for displaying the tree has changed - redraw the tree
-    if (refresh_reason == DragTree.TREE_DISPLAY_CHANGED) {
-        Gatherer.println("...Reason: tree display changed.");
-        updateUI();
-    }
+    if (refresh_reason == DragTree.TREE_DISPLAY_CHANGED) {
+        Gatherer.println("...Reason: tree display changed.");
+        updateUI();
+    }
 
     // The collection specific mapped directories have changed - refresh only them
@@ -82 +84 @@
         }
 
-        // If the collection import directory is open, it must be refreshed
+        // If the specified folder is open, it must be refreshed
         if (tree_node_path_str.equals(folder_path_str)) {
         System.err.println("Must refresh node " + tree_node_path_str + "!");