Changeset 8873

Timestamp:

2004-12-22T09:18:23+13:00 (19 years ago)

Author:

kjdon

Message:

added Matthews changes - fixed a bug regarding deleting elements, and enabled use of the delete key

File:

• trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java (modified) (21 diffs)

trunk/gli/src/org/greenstone/gatherer/gems/GEMS.java

@@ -102 +102 @@
     static final public String METADATA_SET_TEMPLATE = "xml/template.mds";
     static final public String METADATA_VALUE_TEMPLATE = "xml/template.mdv";
+
+    //all of our popup menu items
+    static final public int T_COLLECTION = 0;
+    static final public int T_ELEMENT    = 1;
+    static final public int T_PROFILER   = 2;
+    static final public int T_ROOT       = 3; 
+    static final public int T_SET        = 4;
 
    // static final public String MAX_LOADED_SETS = 64;
@@ -165 +172 @@
     //event was performed
     private PopupListener popupListener = new PopupListener(this);
+
+    /**KeyPressedListener is a centralized manager for all key pressed action */
+    //    private KeyPressedListener keyPressedListener = new KeyPressedListener();
+ 
     /** A tree that represents the current metadata sets associated with this collection. */
     private SmarterTree mds_tree = null;
@@ -275 +286 @@
       
         mds_tree.addMouseListener(popupListener);
+    mds_tree.addKeyListener(new KeyPressedHandler());
     details_pane = new JPanel();
     details_pane.setOpaque(false);
@@ -307 +319 @@
     set_attributes.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     set_attributes.addMouseListener(popupListener);   
+    set_attributes.addKeyListener(new RemoveAttributeActionListener()); //Listen for DELETE key
     JPanel element_details_pane = new JPanel();
     element_details_pane.setOpaque(false);
@@ -337 +350 @@
     element_attributes.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         element_attributes.addMouseListener(popupListener);
+    element_attributes.addKeyListener(new RemoveAttributeActionListener()); //For the DELETE key
         
-    element_values_layout = new CardLayout();
+    element_values_layout = new CardLayout();
     element_values_pane = new JPanel();
     element_values_pane.setOpaque(false);
@@ -598 +612 @@
 
 
+    
     private class GEMSMenuBar
     extends JMenuBar
@@ -1460 +1475 @@
         String name_str = name.getSelectedItem().toString();
         String value_str = Codec.transform(Codec.transformUnicode(value.getText()), Codec.TEXT_TO_DOM);
+        boolean cont = false;
 
         // Remove the existing attribute if this is an edit
@@ -1472 +1488 @@
         // Update the attribute table
         model.add(new Attribute(name_str, value_str));
-        boolean cont = true;
+        cont = true;
           
-      /*  // Check that there isn't already an entry for this attribute
-           *
-           
+        /*
+        // Check that there isn't already an entry for this attribute
         if (!model.contains(name_str, 0)) {
         // Add the new attribute
@@ -1482 +1497 @@
         // Update the attribute table
         model.add(new Attribute(name_str, value_str));
+        cont = true;
         }
         // Otherwise show an error message and do not proceed
@@ -1487 +1503 @@
         cont = false;
         JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Attribute_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-        }*/
+        }
+        */
 
         value_str = null;
@@ -2508 +2525 @@
 
     private class RemoveAttributeActionListener
-    implements ActionListener {
+    implements ActionListener, KeyListener {
+
+    /**
+       Any implementation of KeyListener must include these mothods.
+       When the DELETE key is pressed, fire the actionPerformed event.
+    */
+    public void keyTyped(KeyEvent e){
+        //Do nothing
+    }
+        public void keyPressed(KeyEvent e)
+        {
+            if(e.getKeyCode() == java.awt.event.KeyEvent.VK_DELETE)
+            {
+                //DELETE key pressed
+                actionPerformed((ActionEvent)null);
+            }
+        }
+        public void keyReleased(KeyEvent e) {
+        //Do nothing
+        }
+            
     /** Any implementation of ActionListener must include this method so that we can be informed when an action as occured on our registered component, allowing us to
      * @param event An <strong>ActionEvent</strong> containing information about the event.
@@ -2559 +2596 @@
     private class RemoveElementActionListener
     implements ActionListener {
+
     /** Any implementation of ActionListener must include this method so that we can be informed when an action as occured on our registered component, allowing us to provide an editing prompt.
      * @param event An <strong>ActionEvent</strong> containing information about the event.
@@ -2573 +2611 @@
             // Clear selection
             mds_tree.clearSelection();
-            model.remove(current_element.toString(), GEMSNode.ELEMENT);
+            model.remove(current_element.getName(), GEMSNode.ELEMENT); //Need to use .getName() not .toString!!
+
             // Meanwhile disable/enable controls given we had an element selected, but no longer do.
             remove_element.setEnabled(false);
@@ -2588 +2627 @@
     }
     }
+
+ 
+
 
     private class RemoveFileActionListener
@@ -2614 +2656 @@
     }
 
+    /**
+       Class to handle DELETE key presses on the tree.
+       The class then fires the appropriate event to remove that element/set.
+       Attributes in the table are handled directly by the RemoveAttributeActionListener
+
+       Author: Matthew Whyte
+       Date last modified: 21/12/04
+    */
+    private class KeyPressedHandler implements KeyListener {    
+
+    // All implementations of KeyListener requires these methods
+    public void keyTyped(KeyEvent e){
+        //Do nothing
+    }
+    public void keyPressed(KeyEvent e)
+    {
+
+        if(e.getKeyCode() == java.awt.event.KeyEvent.VK_DELETE) //DELETE key pressed
+        {
+        boolean cont = true;
+
+        /**
+           Check to see if more than one tree node/leaf is selected. If so don't continue.
+
+           This could be updated to delete multiple nodes/leaves in the futere.
+           But not me and not today!!
+        */
+        TreePath[] multiSelectionCheck = mds_tree.getSelectionPaths();
+        if(multiSelectionCheck.length > 1)
+            {
+            cont = false;
+            Toolkit.getDefaultToolkit().beep();
+            }
+
+        if(cont)
+            {
+            //Check to see if pressed on Set or Element.
+            TreePath selPath = mds_tree.getSelectionPath();
+            GEMSNode t = (GEMSNode)selPath.getLastPathComponent();
+            
+            if(t.type == T_ELEMENT) //Remove the element
+                {
+                //System.err.println("element");
+                RemoveElementActionListener removeElement = new RemoveElementActionListener();
+                removeElement.actionPerformed((ActionEvent)null);
+                }
+            
+            else if(t.type == T_ROOT)
+                {
+                //Do nothing
+                System.err.println("Tree type of ROOT: this should not happen!");
+                }
+            else if(t.type == T_SET) //Remove the whole set
+                {
+                //System.err.println("set");
+                RemoveSetActionListener removeSet = new RemoveSetActionListener();
+                removeSet.actionPerformed((ActionEvent)null);
+                }
+            }
+        }
+    }
+    public void keyReleased(KeyEvent e) {
+        //Do nothing
+    }
+    }
+
+
     private class RemoveSetActionListener
     implements ActionListener {
+
     /** Any implementation of ActionListener must include this method so that we can be informed when an action as occured on our registered component, allowing us to
      * @param event An <strong>ActionEvent</strong> containing information about the event.
@@ -2625 +2735 @@
                 //not let anyone remove them --Attila
                // System.out.println(current_set.getName());
-               //
                 
                 File current_set_filename = current_set.getFile();
@@ -2930 +3039 @@
         
         JMenuItem menuRemoveSet;
-        //all of our popup menu items above
-        static final public int COLLECTION = 0;
-        static final public int ELEMENT    = 1;
-        static final public int PROFILER   = 2;
-        static final public int ROOT       = 3; 
-        static final public int SET        = 4;
         
         GEMS GEMSRef = null;
@@ -2969 +3072 @@
             
             menuRemoveSet = new JMenuItem();
-        //Dictionary.setText(menuRemoveSet,"GEMS.Popup.menuRemoveSet");
+    //Dictionary.setText(menuRemoveSet,"GEMS.Popup.menuRemoveSet");
        Dictionary.setText(menuRemoveSet,"GEMS.Remove_Set_Tooltip");
         
@@ -3015 +3118 @@
              //start Associate the menu items with the appropriate popups:
              //setPopup.add(menuRenameSet);
-            setPopup.add(menuAddSet);
+         //setPopup.add(menuAddSet);
         setPopup.add(menuAddAttributeSet);
         setPopup.add(menuAddElement);
@@ -3036 +3139 @@
              
              menuRemoveSet.addActionListener(new RemoveSetActionListener());
-             menuAddSet.addActionListener(new AddSetActionListener());
+             //menuAddSet.addActionListener(new AddSetActionListener());
              menuAddElement.addActionListener(new AddElementActionListener());
              menuAddAttributeSet.addActionListener(new AddOrEditAttributeActionListener());
@@ -3102 +3205 @@
             mds_tree.setSelectionPath(selPath); //Select node right-clicked on
             
-            if(t.type == ELEMENT){
+            if(t.type == T_ELEMENT){
             
             elementPopup.show(e.getComponent(),
                       e.getX(), e.getY());
             }
-            else if(t.type == ELEMENT){
+
+            /*  else if(t.type == T_ELEMENT){
             
             subfieldPopup.show(e.getComponent(),
                        e.getX(), e.getY());
-            }
-            else if(t.type == ROOT){
+                }
+            */
+            else if(t.type == T_ROOT){
             
             setPopup.show(e.getComponent(),
                       e.getX(), e.getY());
             }
-            else if(t.type == SET){
+            else if(t.type == T_SET){
             
             setPopup.show(e.getComponent(),