Changeset 4514

Timestamp:

2003-06-09T11:52:21+12:00 (21 years ago)

Author:

jmt12

Message:

Hopefully the 'view assigned metadata for... now works properly.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/CollectionPane.java (modified) (1 diff)
• gui/GUIManager.java (modified) (1 diff)
• gui/MenuBar.java (modified) (6 diffs)
• gui/MetaEditPane.java (modified) (2 diffs)
• gui/tree/DragTree.java (modified) (4 diffs)
• util/DragTreeSelectionModel.java (modified) (1 diff)

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

@@ -443 +443 @@
     }
     repaint();
+    // Update the menubars idea of whats been selected
+    if(collection_tree != null) {
+        if(collection_tree.isSelectionEmpty()) {
+        Gatherer.g_man.menu_bar.setMetaAuditSuffix(null);
+        }
+        else {
+        Gatherer.g_man.menu_bar.setMetaAuditSuffix(collection_tree.getSelectionDetails());
+        }
+    }
     }
     /** Implementation side-effect, not used in any way.

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

@@ -747 +747 @@
     menu_bar.tabSelected(tab_pane.getSelectedIndex());
     if(tab_pane.getSelectedIndex() == tab_pane.indexOfComponent(collection_pane)) {
-        menu_bar.metadata_view.setEnabled(true);
+        menu_bar.metadata_view.setCanEnable(true);
     }
     else if(tab_pane.getSelectedIndex() == tab_pane.indexOfComponent(metaedit_pane)) {
         metaedit_pane.gainFocus();
-        menu_bar.metadata_view.setEnabled(true);
+        menu_bar.metadata_view.setCanEnable(true);
     }
     else if(tab_pane.getSelectedIndex() == tab_pane.indexOfComponent(config_pane)) {
         config_pane.gainFocus();
-        menu_bar.metadata_view.setEnabled(false);
+        menu_bar.metadata_view.setCanEnable(false);
     }
     else if(tab_pane.getSelectedIndex() == tab_pane.indexOfComponent(create_pane)) {
         create_pane.gainFocus();
-        menu_bar.metadata_view.setEnabled(false);
+        menu_bar.metadata_view.setCanEnable(false);
     }
     else if(tab_pane.getSelectedIndex() == tab_pane.indexOfComponent(preview_pane)) {
         config_pane.saveConfiguration();
         preview_pane.gainFocus();
-        menu_bar.metadata_view.setEnabled(false);
+        menu_bar.metadata_view.setCanEnable(false);
     }
     else {
-        menu_bar.metadata_view.setEnabled(false);
+        menu_bar.metadata_view.setCanEnable(false);
     }
     previous_pane = (JPanel) tab_pane.getSelectedComponent();

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

@@ -78 +78 @@
     public JMenuItem metadata_edit   = null;
     public JMenuItem metadata_export = null;
-    public JMenuItem metadata_view   = null;
     public JMenuItem tools_log       = null;
     public JMenuItem tools_size      = null;
@@ -91 +90 @@
     public JMenuItem help_mirror ;
     public JMenuItem help_preview;
+    public MagicMenuItem metadata_view   = null;
 
     public MenuBar(MenuListener menu_listener) {
@@ -175 +175 @@
     //edit.add(edit_undo);
     //edit.add(edit_redo);
-    edit.add(new JSeparator());
-    edit.add(edit_search);
-    edit.add(edit_replace);
+    //edit.add(new JSeparator());
+    //edit.add(edit_search);
+    //edit.add(edit_replace);
 
     // Metadata menu
@@ -193 +193 @@
     metadata_export.addActionListener(Gatherer.g_man);
 
-    metadata_view = new JMenuItem(get("Metadata_View") + " " + get("FileActions.No_Selection"), KeyEvent.VK_A);
-    metadata_view.addActionListener(Gatherer.g_man);            
+    metadata_view = new MagicMenuItem(get("Metadata_View") + " " + get("FileActions.No_Selection"), KeyEvent.VK_A);
+    metadata_view.addActionListener(Gatherer.g_man);    
 
     metadata.add(metadata_add);
@@ -306 +306 @@
 
     public void setMetaAuditSuffix(String metaaudit_suffix) {
-    ///ystem.err.println("Set metadata view suffix: " + metaaudit_suffix);
-    metadata_view.setText(get("Menu.Metadata_View") + " " + metaaudit_suffix);
+    System.err.println("**** Set suffix: " + metaaudit_suffix);
+    if(metaaudit_suffix == null) {
+        metadata_view.setText(get("Menu.Metadata_View") + " " + get("FileActions.No_Selection"));
+        metadata_view.setEnabled(false);
+    }
+    else {
+        ///ystem.err.println("Set metadata view suffix: " + metaaudit_suffix);
+        metadata_view.setText(get("Menu.Metadata_View") + " " + metaaudit_suffix);
+        metadata_view.setEnabled(true);
+    }
     }
 
@@ -363 +371 @@
     }
 
+    public class MagicMenuItem
+    extends JMenuItem {
+    
+    private boolean can_enable;
+    private boolean should_enable;
+
+    public MagicMenuItem(String title, int key_event) {
+        super(title, key_event);
+        super.setEnabled(false);
+        can_enable = false;
+        should_enable = false;
+    }
+
+    public void setCanEnable(boolean can_enable) {
+        ///ystem.err.println("can_enable = " + can_enable);
+        this.can_enable = can_enable;
+        if(can_enable && should_enable) {
+        ///ystem.err.println("setEnable(" + should_enable + ")");
+        super.setEnabled(should_enable);
+        }
+    }
+
+    public void setEnabled(boolean should_enable) {
+        ///ystem.err.println("should_enable = " + should_enable);
+        this.should_enable = should_enable;
+        if(can_enable) {
+        ///ystem.err.println("setEnable(" + should_enable + ")");
+        super.setEnabled(should_enable);
+        }
+    }
+    }
+
     private class NonFocusMenu
     extends JMenu {

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

@@ -349 +349 @@
     TreeModel collection_model = Gatherer.c_man.getRecordSet();
     if(collection_model != null) {
-        collection_tree = new DragTree("Collection", collection_model, null);
+        collection_tree = new DragTree("MetaEdit", collection_model, null);
         collection_model.addTreeModelListener(this);
     }
     else {
-        collection_tree = new DragTree("Collection", null);
+        collection_tree = new DragTree("MetaEdit", null);
     }
     group.add(collection_tree);
@@ -602 +602 @@
     valueChanged(new TreeSelectionEvent(this, null, false, null, null));
     // tree.setElementModel(Gatherer.c_man.getCollection().msm.getElementModel());
+    // Update the menubars idea of whats been selected
+    if(collection_tree != null) {
+        if(collection_tree.isSelectionEmpty()) {
+        Gatherer.g_man.menu_bar.setMetaAuditSuffix(null);
+        }
+        else {
+        Gatherer.g_man.menu_bar.setMetaAuditSuffix(collection_tree.getSelectionDetails());
+        }
+    }
     }
     /** Used to determine if this class contains a reference to an existing file record that matches the presumtively new record, and if one is found, returns it. Note that there is no need to search the metadata table model, as any file record that exists there must also exist in the records selection.

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

@@ -181 +181 @@
       */
     public void dragGestureRecognized(DragGestureEvent event) {
+    // Can never drag from MetaEdit tree
+    if(name.equals("MetaEdit")) {
+        return;
+    }
     // Disable editing, unless you want to have the edit box pop-up part way through dragging.
     this.setEditable(false);
@@ -321 +325 @@
         else {
             // Warn that this is an invalid drop.
-            JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("FileActions.InvalidTarget"), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+            MessageTask invalid_target_task = new MessageTask(Gatherer.dictionary.get("General.Error"), Gatherer.dictionary.get("FileActions.InvalidTarget"));
+            invalid_target_task.start();
+            invalid_target_task = null;
         }
         }
@@ -347 +353 @@
     }
     else {
-                // Warn that this is an invalid drop.
-        JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("FileActions.ReadOnlyTarget"), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        // Warn that this is an invalid drop.
+        System.err.println("About to show a modal dialog box from JOptionPane.");
+        MessageTask read_only_task = new MessageTask(Gatherer.dictionary.get("General.Error"), Gatherer.dictionary.get("FileActions.ReadOnlyTarget"));
+        read_only_task.start();
+        read_only_task = null;
+        System.err.println("Returning from a modal dialog box.");
     }
     // Clear up the group.image_ghost
     paintImmediately(ra_ghost.getBounds());
     event.getDropTargetContext().dropComplete(true);
+    }
+
+    private class MessageTask
+    extends Thread {
+    private String message;
+    private String title;
+
+    MessageTask(String title, String message) {
+        this.message = message;
+        this.title = title;
+    }
+
+    public void run() {
+        JOptionPane.showMessageDialog(Gatherer.g_man, message, title, JOptionPane.ERROR_MESSAGE);
+    }
     }
 
@@ -571 +596 @@
     }
 
-    public void valueChanged(TreeSelectionEvent e) {
+    public void valueChanged(TreeSelectionEvent event) {
     if(group == null) {
-                ///ystem.err.println("Oh my god, this tree has no group: " + this);
+        ///ystem.err.println("Oh my god, this tree has no group: " + this);
     }
     else {
         group.grabFocus(this);
     }
-    Gatherer.g_man.menu_bar.setMetaAuditSuffix(getSelectionDetails());
+    if(name.equals("Collection") || name.equals("MetaEdit")) {
+        if(event.getNewLeadSelectionPath() == null) {
+        Gatherer.g_man.menu_bar.setMetaAuditSuffix(null);
+        }
+        else {
+        Gatherer.g_man.menu_bar.setMetaAuditSuffix(getSelectionDetails());
+        }
+    }
     }
     

trunk/gli/src/org/greenstone/gatherer/util/DragTreeSelectionModel.java

@@ -148 +148 @@
         }
         else {
-        Gatherer.dictionary.get("FileActions.No_Selection"); 
+        suffix = null;
         }
         args = null;