Changeset 8881

Timestamp:

2005-01-10T14:38:23+13:00 (19 years ago)

Author:

mdewsnip

Message:

More GEMS improvements, by Matthew Whyte. Metadata elements can now be renamed.

Location:

trunk/gli/src/org/greenstone/gatherer/gems

Files:

• ElementWrapper.java (modified) (2 diffs)
• GEMS.java (modified) (15 diffs)
• MetadataSet.java (modified) (2 diffs)
• MetadataSetManager.java (modified) (1 diff)

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

@@ -67 +67 @@
     public ElementWrapper(Element element) {
     this.element = element;
+    //System.err.println("ElementWrapper: element is: " + element); //debug
     Element parent =  (Element)element.getParentNode();
     if (parent != null) {
@@ -211 +212 @@
     return getNamespace() + MSMUtils.NS_SEP + getIdentity();
     }
+
 }

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

@@ -117 +117 @@
     private AddFileActionListener add_file_action_listener = null;
     public  AddSetActionListener add_set_action_listener = null;
+    // private RenameElementActionListener rename_element_action_listener = null;
     /** The class used to handle add or edit attribute actions has to be globally available so that we can dispose of its dialog properly. */
     public AddOrEditAttributeActionListener add_or_edit_attribute_action_listener = null;
@@ -463 +464 @@
     add_file_action_listener = new AddFileActionListener();
     add_set_action_listener = new AddSetActionListener();
-        
+    //   rename_element_action_listener = new RenameElementActionListener();
         
  
@@ -1651 +1652 @@
             // Then update the tree
             model.add(current_node, element, GEMSNode.ELEMENT);
+            //System.out.println("current_node is: " + current_node); //debug
             // Signal that the metadata set has changed
             // msm.fireSetChanged(current_set);
@@ -1936 +1938 @@
         setLocation((config.screen_size.width - ADD_SET_SIZE.width) / 2, (config.screen_size.height - ADD_SET_SIZE.height) / 2);
     }
-    /** 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.
-     */
+
         private boolean a_set_exists_with_this_namespace(String namespace){
             Vector p = msm.getSets();
@@ -1948 +1948 @@
                     flag = true;     
                 }
+
                 
             }
@@ -1953 +1954 @@
             return flag;
         }
+
+
+    /** 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.
+     */
     public void actionPerformed(ActionEvent event) {
         Object source = event.getSource();
@@ -2003 +2009 @@
                 }//end do not inherit
                 else {
+            //Should change this to use XML parsing utilites --Matthew
                     //lets grab the metadata we want to inherit from...
                     String anitem = existingSetJComboBox.getSelectedItem().toString();
@@ -2014 +2021 @@
 
             FileInputStream fstream = new FileInputStream(items[1].trim());
-            BufferedReader in = new BufferedReader(new InputStreamReader(fstream, "UTF-8"));
+            BufferedReader in = new BufferedReader(new InputStreamReader(fstream, "UTF8"));
                         //DataInputStream in = new DataInputStream(fstream);
                         ///////////////
@@ -2403 +2410 @@
                 }
             }
-            // If we haven't done so yet, insert the current node. This will coincidently remove from original parent.
+            // If we haven't done so yet, insert the current node This will coincidently remove from original parent.
             if(!found) {
                 Node parent_node = subject_node.getElement();
@@ -2656 +2663 @@
     }
 
+
+    /**
+       Class to hand renaming of a set.
+
+       Author: Matthew Whyte
+       Date last modified: 22/12/04
+    */
+    private class RenameSetActionListener extends AddSetActionListener implements ActionListener {
+    /**
+       To do: everything!!!!! --Matthew
+    */
+
+
+    //Constructor
+    public RenameSetActionListener()
+    {
+    }
+
+    /**
+       Any implementation of ActionListener must include this method so that we can be informed when an action has occured.
+       @param event An <string>ActionEvent</strong> containing information about the event.
+    */
+    public void actionPerformed(ActionEvent event)
+    {
+        System.err.println("You chose to rename a set!!"); //debug
+    }
+    }
+
+
+    /**
+       Class to hand renaming of an element.
+
+       Author: Matthew Whyte
+       Date last modified: 10/01/05
+    */
+    private class RenameElementActionListener extends ModalDialog implements ActionListener {
+
+    private JButton cancel_button = null;
+    private JButton ok_button = null;
+    private JLabel label = null;
+    private NonWhitespaceField name_field = null;
+
+       
+    public RenameElementActionListener() {
+        super(self);
+        setModal(true);
+        setSize(ADD_ELEMENT_SIZE);
+        // Creation
+        JPanel content_pane = (JPanel) getContentPane();
+        content_pane.setBackground(config.getColor("coloring.collection_heading_background", false));
+        JPanel center_pane = new JPanel();
+        center_pane.setOpaque(false);
+
+        JPanel labels_pane = new JPanel();
+        labels_pane.setOpaque(false);
+        JLabel set_label = new JLabel();
+        set_label.setOpaque(false);
+        Dictionary.setText(set_label, "GEMS.Rename_Element");
+        label = new JLabel();
+        label.setOpaque(false);
+
+        JPanel values_pane = new JPanel();
+        values_pane.setOpaque(false);
+        JLabel name_label = new JLabel();
+        name_label.setOpaque(false);
+        Dictionary.setText(name_label, "GEMS.New_Name");
+        name_field = new NonWhitespaceField();
+        name_field.setBackground(config.getColor("coloring.collection_tree_background", false));
+        name_field.setForeground(config.getColor("coloring.collection_tree_foreground", false));
+        name_field.setSelectionColor(config.getColor("coloring.collection_selection_background", false));
+        name_field.setSelectedTextColor(config.getColor("coloring.collection_selection_foreground", false));
+        Dictionary.setTooltip(name_field, "GEMS.Rename_Element_Tooltip");
+
+        JPanel button_pane = new JPanel();
+        button_pane.setOpaque(false);
+
+        ok_button = new GLIButton();
+        ok_button.setMnemonic(KeyEvent.VK_O);
+        Dictionary.setBoth(ok_button, "General.OK", "General.OK_Tooltip");
+        cancel_button = new GLIButton();
+        cancel_button.setMnemonic(KeyEvent.VK_C);
+        Dictionary.setBoth(cancel_button, "General.Cancel", "General.Pure_Cancel_Tooltip");
+
+        TextFieldEnabler ok_button_enabler = new TextFieldEnabler(ok_button);
+
+        // Connection
+        cancel_button.addActionListener(this);
+        ok_button.addActionListener(this);
+        ok_button_enabler.add(name_field);
+
+        // Layout
+        labels_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+        labels_pane.setLayout(new GridLayout(2,1));
+        labels_pane.add(set_label);
+        labels_pane.add(name_label);
+
+        values_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
+        values_pane.setLayout(new GridLayout(2,1));
+        values_pane.add(label);
+        values_pane.add(name_field);
+
+        center_pane.setLayout(new BorderLayout(5,5));
+        center_pane.add(labels_pane, BorderLayout.WEST);
+        center_pane.add(values_pane, BorderLayout.CENTER);
+
+        button_pane.setLayout(new GridLayout(1,2,0,5));
+        button_pane.add(ok_button);
+        button_pane.add(cancel_button);
+
+        content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+        content_pane.setLayout(new BorderLayout());
+        content_pane.add(center_pane, BorderLayout.CENTER);
+        content_pane.add(button_pane, BorderLayout.SOUTH);
+
+        setLocation((config.screen_size.width - ADD_ELEMENT_SIZE.width) / 2, (config.screen_size.height - ADD_ELEMENT_SIZE.height) / 2);
+    }
+
+
+    /**
+       Any implementation of ActionListener must include this method so that we can be informed when an action has occured.
+       @param event An <string>ActionEvent</strong> containing information about the event.
+    */
+    public void actionPerformed(ActionEvent event)
+    {
+        Object source = event.getSource();
+
+        if(source == ok_button)
+        {
+            TreeNode selPath = current_node.getParent();
+            GEMSNode parent = (GEMSNode)selPath;
+            MetadataSet currentSet = msm.getSet(current_element.getNamespace());
+
+            String name_str = Codec.transform(Codec.transformUnicode(name_field.getText()), Codec.TEXT_TO_DOM);
+  
+            // If this element doesn't already exist.
+            if(!currentSet.containsElement(name_str)) //Do the renaming!
+            {   
+                //Hide the element that are about to rename
+                mds_tree.clearSelection();
+                model.remove(current_element.getName(), GEMSNode.ELEMENT);
+                
+                msm.renameElement(current_element, name_str); //rename the element
+                
+                model.add(parent, current_element, GEMSNode.ELEMENT);
+                
+                //Could now select the new element, but for now will just clean up ;-)
+                // Disable/enable controls given we had an element selected, but no longer do.
+                remove_element.setEnabled(false);
+                card_layout.show(details_pane, BLANK); // Show a blank panel.
+                ignore = false;
+                
+                atLeastOneSetChanged = true;
+                setVisible(false);
+            }
+                
+            // Otherwise show an error message and do not proceed.
+            else
+            {
+                JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Element_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+            }
+            name_str = null;
+            
+        }
+
+        else if(source == cancel_button)
+        {
+            setVisible(false); //hide dialog
+        }
+        else
+        {
+            name_field.setText(""); //remove old text
+            setVisible(true); //Show the dialog
+        }
+            
+        source = null;
+    }
+    
+
+    public void dispose() {
+        cancel_button = null;
+        ok_button = null;
+        name_field = null;
+        label = null;
+        //System.err.println("Dispose AddElementActionListener");
+        super.dispose();
+    }
+
+    }
+
+
     /**
        Class to handle DELETE key presses on the tree.
@@ -2721 +2918 @@
     }
     }
+
+
+   
 
 
@@ -3088 +3288 @@
             //element related GEMS.Popups
             menuRenameElement=new JMenuItem();
-           // Dictionary.setText(menuRenameElement,"GEMS.Popup.menuRenameElement");
-            //Dictionary.setText(menuRenameElement,"GEMS.Rename_Element_Tooltip");
+            Dictionary.setText(menuRenameElement,"GEMS.Popup.menuRenameElement");
+        // Dictionary.setText(menuRenameElement,"GEMS.Rename_Element_Tooltip");
             
             menuDeleteElement=new JMenuItem();
@@ -3117 +3317 @@
              
              //start Associate the menu items with the appropriate popups:
+             setPopup.add(menuRenameSet);
+         //setPopup.add(menuAddSet);
+         setPopup.add(menuAddAttributeSet);
+         setPopup.add(menuAddElement);
+         setPopup.add(menuRemoveSet);
              //setPopup.add(menuRenameSet);
          //setPopup.add(menuAddSet);
@@ -3127 +3332 @@
              subfieldPopup.add(menuAddAttributeSubfield);
              
-             //elementPopup.add(menuRenameElement);
+             elementPopup.add(menuRenameElement);
              elementPopup.add(menuDeleteElement);
              elementPopup.add(menuAddAttributeElement);
@@ -3146 +3351 @@
              menuAddAttributeSubfield.addActionListener(this);
              
-             menuRenameElement.addActionListener(this);
+         menuRenameSet.addActionListener(new RenameSetActionListener());
+             menuRenameElement.addActionListener(new RenameElementActionListener());
              menuDeleteElement.addActionListener(new RemoveElementActionListener());
              menuAddAttributeElement.addActionListener(new AddOrEditAttributeActionListener());

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

@@ -194 +194 @@
     return new ElementWrapper(element);
     }
-    
+
+   
     /** Method to add a new metadata element to this metadata set, if and only if the element is not already present. 
      * @param others_element An <strong>Element</strong> we wish to add to this metadata set, that currently belongs to some other set.
@@ -477 +478 @@
     }
     }
+
+ /**
+       Rename the metadata element.
+       @param oldElement An <strong>Element</strong> we wish to rename
+       @param newName A <strong>String</strong> which contains the new name of the element.
+       @return An <strong>ElementWrapper</strong> around the newly named element
+    */
+    public void renameElement(Element oldElement, String newName)
+    {
+    oldElement.setAttribute("name", newName); //Rename the element
+    }
+    
+
     /** Used to remove the value tree for a specific element.
      * @param element The <strong>ElementWrapper</strong> whose tree you wish to remove.

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

@@ -411 +411 @@
     // No such set. No such element.
     }
+
+ /**
+       Rename the metadata element.
+       @param oldElement An <strong>ElementWrapper</strong> we wish to rename
+       @param newName A <strong>String</strong> which contains the new name of the element.
+       @return An <strong>ElementWrapper</strong> around the newly named element
+    */
+    public void renameElement(ElementWrapper oldElement, String newName)
+    {
+    //Retrive the metadata set this element belongs to.
+    String namespace = oldElement.getNamespace();
+    MetadataSet set = (MetadataSet)mds_hashtable.get(namespace);
+    if(set != null)
+        {
+        set.renameElement(oldElement.getElement(), newName); //Rename the element
+        }
+    else
+        {
+        System.err.println("No such set " + namespace);
+        }
+    }
+
 /*Following write() and write() and save() were taken from msm/metadatasetmanager.java and converted to 
  *the gems standard