Changeset 8813

Timestamp:

2004-12-15T13:41:43+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed up a few more refreshing problems.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (4 diffs)
• collection/CollectionManager.java (modified) (7 diffs)
• gui/EnrichPane.java (modified) (7 diffs)
• gui/Filter.java (modified) (1 diff)
• gui/GUIManager.java (modified) (4 diffs)
• gui/GatherPane.java (modified) (4 diffs)
• gui/Preferences.java (modified) (1 diff)
• gui/tree/DragTree.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -95 +95 @@
     static public ActionRecorderDialog feedback_dialog = null;
 
+    // Refresh reasons
+    static public final int COLLECTION_OPENED   = 0;
+    static public final int COLLECTION_CLOSED   = 1;
+    static public final int COLLECTION_REBUILT  = 2;
+    static public final int PREFERENCES_CHANGED = 3;
+
 
     /** Magic to allow Enter to fire the default button. */
@@ -326 +332 @@
 
 
-
     public void run(Dimension size, Splash splash, GUIManager g_man) 
     {
@@ -448 +453 @@
     }
 
+
+    static public void refresh(int refresh_reason)
+    {
+    if (g_man != null) {
+        g_man.refresh(refresh_reason, c_man.ready());
+    }
+
+    // Now is a good time to force a garbage collect
+    System.gc();
+    }
+
+
     // used to send reload coll messages to the tomcat server
     static public void configGS3Server(String site, String command) {
@@ -471 +488 @@
     }
 
-    /** Retrieve the metadata directory, as required by any MSMCaller implementation.
-     * @return The currently active collection metadata directory as a <strong>String</strong>.
-     * @see org.greenstone.gatherer.collection.CollectionManager
-     */
-    public String getCollectionMetadata() {
-    if (c_man != null && c_man.ready()) {
-        return c_man.getCollectionMetadata();
-    }
-    return "";
-    }
 
     /** Used to 'spawn' a new child application when a file is double clicked.

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

@@ -101 +101 @@
     static final public String LOCK_FILE = "gli.lck";
 
-    static public final int COLLECTION_OPENED  = 10;
-    static public final int COLLECTION_CLOSED  = 11;
-    static public final int COLLECTION_REBUILT = 12;
-
     /** Used to indicate the source of the message is the file collection methods. */
     static final public int COLLECT   = 3;
@@ -226 +222 @@
     // workspace_model = null;
     Configuration.setCollectionConfiguration(null);
+    Gatherer.refresh(Gatherer.COLLECTION_CLOSED);
     if (Gatherer.g_man != null) {
-        Gatherer.g_man.updateUI();
-        Gatherer.g_man.refresh(COLLECTION_CLOSED, false);
+        Gatherer.g_man.updateUI();  // !!! Necessary?
     }
     }
@@ -482 +478 @@
         Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED);
 
-        Gatherer.g_man.refresh(COLLECTION_OPENED, ready());
+        Gatherer.refresh(Gatherer.COLLECTION_OPENED);
     }
     }
@@ -959 +955 @@
 
         // We're done. Let everyone know.
-        if (Gatherer.g_man != null) {
-        Gatherer.g_man.refresh(COLLECTION_OPENED, ready());
-        }
+        Gatherer.refresh(Gatherer.COLLECTION_OPENED);
         result = true;
     }
@@ -1133 +1127 @@
 
         // Fire a collection changed first to update the preview etc buttons
-        Gatherer.g_man.refresh(COLLECTION_REBUILT, ready());
+        Gatherer.refresh(Gatherer.COLLECTION_REBUILT);
 
         // Now display a message dialog saying its all built
@@ -1144 +1138 @@
         else {
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Preview_Ready_Failed"), Dictionary.get("CollectionManager.Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
-        Gatherer.g_man.refresh(COLLECTION_REBUILT, ready());
+        Gatherer.refresh(Gatherer.COLLECTION_REBUILT);
         }
     }
@@ -1153 +1147 @@
         } else {
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Preview_Ready_Failed"), Dictionary.get("CollectionManager.Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
-        Gatherer.g_man.refresh(COLLECTION_REBUILT, ready());
+        Gatherer.refresh(Gatherer.COLLECTION_REBUILT);
         }
         

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

@@ -100 +100 @@
 
     /** Used to dynamically filter the collection tree at user request. Note that this is synchronized with the collection tree filter in the Gather view. */
-    private Filter filter = null;
+    private Filter collection_filter = null;
     /** The currently reported selection. */
     private CollectionTreeNode[] file_nodes = null;
@@ -125 +125 @@
     private DragTree collection_tree;
     /** Provide synchronization between the collection trees in this view and the collection pane view. */
-    private TreeSynchronizer tree_sync = null;
+    private TreeSynchronizer collection_tree_sync = null;
     private boolean metadata_edit_event = false;
 
@@ -132 +132 @@
      * @param tree_sync The <strong>TreeSynchronizer</strong> to be used on the collection tree
      */
-    public EnrichPane(TreeSynchronizer tree_sync)
+    public EnrichPane(TreeSynchronizer collection_tree_sync)
     {
-    this.tree_sync = tree_sync;
+    this.collection_tree_sync = collection_tree_sync;
 
     add = new GLIButton();
@@ -267 +267 @@
     collection_tree.addTreeSelectionListener(this);
     collection_tree.addTreeExpansionListener(Gatherer.g_man.foa_listener);
-    collection_tree.setLargeModel(true);
+    collection_tree.setBackgroundNonSelectionColor(Configuration.getColor("coloring.collection_tree_background", false));
+    collection_tree.setTextNonSelectionColor(Configuration.getColor("coloring.collection_tree_foreground", false));
+    collection_tree.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+    collection_tree.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
     collection_tree.setRootVisible(false);
 
@@ -274 +277 @@
     JScrollPane collection_scroll = new JScrollPane(collection_tree);
 
-    filter = Gatherer.g_man.getFilter(collection_tree);
-    filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
-    filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);
-    Dictionary.registerTooltip(filter.getComboBox(), "Collection.Filter_Tooltip");
+    collection_filter = Gatherer.g_man.getFilter(collection_tree);
+    collection_filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
+    collection_filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);
+    Dictionary.registerTooltip(collection_filter.getComboBox(), "Collection.Filter_Tooltip");
 
     // Layout
@@ -287 +290 @@
     collection_pane.add(collection_label, BorderLayout.NORTH);
     collection_pane.add(collection_scroll, BorderLayout.CENTER);
-    collection_pane.add(filter, BorderLayout.SOUTH);
+    collection_pane.add(collection_filter, BorderLayout.SOUTH);
 
     JSplitPane main_split_pane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
@@ -438 +441 @@
     public void modeChanged(int mode)
     {
-    filter.setEditable(mode > Configuration.LIBRARIAN_MODE);
+    collection_filter.setEditable(mode > Configuration.LIBRARIAN_MODE);
     }
 
 
-    public void refresh(int refresh_reason, boolean ready)
+    /** Refresh this pane, depending on what has just happened (refresh_reason). */
+    public void refresh(int refresh_reason, boolean collection_loaded)
     {
-    if (ready) {
-        // Update label
+    if (collection_loaded) {
+        // Update collection label
         Dictionary.registerText(collection_label, "Collection.Collection");
         collection_label.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
         collection_label.setForeground(Configuration.getColor("coloring.collection_heading_foreground", false));
 
-        // 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) {
+        // Update collection tree
+        if (refresh_reason == Gatherer.COLLECTION_OPENED) {
         collection_tree.setModel(Gatherer.c_man.getRecordSet());
         }
+
+        // Update collection filter
+        collection_filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
     }
     else {
-        // Update label
+        // Update collection 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"))));
-    }
-
-    filter.setEnabled(ready);
-    // Ensure that this collection tree view is synchronized with any others.
-    tree_sync.add(collection_tree);
+        // Update collection tree
+        collection_tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode("Error")));
+
+        // Update collection filter
+        collection_filter.setBackground(Color.lightGray);
+    }
+
+    // Enable or disable the controls
+    collection_tree.setEnabled(collection_loaded);
+    collection_filter.setEnabled(collection_loaded);
+
+    // Ensure that this collection tree view is synchronized with all others
+    collection_tree_sync.add(collection_tree);
+
+    // Force the metadata table to be rebuilt (for switching extracted metadata on or off)
+    if (refresh_reason == Gatherer.PREFERENCES_CHANGED) {
+        valueChanged(null);
+    }
     }
 

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

@@ -132 +132 @@
     public void setEnabled(boolean state) {
     ignore = true;
-    combobox.setEditable(state);
     combobox.setEnabled(state);
     ignore = false;

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

@@ -103 +103 @@
     /** Ensures that expansion events between like collection trees are synchronized. */
     private TreeSynchronizer collection_tree_sync = null;
-    /** Ensures that expansion events between like workspace trees are synchronized. */
-    private TreeSynchronizer workspace_tree_sync = null;
-
-    static public final int GUI_REFRESHED = 0;
-    static public final int PREFERENCES_CHANGED = 1;
 
 
@@ -120 +115 @@
     this.collection_tree_sync = new TreeSynchronizer();
     this.meta_audit = new MetaAuditFrame(collection_tree_sync, null);
-    this.workspace_tree_sync = new TreeSynchronizer();
     
     this.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
@@ -342 +336 @@
         }
 
-        gather_pane = new GatherPane(workspace_tree_sync, collection_tree_sync);
+        gather_pane = new GatherPane(collection_tree_sync);
         gather_pane.display();
         if(Configuration.get("workflow.gather", true)) {
@@ -494 +488 @@
 
 
-    public void refresh(int refresh_reason, boolean ready)
+    public void refresh(int refresh_reason, boolean collection_loaded)
     {
+    // Set the collection information in the title bar
+    if (collection_loaded) {
+        Collection collection = Gatherer.c_man.getCollection();
+        setTitle(collection.getTitle(), collection.getName());
+    }
+    else {
+        setTitle(null, null);
+    }
+
     // Update the menu bar
-    menu_bar.refresh(refresh_reason, ready);
+    menu_bar.refresh(refresh_reason, collection_loaded);
 
     // Update the loaded panes
     if (mirror_pane != null) {
-        mirror_pane.refresh(refresh_reason, ready);
+        mirror_pane.refresh(refresh_reason, collection_loaded);
     }
     if (gather_pane != null) {
-        gather_pane.refresh(refresh_reason, ready);
+        gather_pane.refresh(refresh_reason, collection_loaded);
     }
     if (enrich_pane != null) {
-        enrich_pane.refresh(refresh_reason, ready);
+        enrich_pane.refresh(refresh_reason, collection_loaded);
     }
     if (design_pane != null) {
-        design_pane.refresh(refresh_reason, ready);
+        design_pane.refresh(refresh_reason, collection_loaded);
     }
     if (create_pane != null) {
-        create_pane.refresh(refresh_reason, ready);
-    }
-
-    if (refresh_reason == PREFERENCES_CHANGED) {
-        // Force both workspace and collection trees to redraw
-        Gatherer.g_man.refreshWorkspaceTree(DragTree.TREE_DISPLAY_CHANGED);
-        Gatherer.g_man.refreshCollectionTree(DragTree.TREE_DISPLAY_CHANGED);
-    }
-
+        create_pane.refresh(refresh_reason, collection_loaded);
+    }
+
+    // Now enable tabs as necessary. Do this on event queue to prevent crazy NPEs
     if (!locked) {
-        // Now enable tabs as necessary. Do this on event queue to prevent crazy NPEs
-        if(tab_updater == null) {
-        tab_updater = new TabUpdater(tab_pane, ready);
+        if (tab_updater == null) {
+        tab_updater = new TabUpdater(tab_pane, collection_loaded);
         }
         else {
-        tab_updater.setReady(ready);
+        tab_updater.setReady(collection_loaded);
         }
         SwingUtilities.invokeLater(tab_updater);
     }
-
-    // Set the title
-    String collection_title = null;
-    String collection_name = null;
-    if (ready) {
-        Collection collection = Gatherer.c_man.getCollection();
-        collection_title = collection.getTitle();
-        collection_name = collection.getName();
-        collection = null;
-    }
-    setTitle(collection_title, collection_name);
-    collection_title = null;
-    collection_name = null;
-
-    // Now is a good time to force a garbage collect
-    System.gc();
     }
 

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

@@ -130 +130 @@
      * @see org.greenstone.gatherer.file.FileQueue
      */
-    public GatherPane(TreeSynchronizer workspace_tree_sync, TreeSynchronizer collection_tree_sync) {
+    public GatherPane(TreeSynchronizer collection_tree_sync) {
     this.group = new DragGroup();
     this.file_queue = Gatherer.f_man.getQueue();
     this.collection_tree_sync = collection_tree_sync;
-    
+
     // Create components.
     stop_action = new GLIButton();
@@ -284 +284 @@
 
     collection_filter = Gatherer.g_man.getFilter(collection_tree);
-    if (collection != null) {
-        collection_filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
-    }
-    else {
-        collection_filter.setBackground(Color.lightGray);
-    }
-    // Add a tool tip
+    collection_filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
+    collection_filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);
     Dictionary.registerTooltip(collection_filter.getComboBox(), "Collection.Filter_Tooltip");
 
@@ -419 +414 @@
 
 
-    /** Called whenever a significant change occurs in the current collections state, such as a new collection being loaded or the current one being closed. Several actions must occur in the GUI to indicate this change to the user, such as en/disabling the collection tree.
-     * @param ready <i>true</i> if a collection is loaded and ready to be modified, <i>false</i> otherwise.
-     * @see org.greenstone.gatherer.Configuration
-     * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.collection.CollectionManager
-     * @see org.greenstone.gatherer.gui.Coloring
-     * @see org.greenstone.gatherer.gui.Filter
-     * @see org.greenstone.gatherer.util.TreeSynchronizer
-     */
-    public void refresh(int refresh_reason, boolean ready)
+    /** Refresh this pane, depending on what has just happened (refresh_reason). */
+    public void refresh(int refresh_reason, boolean collection_loaded)
     {
-    if (ready) {
-        // Update label
+    if (collection_loaded) {
+        // Update collection label
         Dictionary.registerText(collection_label, "Collection.Collection");
-
-        // Update tree
-        if (refresh_reason != CollectionManager.COLLECTION_REBUILT) {
+        collection_label.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
+        collection_label.setForeground(Configuration.getColor("coloring.collection_heading_foreground", false));
+
+        // Update collection tree
+        if (refresh_reason == Gatherer.COLLECTION_OPENED) {
         collection_tree.setModel(Gatherer.c_man.getRecordSet());
-        collection_tree.repaint();
-        }
-
-        // Update filter
+        }
+
+        // Update collection filter
         collection_filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
     }
     else {
-        // Update label
-        String args[] = new String[1];
+        // Update collection 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_label.setBackground(Color.lightGray);
+        collection_label.setForeground(Color.black);
+
+        // Update collection tree
         collection_tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode("Error")));
 
-        // Update filter
+        // Update collection filter
         collection_filter.setBackground(Color.lightGray);
     }
-    collection_tree.setEnabled(ready);
-    collection_filter.setEnabled(ready);
-    collection_filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);
-    Dictionary.registerTooltip(collection_filter.getComboBox(), "Collection.Filter_Tooltip");
-
-    // Change the label at the top of collection tree.
-    setEnabled(collection_label, ready, Configuration.getColor("coloring.collection_heading_foreground", false), Configuration.getColor("coloring.collection_heading_background", false));
-    // Ensure that this tree view of the collection record set is synchronized with any others.
+
+    // Enable or disable the controls
+    workspace_tree.setEnabled(true);
+    collection_tree.setEnabled(collection_loaded);
+    collection_filter.setEnabled(collection_loaded);
+    bin_button.setEnabled(collection_loaded);
+    new_folder.setEnabled(collection_loaded);
+
+    // Ensure that this collection tree view is synchronized with all others
     collection_tree_sync.add(collection_tree);
-
-    // Refresh the collection tree (the workspace tree stays the same)
-    refreshCollectionTree(DragTree.LOADED_COLLECTION_CHANGED);
-
-    // Enable or disable the control buttons
-    bin_button.setEnabled(ready);
-    new_folder.setEnabled(ready);
     }
 
@@ -484 +467 @@
     }
     
-    
-    /** Used to set the enabled state, and hence the colouring, of the two tree labels.
-     * @param label The <strong>JLabel</strong> to be affected.
-     * @param state <i>true</i> for enabled, i.e. when a collection is ready, <i>false</i> otherwise.
-     * @param foreground The <strong>Color</strong> to make the foreground text of the label when enabled.
-     * @param background The <strong>Color</strong> to make the background of the label when enabled.
-     */
-    private void setEnabled(JLabel label, boolean state, Color foreground, Color background) {
-    ///ystem.err.println("Setting the label color to state " + state);
-    if(state) {
-        label.setBackground(background);
-        label.setForeground(foreground);
-    }
-    else {
-        label.setBackground(Color.lightGray);
-        label.setForeground(Color.black);
-    }
-    label.repaint();
-    ///ystem.err.println("Color is now " + label.getBackground());
-    }
-
 
     /** When a user right-clicks within the workspace and collection trees they are presented with a small popup menu of context based options. This class provides such functionality.

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

@@ -711 +711 @@
 
         // Refresh the GLI to account for the configuration changes
-        Gatherer.g_man.refresh(GUIManager.PREFERENCES_CHANGED, Gatherer.c_man.ready());
+        Gatherer.refresh(Gatherer.PREFERENCES_CHANGED);
 
         // Hide dialog

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

@@ -508 +508 @@
     public void setEnabled(boolean state) {
     super.setEnabled(state);
-    clearSelection();
+
     // Change some colors
     if(state) {