Changeset 11626

Timestamp:

2006-04-07T14:43:27+12:00 (18 years ago)

Author:

mdewsnip

Message:

Now there is only one collection tree, and it is added/removed from the Gather/Enrich panes as necessary. This will save a lot of time (previously all operations on one tree had to be duplicated on the other) and memory.

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• EnrichPane.java (modified) (6 diffs)
• GUIManager.java (modified) (1 diff)
• GatherPane.java (modified) (4 diffs)

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

@@ -70 +70 @@
     /** The label at the top of the collection tree, which shows the collection name. */
     private JLabel collection_label;
+    /** The panel that contains the collection tree. */
+    private JPanel collection_pane = null;
+    /** The scrollable area into which the collection tree is placed. */
+    private JScrollPane collection_scroll = null;
     /** The splitpane dividing the collection tree and the metadata editing controls. */
     private JSplitPane external_split;
@@ -116 +120 @@
     {
     // Creation
-    JPanel collection_pane = new JPanel(new BorderLayout());
+    collection_pane = new JPanel(new BorderLayout());
     collection_pane.setMinimumSize(MINIMUM_SIZE);
     collection_pane.setPreferredSize(COLLECTION_TREE_SIZE);
@@ -127 +131 @@
 
     DragGroup group = new DragGroup();
-    collection_tree = new CollectionTree(Gatherer.c_man.getCollectionTreeModel(), false);
+    collection_tree = Gatherer.g_man.gather_pane.collection_tree;
     group.add(collection_tree);
     collection_tree.getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
     collection_tree.addTreeSelectionListener(this);
-    JScrollPane collection_scroll = new JScrollPane(collection_tree);
     collection_filter = collection_tree.getFilter();
 
@@ -141 +144 @@
     // Collection Pane
     collection_pane.add(collection_label, BorderLayout.NORTH);
-    collection_pane.add(collection_scroll, BorderLayout.CENTER);
-    collection_pane.add(collection_filter, BorderLayout.SOUTH);
 
     JSplitPane metadata_editing_pane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
@@ -168 +169 @@
         return;
     }
+
+    // Add the collection tree and filter back into this pane
+    collection_scroll = new JScrollPane(collection_tree);
+    collection_pane.add(collection_scroll, BorderLayout.CENTER);
+    collection_pane.add(collection_filter, BorderLayout.SOUTH);
 
     // Select the first node in the tree if nothing is already selected
@@ -191 +197 @@
     // Upload the modified metadata.xml files to the server now, if we're using one
     MetadataXMLFileManager.uploadModifiedMetadataXMLFiles();
+
+    // Remove the collection tree and filter from this pane so it can be added to the Gather pane
+    collection_pane.remove(collection_scroll);
+    collection_pane.remove(collection_filter);
     }
 

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

@@ -768 +768 @@
     // Tell the previous pane that it has lost focus
     if (previous_pane != null) {
-        if (previous_pane == enrich_pane) {
+        if (previous_pane == gather_pane) {
+        gather_pane.loseFocus();
+        }
+        else if (previous_pane == enrich_pane) {
         enrich_pane.loseFocus();
         }

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

@@ -76 +76 @@
     private DragGroup group               =  null;
     /** The tree showing the files within the collection. */
-    private CollectionTree collection_tree = null;
+    public CollectionTree collection_tree = null;
     /** The threaded queue that handles the actually movement of files, so that the gui remains responsive. */
     private FileQueue file_queue          =  null;
@@ -237 +237 @@
     collection_tree.setEnabled(Gatherer.c_man.getCollectionTreeModel() != null);
     group.add(collection_tree);
-    collection_scroll = new JScrollPane(collection_tree);
     collection_filter = collection_tree.getFilter();
 
@@ -271 +270 @@
     collection_pane.setLayout(new BorderLayout());
     collection_pane.add(collection_label, BorderLayout.NORTH);
-    collection_pane.add(collection_scroll, BorderLayout.CENTER);
-    collection_pane.add(collection_filter, BorderLayout.SOUTH);
 
     tree_pane.add(workspace_pane, JSplitPane.LEFT);
@@ -307 +304 @@
     /** Called to inform this control panel that it has just gained focus as an effect of the user clicking on its tab.
      */
-    public void gainFocus() {
+    public void gainFocus()
+    {
+    // Add the collection tree and filter back into this pane
+    collection_scroll = new JScrollPane(collection_tree);
+    collection_pane.add(collection_scroll, BorderLayout.CENTER);
+    collection_pane.add(collection_filter, BorderLayout.SOUTH);
+
     // Update the meta-audit view to show the current selection, if any.
     Gatherer.g_man.meta_audit.setRecords(getCollectionTreeSelection());
+    }
+
+
+    /** Called to inform this pane that it has just lost focus as an effect of the user clicking on another tab
+     */
+    public void loseFocus()
+    {
+    // Remove the collection tree and filter from this pane so it can be added to the Enrich pane
+    collection_pane.remove(collection_scroll);
+    collection_pane.remove(collection_filter);
     }