Changeset 8354

Timestamp:

2004-10-18T12:05:26+13:00 (20 years ago)

Author:

mdewsnip

Message:

The collection tree is no longer closed down annoyingly when the collection is built.

Location:

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

Files:

• EnrichPane.java (modified) (1 diff)
• GatherPane.java (modified) (2 diffs)

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

@@ -441 +441 @@
     public void refresh(int refresh_reason, boolean ready)
     {
-    System.err.println("In EnrichPane.collectionChanged(" + ready + ")...");
     if (ready) {
-        TreeModel collection_model = Gatherer.c_man.getRecordSet();
+        // Update label
         Dictionary.registerText(collection_label, "Collection.Collection");
-
-        // Update label coloring.
         collection_label.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
         collection_label.setForeground(Configuration.getColor("coloring.collection_heading_foreground", false));
-        collection_tree.setModel(collection_model);
-
-        // Update tree coloring.
+
+        // Update tree
         collection_tree.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         collection_tree.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+        if (refresh_reason != CollectionManager.COLLECTION_REBUILT) {
+        collection_tree.setModel(Gatherer.c_man.getRecordSet());
+        }
     }
     else {
+        // Update label
         Dictionary.registerText(collection_label, "Collection.No_Collection");
         collection_label.setBackground(Color.lightGray);
         collection_label.setForeground(Color.black);
+
+        // Update tree
         collection_tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode(Dictionary.get("Collection.No_Collection"))));
     }

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

@@ -48 +48 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.file.FileOpenActionListener;
@@ -456 +457 @@
     public void refresh(int refresh_reason, boolean ready)
     {
-    System.err.println("In GatherPane.collectionChanged(" + ready + ")...");
-    // Try to retrieve the collections record set.
-    collection = Gatherer.c_man.getRecordSet();
-    if(collection != null) {
-        //args = new String[1];
-        //args[0] = Gatherer.c_man.getCollection().getName();
+    if (ready) {
+        // Update label
         Dictionary.registerText(collection_label, "Collection.Collection");
-        collection_tree.setModel(collection);
-        collection_tree.repaint();
+
+        // Update tree
+        if (refresh_reason != CollectionManager.COLLECTION_REBUILT) {
+        collection_tree.setModel(Gatherer.c_man.getRecordSet());
+        collection_tree.repaint();
+        }
+
+        // Update filter
         collection_filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
     }
     else {
+        // Update label
         String args[] = new String[1];
         args[0] = Dictionary.get("Collection.No_Collection");
         Dictionary.registerText(collection_label, "Collection.Collection", args);
         args = null;
+
+        // Update tree
         collection_tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode("Error")));
+
+        // Update filter
         collection_filter.setBackground(Color.lightGray);
     }