Changeset 8930 for trunk/gli

Timestamp:

2005-01-25T16:32:41+13:00 (19 years ago)

Author:

mdewsnip

Message:

More GEMS improvements, by Matthew Whyte. Now has subfield support.

Location:

trunk/gli

Files:

• classes/dictionary.properties (modified) (5 diffs)
• src/org/greenstone/gatherer/gems/ElementWrapper.java (modified) (5 diffs)
• src/org/greenstone/gatherer/gems/GEMS.java (modified) (46 diffs)
• src/org/greenstone/gatherer/gems/GEMSModel.java (modified) (1 diff)
• src/org/greenstone/gatherer/gems/GEMSNode.java (modified) (3 diffs)
• src/org/greenstone/gatherer/gems/MSMUtils.java (modified) (8 diffs)
• src/org/greenstone/gatherer/gems/MetadataSet.java (modified) (3 diffs)
• src/org/greenstone/gatherer/gems/MetadataSetManager.java (modified) (4 diffs)

trunk/gli/classes/dictionary.properties

@@ -1087 +1087 @@
 GEMS.Popup.menuAddElement:Add element
 GEMS.Popup.menuAddSet:Add a new set
-GEMS.Popup.menuAddSubfield:Add subfield
+GEMS.Popup.menuAddSubelement:Add subelement
 
 GEMS.Popup.menuEditValue:Edit value
@@ -1093 +1093 @@
 GEMS.Popup.menuRenameElement:Rename element
 GEMS.Popup.menuRenameSet:Rename set
-GEMS.Popup.menuRenameSubfield:Rename subfield
+GEMS.Popup.menuRenameSubelement:Rename subelement
 
 GEMS.Popup.menuRemoveAttribute:Remove attribute
 GEMS.Popup.menuRemoveElement:Remove element
 GEMS.Popup.menuRemoveSet:Remove set
-GEMS.Popup.menuRemoveSubfield:Remove subfield
+GEMS.Popup.menuRemoveSubelement:Remove subelement
 
-GEMS.Preferences.Use_Subfields: Use Subfields?
-GEMS.Preferences.Use_Subfields_Tooltip: Toggle on or off whether you want to be able to manage subfields.
+GEMS.Preferences.Use_Subelements: Use Subelements?
+GEMS.Preferences.Use_Subelements_Tooltip: Toggle on or off whether you want to be able to manage subelements.
 GEMS.Preferences.Selected_Languages_Tooltip: Selected languages to display:
 GEMS.Menu.File: File
@@ -1122 +1122 @@
 GEMS.Add_Attribute_Tooltip:Add a new attribute to the selected item
 GEMS.Add_Element_Tooltip:Add a new element to the selected set
+GEMS.Add_Subelement_Tooltip:Add a new subelement to the seclect element
 GEMS.Add_File_Tooltip:Add a new importing profile
 GEMS.Add_Set_Tooltip:Add a new metadata set
@@ -1166 +1167 @@
 GEMS.Rename_Element:Rename Element
 GEMS.Rename_Element_Tooltip:The element's new name
+GEMS.Rename_Name_Tooltip:The metadata set's new name
+GEMS.Rename_Namespace_Tooltip:The metadata set's unique namespace
+GEMS.Rename_Set:Rename Set
 GEMS.Set:Set
 GEMS.Set_Details:Metadata Set Details
@@ -1172 +1176 @@
 GEMS.Source:From
 GEMS.Subject:Subject
+GEMS.Subelement:Subelement
+GEMS.Subelement_Details:Metadata Subelement Details
+GEMS.Subelement_Name_Tooltip:The name of the new subelement
+GEMS.Subelement_Already_Exists:A subelement with this name already exists.
 GEMS.Target:Element
 GEMS.Title:Greenstone Editor for Metadata Sets

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

@@ -61 +61 @@
     private String namespace = "";
 
+    private NodeList subelements = null; //The list of subelements
+
     private Troolean is_extracted = new Troolean();
     /** Constructor for elements with no namespace necessary.
@@ -69 +71 @@
     //System.err.println("ElementWrapper: element is: " + element); //debug
     Element parent =  (Element)element.getParentNode();
-    if (parent != null) {
-        this.namespace = parent.getAttribute("namespace");
-    }
-
+    if (parent != null)
+        {
+        this.namespace = parent.getAttribute("namespace");
+        }
+    
+    subelements = element.getElementsByTagName("Subelement");
+    //Should read in each subelement's value tree?
     }
 
@@ -81 +86 @@
     public void addAttribute(String name, String language, String value) {
     MSMUtils.addElementAttribute(element, name, language, value);
+    }
+
+
+    /**
+       Check to see if the element contains a particular subelement
+       @return true if element already contains a subelement of name name.
+       @param name the name of the subelement to check for, as a <strong>String</strong> 
+       @author Matthew Whyte
+       @date last modified: 19/01/04
+    */
+    public boolean containsSubelement(String name)
+    {
+    //System.err.println("Want to see if subelement: " + name + " exists."); //debug
+    for(int i = 0; i < subelements.getLength(); i++)
+        {
+        Element sibling = (Element)subelements.item(i);
+        String sibling_name = sibling.getAttribute("name");
+        if(sibling_name.equals(name))
+            {
+            return true;
+            }
+        }
+       
+    return false;
+    }
+
+    /**
+       Method to acquire a list of all the subelements in the element.
+       @return A <strong>NodeList</strong> containing all of this element's subelements.
+
+       @author: Matthew Whyte
+       @date last modified: 19/01/04
+     */
+    public NodeList getSubelements()
+    {
+    return subelements;
+    }
+
+    /**
+       Method to determine if this is a subelement
+       @return A <strong>boolean</strong> - true if the 'element' is a subelement
+       @author Matthew Whyte
+       @date last modified 19/01/04
+     */
+    public boolean isSubelement()
+    {
+    Element element = this.getElement();
+    if(element.getTagName().equals("Subelement"))
+        {
+        return true;
+        }
+    return false;
     }
 
@@ -137 +194 @@
     return MSMUtils.getIdentifier(element);
     }
+
+    /** Retrieve the name of this element. Name is unique.
+    @return The name (without the namespace) as a <strong>String</strong>.
+    @see org.greenstone.gatherer.msm.MSMUtils
+    @author Matthew Whyte
+    @date last modified: 21/01/04
+     */
+    public String getNameOnly() {
+    return MSMUtils.getNameOnly(element);
+    }
+
     /** Retrieve the name of this element. Name is unique.
      * @return The name as a <strong>String</strong>.
@@ -142 +210 @@
      */
     public String getName() {
-    return MSMUtils.getFullName(element, namespace);
-    }
+        return MSMUtils.getFullName(element, namespace);
+    }
+
+
     /** Retrieve the namespace prefix for this element wrapper.
      * @return A <strong>String</strong> containing the namespace or "" if there is no namespace for this element.

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

@@ -100 +100 @@
     static final private String PROFILE = "profile";
     static final private String SET = "set";
+    static final private String SUBELEMENT = "subelement";
     static final private String VALUES = "values";
 
@@ -111 +112 @@
     static final public int T_ROOT       = 3; 
     static final public int T_SET        = 4;
+    static final public int T_SUBELEMENT = 5;
 
    // static final public String MAX_LOADED_SETS = 64;
@@ -132 +134 @@
     private Dimension screen_size = null;
     private ElementWrapper current_element = null;
+    private ElementWrapper current_subelement = null;
     private GValueNode current_value_node = null;
     /** A reference to ourselves so our inner classes can dispose of us. */
@@ -156 +159 @@
     private JScrollPane profile_attributes_scroll = null;
     private JScrollPane set_attributes_scroll = null;
+    private JScrollPane subelement_attributes_scroll = null;
     private JPanel details_pane = null;
     private JPanel element_values_pane = null;
@@ -164 +168 @@
     private Object target = null;
     public RemoveSetActionListener remove_set_action_listener;
+    private SmarterTable subelement_attributes = null;
     private SmarterTable element_attributes = null;
     private SmarterTable profile_attributes = null;
@@ -366 +371 @@
     element_values.setSelectionColor(config.getColor("coloring.collection_selection_background", false));
     element_values.setSelectedTextColor(config.getColor("coloring.collection_selection_foreground", false));
-
+        
+    JPanel subelement_details_pane = new JPanel();
+    subelement_details_pane.setOpaque(false);
+    JPanel subelement_name_pane = new JPanel();
+    subelement_name_pane.setOpaque(false);
+    JLabel subelement_name_label = new JLabel();
+    subelement_name_label.setOpaque(false);
+    JPanel subelement_inner_pane = new JPanel();
+    subelement_inner_pane.setOpaque(false);
+
+    JPanel subelement_attributes_pane = new JPanel();
+    subelement_attributes_pane.setOpaque(false);
+    subelement_attributes_scroll = new JScrollPane();
+    subelement_attributes_scroll.getViewport().setBackground(config.getColor("coloring.collection_tree_background", false));
+    subelement_attributes_scroll.setOpaque(true);
+    subelement_attributes = new SmarterTable();
+    subelement_attributes.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+    subelement_attributes.setBackground(config.getColor("coloring.collection_tree_background", false));
+    subelement_attributes.setForeground(config.getColor("coloring.collection_tree_foreground", false));
+    subelement_attributes.setHeadingBackground(config.getColor("coloring.collection_heading_background", false));
+    subelement_attributes.setHeadingForeground(config.getColor("coloring.collection_heading_foreground", false));
+    subelement_attributes.setSelectionColor(config.getColor("coloring.collection_selection_background", false));
+    subelement_attributes.setSelectedTextColor(config.getColor("coloring.collection_selection_foreground", false));
+    subelement_attributes.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+        subelement_attributes.addMouseListener(popupListener);
+    subelement_attributes.addMouseListener(new AddOrEditAttributeActionListener());
+    subelement_attributes.addKeyListener(new RemoveAttributeActionListener()); //For the DELETE key
+    
     JPanel element_novalues_pane = new JPanel();
 
@@ -499 +531 @@
     remove_value.addActionListener(new RemoveValueActionListener());
     element_attributes.getSelectionModel().addListSelectionListener(new AttributesListSelectionListener(element_attributes));
+    subelement_attributes.getSelectionModel().addListSelectionListener(new AttributesListSelectionListener(subelement_attributes));
     profile_attributes.getSelectionModel().addListSelectionListener(new AttributesListSelectionListener(profile_attributes));
     set_attributes.getSelectionModel().addListSelectionListener(new AttributesListSelectionListener(set_attributes));
@@ -547 +580 @@
     //element_details_pane.add(element_name_pane, BorderLayout.NORTH);
     element_details_pane.add(element_inner_pane, BorderLayout.CENTER);
-
+    
+    subelement_name_pane.setLayout(new BorderLayout());
+    subelement_attributes_scroll.setViewportView(subelement_attributes);
+    subelement_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("GEMS.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    subelement_attributes_pane.setLayout(new BorderLayout());
+    subelement_attributes_pane.add(subelement_attributes_scroll, BorderLayout.CENTER);
+    
+
+    subelement_inner_pane.setLayout(new BorderLayout());
+    subelement_inner_pane.add(subelement_attributes_pane);
+    subelement_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("GEMS.Subelement_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    subelement_details_pane.setLayout(new BorderLayout());
+    subelement_details_pane.add(subelement_inner_pane, BorderLayout.CENTER);
+    
     profile_name_pane.setLayout(new BorderLayout());
     profile_name_pane.add(profile_name_label, BorderLayout.WEST);
@@ -568 +614 @@
     details_pane.add(set_details_pane, SET);
     details_pane.add(element_details_pane, ELEMENT);
+    details_pane.add(subelement_details_pane, SUBELEMENT);
     details_pane.add(profile_details_pane, PROFILE);
 
@@ -936 +983 @@
     element_attributes = null;
     set_attributes = null;
+    subelement_attributes = null;
     element_name = null;
     set_name = null;
@@ -978 +1026 @@
     }
 
+    /**
+       Class to handle adding or modifying element attributes.
+     */
    private class AddOrEditAttributeActionListener
     extends ModalDialog
@@ -1036 +1087 @@
         target_label = new JLabel();
         target_label.setOpaque(false);
-        Dictionary.setText(target_label, "GEMS.Target");
         target = new JLabel();
         target.setOpaque(false);
@@ -1147 +1197 @@
        public void mouseClicked(MouseEvent e)
     {
-        if(e.getSource() == element_attributes || e.getSource() == set_attributes)
+        if(e.getSource() == element_attributes || e.getSource() == set_attributes || e.getSource() == subelement_attributes)
         {
             if(e.getClickCount() == 2) //Double click
@@ -1187 +1237 @@
         {
             target.setText(current_element.getName());
+            Dictionary.setText(target_label, "GEMS.Target");
         }
         else if(current_set != null)
@@ -1192 +1243 @@
             Dictionary.setText(target_label, "GEMS.Set");
             target.setText(current_set.toString());
+            Dictionary.setText(target_label, "GEMS.Target");
+        }
+        else if(current_subelement != null)
+        {
+            target.setText(current_subelement.getName());
+            Dictionary.setText(target_label, "GEMS.Subelement");
         }
         
-          //allow user to choose language when they create attr
-          /*         
-          if(source == popupListener.menuAddAttributeAttribute) {  
-            add_type =  true;
-        language_box.setEnabled(true);
-        System.err.println("source is menuAddAttributeAttribute"); //Debug
-          }//end if source== menuaddattributeattribute
-          else*/ if (source == popupListener.menuEditValue){
-          this.menuEditValue();
-              
-          }//end if source == popupListener.menuEditValue)
-        /////////////////////////////////////////////// 
+         if (source == popupListener.menuEditValue)
+         {
+             this.menuEditValue();              
+         }
+ 
             if(source == ok_button) {
         boolean success = true;
@@ -1224 +1274 @@
             success = addOrEditElementAttribute(model);
             break;
+            
+        case GEMSNode.SUBELEMENT:
+            model = (AttributeTableModel) subelement_attributes.getModel();
+            success = addOrEditSubelementAttribute(model);
+            break;
+            
         }
                  
@@ -1233 +1289 @@
                     return;
         }
-        else //debug
+        else
             {
+            //This should not happen.
             System.err.println("No success by OK button."); //debug
             }
@@ -1261 +1318 @@
         //setVisible(true);
         }
-        else if (source == popupListener.menuAddAttributeAttribute || source == popupListener.menuAddAttributeSet || source == popupListener.menuAddAttributeElement){
+        else if (source == popupListener.menuAddAttributeAttribute || source == popupListener.menuAddAttributeSet || source == popupListener.menuAddAttributeElement || source == popupListener.menuAddAttributeSubelement){
 
         Dictionary.setText(this, "GEMS.AddAttribute");
@@ -1431 +1488 @@
            
            break;
+           
+       case GEMSNode.SUBELEMENT:
+           tablemodel = (AttributeTableModel) subelement_attributes.getModel();
+           //grab values in table
+           prevLang =  tablemodel.getValueAt(current_attribute,1).toString();
+           prevValue = tablemodel.getValueAt(current_attribute,2).toString();
+           break;
+           
        default:
            //by default grab element_attr's
@@ -1476 +1541 @@
            model = (AttributeTableModel) element_attributes.getModel();
            break;
+           
+       case GEMSNode.SUBELEMENT:
+           model = (AttributeTableModel) subelement_attributes.getModel();
+           break;
+           
        case GEMSNode.SET:
            model = (AttributeTableModel) set_attributes.getModel();
@@ -1588 +1658 @@
            
         String value_str = Codec.transform(Codec.transformUnicode(value.getText()), Codec.TEXT_TO_DOM);
-              
+        
         // Remove the existing attribute if this is an edit
         if(!add_type && current_attribute != -1) {
@@ -1611 +1681 @@
     }
 
+       //Very similar to addOrEditElementAttribute
+       private boolean addOrEditSubelementAttribute(AttributeTableModel model)
+       {
+       //System.err.println("\ncurrent_attribute is: " + current_attribute + "current_attribute_type is: " + current_attribute_type); //debug
+
+       String name_str = name.getSelectedItem().toString();
+       String language_code = (String) language_box.getSelectedItem();
+
+       String value_str = Codec.transform(Codec.transformUnicode(value.getText()), Codec.TEXT_TO_DOM);
+
+       //Remove the existing attribute if this is an edit.
+       if(!add_type && current_attribute != -1)
+           {
+           Attribute old_attribute = model.getAttribute(current_attribute);
+           String old_value_str = old_attribute.value;
+           String old_lang_code = old_attribute.language;
+           current_subelement.removeAttribute(name_str, old_lang_code, old_value_str);
+           //update the attribute table
+           model.removeRow(current_attribute);
+           }
+
+       //Add the new attribute
+       current_subelement.addAttribute(name_str, language_code, value_str);
+       //Update the attribute table
+       int row = model.add(new Attribute(name_str, language_code, value_str));
+       subelement_attributes.setRowSelectionInterval(row, row);
+
+       value_str = null;
+       language_code = null;
+       name_str = null;
+       return true;
+       }
+
 
     public void dispose() {
@@ -1619 +1722 @@
         target = null;
         value = null;
-        ///ystem.err.println("Dispose AddOrEditAttributeActionListener");
         super.dispose();
     }
     }
-     
+
+
+    private class AddSubelementActionListener extends ModalDialog implements ActionListener {
+    private JButton cancel_button = null;
+    private JButton ok_button = null;
+    private JLabel element_field = null;
+    private NonWhitespaceField name_field = null;
+
+    public AddSubelementActionListener() {
+        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);
+        Dictionary.setText(this, "GEMS.Popup.menuAddSubelement");
+
+        JPanel labels_pane = new JPanel();
+        labels_pane.setOpaque(false);
+        JLabel element_label = new JLabel();
+        element_label.setOpaque(false);
+        Dictionary.setText(element_label, "GEMS.Element");
+        element_field = new JLabel();
+        element_field.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.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.Subelement_Name_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(element_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(element_field);
+        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);
+
+        //use size of Add Element dialog
+        setLocation((config.screen_size.width - ADD_ELEMENT_SIZE.width) / 2, (config.screen_size.height - ADD_ELEMENT_SIZE.height) / 2);
+    }
+
+    public void actionPerformed(ActionEvent event)
+    {
+        //System.err.println("You chose to add a new subelement!!\n"); //debug
+        Object source = event.getSource();
+
+        if(source == ok_button) //Add then dispose
+        {
+            String name_str = Codec.transform(Codec.transformUnicode(name_field.getText()), Codec.TEXT_TO_DOM);
+            
+            current_set = msm.getSet(current_element.getNamespace());
+            if(current_set != null)
+            {
+                 // If this subelement doesn't already exist.
+                if(!current_element.containsSubelement(name_str))
+                {
+                    // Add it,
+                    String language_code = config.getLanguage();
+                    //ElementWrapper subelement = current_set.addSubelementTest(current_element, name_str);
+                    ElementWrapper subelement = current_set.addSubelement(current_element, name_str, language_code);
+                    // Then update the tree
+                    model.add(current_node, subelement, GEMSNode.SUBELEMENT);
+                    //System.out.println("current_node is: " + current_node); //debug
+                    
+                    // Done
+                    subelement = null;
+                    setVisible(false);
+                    //mark as changed
+                    atLeastOneSetChanged = true;
+                    current_set.setSetChanged(true);
+                }
+                else
+                {
+                    //A subelement with the same name exists. Display an error message.
+                    JOptionPane.showMessageDialog(self, Dictionary.get("GEMS.Subelement_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+                }
+            }
+            else
+            {
+                //This should not happen.
+                System.err.println("current_set is null in AddSubelementActionListener!!");
+            }
+        }
+        else if(source == cancel_button)
+        {
+            setVisible(false);
+        }
+        else
+        {
+            element_field.setText(current_element.getName()); //set to the name of the element
+            name_field.setText("");
+            setVisible(true);
+        }
+    }
+
+    public void dispose()
+    {
+        cancel_button = null;
+        ok_button = null;
+        name_field = null;
+        element_field = null;
+        super.dispose();
+    }
+    }
+
+
     private class AddElementActionListener
     extends ModalDialog
@@ -2658 +2908 @@
             ((AttributeTableModel)set_attributes.getModel()).removeRow(current_attribute);
             }
+            else if(current_subelement != null)
+            {
+                //Remove subelement attribute
+                String name = (String)subelement_attributes.getValueAt(current_attribute, 0);
+                String language = (String) subelement_attributes.getValueAt(current_attribute, 1);
+                String value = (String) subelement_attributes.getValueAt(current_attribute, 2);
+                current_subelement.removeAttribute(name, language, value);
+
+                //Refresh table
+                ((AttributeTableModel)subelement_attributes.getModel()).removeRow(current_attribute);
+            }
             // Disable buttons
            // edit_attribute.setEnabled(false);
@@ -2666 +2927 @@
         }
         }
-    }
+        else
+        {
+            System.err.println("Tried to remove attribute, but current_attribute == -1!!"); //This should not happen
+        }
+    }
+    }
+
+    /**
+       Class to handle deletion of subelements.
+       This class can be created from either PopupHandler or KeyPressedHandler. KeyPressedHandler passes a null ActionEvent!!
+       @author: Matthew Whyte
+       @Date last modified: 18/01/04
+    */
+    private class RemoveSubelementActionListener 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.
+     */
+    public void actionPerformed(ActionEvent event)
+    {
+        if(current_subelement != null)
+        {
+            int result = JOptionPane.showOptionDialog(self, Dictionary.get("GEMS.Confirm_Removal", Dictionary.get("GEMS.Subelement")), Dictionary.get("GEMS.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+            if(result ==0) //Continue with remove
+            {
+                TreeNode selPath = current_node.getParent();
+                GEMSNode parent = (GEMSNode)selPath;
+                current_element = parent.getElement();
+
+                ignore = true;
+                msm.removeElement(current_subelement, current_element); //remove the subelement.
+
+                // Clear selection
+                mds_tree.clearSelection();
+                model.remove(current_node); //This is a new way of doing things. 
+                // Meanwhile disable/enable controls given we had an element selected, but no longer do.
+                remove_element.setEnabled(false);
+                // Show a blank panel.
+                card_layout.show(details_pane, BLANK);
+                ignore = false;
+                
+                atLeastOneSetChanged = true;
+            }
+        }
+        else
+        {
+            System.err.println("No subelement is selected."); //This should not happen
+        }
+    }
+
     }
 
@@ -2683 +2992 @@
             ignore = true;
             //System.err.println("Current element's getElement: " + current_element.getElement()); //Debug
-            msm.removeElement(current_element);
+            msm.removeElement(current_element, null);
             // Clear selection
             mds_tree.clearSelection();
@@ -2871 +3180 @@
                 model.add(null, current_set, GEMSNode.SET);
 
+
                 //Clean up
                 card_layout.show(details_pane, BLANK); // Show a blank panel.
@@ -2913 +3223 @@
     }
 
+    /**
+       Class to handle renaming of a subelement
+
+       Author: Matthew Whyte
+       Date last modified: 18/01/05
+     */
+    private class RenameSubelementActionListener extends RenameElementActionListener implements ActionListener {
+    
+    /**
+       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;
+            current_element = parent.getElement();
+            //MetadataSet currentSet = msm.getSet(current_subelement.getNamespace());
+
+            String name_str = Codec.transform(Codec.transformUnicode(name_field.getText()), Codec.TEXT_TO_DOM);
+
+            if(!current_element.containsSubelement(name_str)) //Hopefully this works!
+                {   
+                //Hide the element that are about to rename
+                mds_tree.clearSelection();
+                model.remove(current_node);
+                
+                msm.renameElement(current_subelement, name_str); //rename the element
+                
+                model.add(parent, current_subelement, GEMSNode.SUBELEMENT);
+                
+                //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.Subelement_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+                }
+
+            name_str = null;
+        }
+        
+        else if(source == cancel_button)
+        {
+            setVisible(false); //hide dialog
+        }
+        else
+        {
+            Dictionary.setText(this, "GEMS.Popup.menuRenameSubelement"); //Set title of dialog
+            name_field.setText(current_subelement.getNameOnly()); //show old name
+            setVisible(true); //Show the dialog
+        }
+            
+        source = null;
+    }
+    }
+
  /**
-       Class to hand renaming of an element.
+       Class to handle renaming of an element.
 
        Author: Matthew Whyte
@@ -2921 +3300 @@
     private class RenameElementActionListener extends ModalDialog implements ActionListener {
 
-    private JButton cancel_button = null;
-    private JButton ok_button = null;
+    protected JButton cancel_button = null;
+    protected JButton ok_button = null;
     //private JLabel label = null;
-    private NonWhitespaceField name_field = null;
+    protected NonWhitespaceField name_field = null;
 
        
@@ -3056 +3435 @@
         else
         {
-            name_field.setText(current_element.getName()); //show old name
+            name_field.setText(current_element.getNameOnly()); //show old name (without namespace)
             setVisible(true); //Show the dialog
         }
@@ -3080 +3459 @@
     /**
        Class to handle DELETE key presses on the tree.
-       The class then fires the appropriate event to remove that element/set.
+       The class then fires the appropriate event to remove that subelement/element/set.
        Attributes in the table are handled directly by the RemoveAttributeActionListener
 
@@ -3118 +3497 @@
             GEMSNode t = (GEMSNode)selPath.getLastPathComponent();
             
-            if(t.type == T_ELEMENT) //Remove the element
+            if(t.type == T_SUBELEMENT) //Remove the subelement
+                {
+                RemoveSubelementActionListener removeSubelement = new RemoveSubelementActionListener();
+                removeSubelement.actionPerformed((ActionEvent)null);
+                }
+            else if(t.type == T_ELEMENT) //Remove the element
                 {
                 //System.err.println("element");
@@ -3322 +3706 @@
     public void valueChanged(TreeSelectionEvent event) {
         if(!ignore) {
+        GValueModel value_model = null;
         // Clear all variables based on previous tree selection
         current_collection_file = null;
@@ -3358 +3743 @@
            // setControls(true, false, false, true, false, false, true, false, false, false, false, false);
             break;
+
+        case GEMSNode.SUBELEMENT:
+            current_subelement = current_node.getSubelement();
+            
+            atm = current_node.getModel();
+            if(atm == null) {
+            atm = new AttributeTableModel(current_subelement.getAttributes(), Dictionary.get("GEMS.Name"), Dictionary.get("GEMS.Language_Code"), Dictionary.get("GEMS.Value"), "");
+            }
+
+            subelement_attributes.setModel(atm);
+            atm.setScrollPane(subelement_attributes_scroll);
+            atm.setTable(subelement_attributes);
+            //System.err.println("atm is: " + atm); //debug
+
+            card_layout.show(details_pane, SUBELEMENT); 
+            //card_layout.show(details_pane, BLANK);
+            break;
+
         case GEMSNode.ELEMENT:
             current_element = current_node.getElement();
@@ -3369 +3772 @@
             atm.setTable(element_attributes);
 
+            //System.err.println("atm is: " + atm); //debug
+
             // Be careful not to add the keep_root_expanded_listener over and over!
-            GValueModel value_model = msm.getValueTree(current_element);
+            value_model = msm.getValueTree(current_element);
             if(value_model != null) {
             value_model.removeTreeModelListener(keep_root_expanded_listener); // Remove it if its already there
@@ -3380 +3785 @@
             }
             else {
+            System.err.println("ELEMENT: value_model is null"); //debug
             element_values_layout.show(element_values_pane, BLANK);
             // Meanwhile disable/enable controls depending on this Element selection.
@@ -3442 +3848 @@
   class PopupListener extends MouseAdapter implements ActionListener{
         JPopupMenu setPopup;
-        JPopupMenu subfieldPopup;
+        JPopupMenu subelementPopup;
         JPopupMenu elementPopup;
         JPopupMenu attributePopup;
@@ -3451 +3857 @@
       JMenuItem menuAddAttributeSet;
 
-        JMenuItem menuRenameSubfield;
-        JMenuItem menuDeleteSubfield;
-        JMenuItem menuAddAttributeSubfield;
+        JMenuItem menuRenameSubelement;
+        JMenuItem menuDeleteSubelement;
+        JMenuItem menuAddAttributeSubelement;
         JMenuItem menuRenameElement;
         
         JMenuItem menuDeleteElement;
         JMenuItem menuAddAttributeElement;
-        JMenuItem menuAddSubfield;
+        JMenuItem menuAddSubelement;
         
         JMenuItem menuEditValue;
@@ -3469 +3875 @@
         PopupListener(GEMS g) {
         setPopup = new JPopupMenu();
-        subfieldPopup = new JPopupMenu();
+        subelementPopup = new JPopupMenu();
         elementPopup = new JPopupMenu();
         attributePopup = new JPopupMenu();
@@ -3501 +3907 @@
        Dictionary.setText(menuRemoveSet,"GEMS.Remove_Set_Tooltip");
         
-            //subfield related GEMS.Popups
-            menuRenameSubfield = new JMenuItem();
-            Dictionary.setText(menuRenameSubfield,"GEMS.Popup.menuRenameSubfield");
-            
-            menuDeleteSubfield=new JMenuItem();
-            Dictionary.setText(menuDeleteSubfield,"GEMS.Popup.menuRemoveSubfield");
-            
-            menuAddAttributeSubfield=new JMenuItem();
-           // Dictionary.setText(menuAddAttributeSubfield,"GEMS.Popup.menuAddAttribute");
-             Dictionary.setText(menuAddAttributeSubfield,"GEMS.Add_Attribute_Tooltip");
+            //subelement related GEMS.Popups
+            menuRenameSubelement = new JMenuItem();
+            Dictionary.setText(menuRenameSubelement,"GEMS.Popup.menuRenameSubelement");
+            
+            menuDeleteSubelement=new JMenuItem();
+            Dictionary.setText(menuDeleteSubelement,"GEMS.Popup.menuRemoveSubelement");
+            
+            menuAddAttributeSubelement=new JMenuItem();
+           // Dictionary.setText(menuAddAttributeSubelement,"GEMS.Popup.menuAddAttribute");
+             Dictionary.setText(menuAddAttributeSubelement,"GEMS.Add_Attribute_Tooltip");
             
             //element related GEMS.Popups
@@ -3525 +3931 @@
             Dictionary.setText(menuAddAttributeElement,"GEMS.Add_Attribute_Tooltip");
             
-            menuAddSubfield=new JMenuItem();
-            Dictionary.setText(menuAddSubfield,"GEMS.Popup.menuAddSubfield");
-             //Dictionary.setText(menuAddSubfield,"GEMS.Add_Subfield");
+            menuAddSubelement=new JMenuItem();
+            Dictionary.setText(menuAddSubelement,"GEMS.Popup.menuAddSubelement");
+             //Dictionary.setText(menuAddSubelement,"GEMS.Add_Subelement");
         
             //attribute related GEMS.Popups
@@ -3554 +3960 @@
         setPopup.add(menuRemoveSet);
              
-             //subfieldPopup.add(menuRenameSubfield);
-             subfieldPopup.add(menuDeleteSubfield);
-             subfieldPopup.add(menuAddAttributeSubfield);
+             subelementPopup.add(menuRenameSubelement);
+             subelementPopup.add(menuDeleteSubelement);
+             subelementPopup.add(menuAddAttributeSubelement);
+         subelementPopup.add(menuAddSubelement);
              
              elementPopup.add(menuRenameElement);
              elementPopup.add(menuDeleteElement);
              elementPopup.add(menuAddAttributeElement);
-             //elementPopup.add(menuAddSubfield);
+             elementPopup.add(menuAddSubelement);
               
              attributePopup.add(menuEditValue);
@@ -3573 +3980 @@
              menuAddElement.addActionListener(new AddElementActionListener());
              menuAddAttributeSet.addActionListener(new AddOrEditAttributeActionListener());
-             menuRenameSubfield.addActionListener(this);
-             menuDeleteSubfield.addActionListener(this);
-             menuAddAttributeSubfield.addActionListener(this);
+             menuRenameSubelement.addActionListener(new RenameSubelementActionListener());
+             menuDeleteSubelement.addActionListener(new RemoveSubelementActionListener());
+             menuAddAttributeSubelement.addActionListener(new AddOrEditAttributeActionListener());
              
          menuRenameSet.addActionListener(new RenameSetActionListener());
@@ -3581 +3988 @@
              menuDeleteElement.addActionListener(new RemoveElementActionListener());
              menuAddAttributeElement.addActionListener(new AddOrEditAttributeActionListener());
-             menuAddSubfield.addActionListener(this);
+             menuAddSubelement.addActionListener(new AddSubelementActionListener());
              
             // menuEditValue.addActionListener(new AddOrEditAttributeActionListener());
@@ -3645 +4052 @@
             /*  else if(t.type == T_ELEMENT){
             
-            subfieldPopup.show(e.getComponent(),
+            subelementPopup.show(e.getComponent(),
                        e.getX(), e.getY());
                 }
             */
+            else if(t.type == T_SUBELEMENT)
+            {
+                subelementPopup.show(e.getComponent(), e.getX(), e.getY());
+            }
+
             else if(t.type == T_ROOT){
             
@@ -3689 +4101 @@
                            e.getX(), e.getY());
              }
-               
+         else if(e.getSource() == subelement_attributes)  { //When right-click on table of subelement attributes
+         
+         //Select the table row that was right-clicked on.
+         p = e.getPoint();
+         subelement_attributes.changeSelection(subelement_attributes.rowAtPoint(p), subelement_attributes.columnAtPoint(p), false, false);
+
+         attributePopup.show(e.getComponent(),
+                     e.getX(), e.getY());
+             }
               
                 

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

@@ -83 +83 @@
         }
         }
-        // If this is a set and we are looking for an element, then iterate through its children. Can't really do this recursively.
-        else if(type == GEMSNode.ELEMENT && child.getType() == GEMSNode.SET) {
+        // If this is a set and we are looking for an element or subelement, then iterate through its children. Can't really do this recursively.
+        else if((type == GEMSNode.ELEMENT || type == GEMSNode.SUBELEMENT) && child.getType() == GEMSNode.SET) {
         for(int j = 0; j < child.getChildCount(); j++) {
             GEMSNode inner_child = (GEMSNode) child.getChildAt(j);
-            if(inner_child.toString().equals(name)) {
-            // Place on AWT event thread to avoid errors.
-            SynchronizedTreeModelTools.removeNodeFromParent(this, inner_child);
-            return;
-            }
+            //Go through looking for element
+            if(type == GEMSNode.ELEMENT)
+            {
+                if(inner_child.toString().equals(name)) {
+                // Place on AWT event thread to avoid errors.
+                SynchronizedTreeModelTools.removeNodeFromParent(this, inner_child);
+                return;
+                }
+            }
+            //Go through element looking for subelement
+            else if(type == GEMSNode.SUBELEMENT)
+            {
+                for(int k = 0; k < inner_child.getChildCount(); k++)
+                {
+                    //the subelements
+                    GEMSNode innermost_child = (GEMSNode)inner_child.getChildAt(k);
+                    if(innermost_child.toString().equals(name))
+                    {
+                        // Place on AWT event thread to avoid errors.
+                        SynchronizedTreeModelTools.removeNodeFromParent(this, inner_child);
+                        return;
+                    }
+                }
+            }
         }
         }
     }
+
+    System.err.println("Tried to remove \'" + name + "\' from the tree, but could not find it!"); //This should not happen!
+    }
+
+    /**
+       Remove a node from the tree.
+       @param node the node to remove, as a <strong>GEMSNode</strong>
+       @author Matthew Whyte
+       @date last modified: 21/01/04
+     */
+    public void remove(GEMSNode node)
+    {
+    SynchronizedTreeModelTools.removeNodeFromParent(this, node);
+    return;
     }
 }

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

@@ -62 +62 @@
     static final public int ROOT       = 3; 
     static final public int SET        = 4;
+    static final public int SUBELEMENT = 5;
 
     public GEMSNode() {
@@ -103 +104 @@
         result = (ElementWrapper) userObject;
     }
+    return result;  
+    }
+
+    public ElementWrapper getSubelement() {
+    ElementWrapper result = null;
+    if(type == SUBELEMENT) {
+        result = (ElementWrapper) userObject;
+    }
     return result;
     }
+
     public int getIndex(TreeNode node) {
     if(children == null) {
@@ -201 +211 @@
 
     // How we build children depends on the node type
-    if (type == SET) {
-        // Add the elements as children
-        MetadataSet set = (MetadataSet) userObject;
-        NodeList elements = set.getElements();
-        for (int i = 0; i < elements.getLength(); i++) {
-               
-        children.add(new GEMSNode(ELEMENT, new ElementWrapper((Element) elements.item(i)), this));
-        }
-    }
+    if (type == SET)
+        {
+        // Add the elements as children
+        MetadataSet set = (MetadataSet) userObject;
+        NodeList elements = set.getElements();
+        for (int i = 0; i < elements.getLength(); i++)
+            {
+            children.add(new GEMSNode(ELEMENT, new ElementWrapper((Element) elements.item(i)), this));
+            }
+        }
+    if (type == ELEMENT) //Add subelements
+        {
+        NodeList subelements = this.getElement().getSubelements();
+        for(int j = 0; j < subelements.getLength(); j++)
+            {
+            children.add(new GEMSNode(SUBELEMENT, new ElementWrapper((Element)subelements.item(j)), this));
+            }
+        }
+
     }
     

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

@@ -128 +128 @@
     }
 
+    /**
+       @author: Matthew Whyte
+       @date last modified: 17/01/04
+
+       This will need modifications!!!
+       Maybe this should not be here.
+    */
+    static public void addSubelement(Element element_element, String subelement_name)
+    {
+    Document document = element_element.getOwnerDocument();
+    //Create the new subelement
+    Element subelement = document.createElement("Subelement");
+    subelement.setAttribute(StaticStrings.NAME_ATTRIBUTE, subelement_name);
+    
+    //Add the attribute the old fashioned way.
+    element_element.appendChild(subelement);
+
+    //Clean up
+    subelement = null;
+    document = null;
+    }
+
     /** A method for comparing two AssignedValues trees. This compares not only the Subject hierarchies but also the values themselves.
      * @param avt A <strong>Node</strong> which is the root of an AssignedValues tree.
@@ -298 +320 @@
     TreeSet attribute_tree = new TreeSet();
         
-        
-       // GemsLanguageManager gemsLangManager = new GemsLanguageManager("/home/arosmain/gsdl/gli/classes/xml/languages.xml");
+    // GemsLanguageManager gemsLangManager = new GemsLanguageManager("/home/arosmain/gsdl/gli/classes/xml/languages.xml");
         GEMSLanguageManager gemsLangManager = new GEMSLanguageManager(Configuration.gsdl_path + "/gli/classes/xml/languages.xml");
         
@@ -311 +332 @@
             attribute_tree.add(new Attribute(some_element.getAttribute(StaticStrings.NAME_ATTRIBUTE), some_element.getAttribute(StaticStrings.LANGUAGE_ATTRIBUTE), MSMUtils.getValue(some_element)));
                     // System.out.println(some_element_name +  "<- some_element nodes' value");
-                 
-                
                 }
         else if(some_element_name.equals(StaticStrings.LANGUAGE_ELEMENT)) {
                     ///Added by Attila on Nov 05 04
-                   // System.out.println(some_element_name +  "<- some_element nodes' value");
-                    
-                    
-                    ////
+            //System.out.println(some_element_name +  "<- some_element nodes' value"); //debug
                     
             String language_code = some_element.getAttribute(StaticStrings.CODE_ATTRIBUTE);
@@ -326 +342 @@
             for(int i = 0; i < attribute_elements.getLength(); i++) {
             Element attribute_element = (Element) attribute_elements.item(i);
-                      
                      
-                            //System.out.println("code is:" + language_code);
-                        
-                           
                             for(int k = 0; k < enabled_langs.length; k++){
                                 
                                if(enabled_langs[k].trim().compareTo(some_element.getAttributes().item(0).getNodeValue().toString()) == 0){
-                                   
-                                
-                               
+                     
                                  attribute_tree.add(new Attribute(attribute_element.getAttribute(StaticStrings.NAME_ATTRIBUTE), language_code, MSMUtils.getValue(attribute_element)));
                      attribute_element = null;
@@ -363 +373 @@
         }
     }
-     //  attribute_tree.
     return attribute_tree;
     }
@@ -543 +552 @@
     // Retrieve this elements name
     name_buffer.append(element.getAttribute("name"));
+
     // Now we check if element has a parent node, other than root. If so we begin building up the full name
+    //For some reason this doesn't work in specific cases of subelements.
     Element parent_element = (Element) element.getParentNode();
-    while(parent_element != null && parent_element != root) {
+    while(parent_element != null && parent_element != root) { 
         name_buffer.insert(0, SF_SEP);
         name_buffer.insert(0, parent_element.getAttribute("name"));
@@ -566 +577 @@
     } // static public String getFullName(Element element)
 
+    /**
+       Method to get an element's name, not including its namespace.
+       @param element an <strong>Element</strong> whose name we are interested in.
+       @return A <strong>Strong</strong> representing the given elements name
+       @author Matthew Whyte
+       @date last modified: 21/01/04
+     */
+    static final public String getNameOnly(Element element)
+    {
+    StringBuffer name_buffer = new StringBuffer();
+    if(element == null) {
+        return "Error";
+    }
+    // Retrieve this elements name
+    name_buffer.append(element.getAttribute("name"));
+
+    return name_buffer.toString();
+    }
+
+
     /** Method to construct an elements name (sic identifier) by retrieving the correct attribute, language specific.
      * @param element the Element whose name we wish to retrieve
@@ -579 +610 @@
         identifier = element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
     }
+
     return identifier;
     }
+
+
 
     /** Method to retrieve from the node given, a certain child node with the specified name.

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

@@ -177 +177 @@
     }
 
+    /**
+       Add a new subelement with the name given to parent_element in this metadata set.
+       @param name The name of this element as a <strong>String</strong>.
+       @param parent_element The <strong>ElementWrapper</strong> that parents the subelement.
+       @param language The two letter language code as a <strong>String</strong>
+       @return An <strong>SubelementWrapper</strong> around the newly created subelement.
+       @author Matthew Whyte
+       @date last modified: 18/01/05
+     */
+    public ElementWrapper addSubelement(ElementWrapper parent_element, String name, String language)
+    {
+    //The language-dependent 'label' of the subelement. By default is same as name.
+    Text text = document.createTextNode(name);
+    Element label = document.createElementNS("", "Attribute");
+    label.setAttribute("name", "label");
+    label.setAttribute("language", language);
+    label.appendChild(text);
+
+    //The subelement.
+    Element subelement = document.createElementNS("", "Subelement");
+    subelement.setAttribute("name", name);
+    subelement.appendChild(label);
+
+    Element parent = parent_element.getElement(); //The parent element
+    parent.appendChild(subelement);
+    return new ElementWrapper(subelement);
+    }
+
+
     /** Add a new default metadata element with the given name to this metadata set.
      * @param name The name of this element as a <strong>String</strong>.
@@ -478 +507 @@
      * @param element The <strong>Element</strong> to be removed.
      */
-    public void removeElement(Element element) {
+    public void removeElement(Element element, ElementWrapper parent_wrapped) {
     // we need to remove the value tree too!!
     //System.err.println("removeElement in MetadataSet: element is: " + element); //Debug
 
     try {
-        removeValueTree(new ElementWrapper(element));
-        root.removeChild(element);
+        ElementWrapper element_wrapped = new ElementWrapper(element);
+        removeValueTree(element_wrapped);
+        if(element_wrapped.isSubelement())
+        {
+            //Want to remove subelement.
+            //System.err.println("Wanna remove subelement"); //debug
+            Element parent = parent_wrapped.getElement();
+            parent.removeChild(element);
+        }
+        else
+        {
+            root.removeChild(element);
+        }
 
     } catch(Exception DOMException) { //The element does not exist!!
@@ -508 +548 @@
      */
     public GValueModel removeValueTree(ElementWrapper element) {
-    for(Enumeration keys = value_trees.keys(); keys.hasMoreElements(); ) {
-        ElementWrapper sibling = (ElementWrapper) keys.nextElement();
-        if(sibling.equals(element)) {
-        GValueModel value_tree = (GValueModel) value_trees.get(sibling);
-        value_trees.remove(sibling);
-        return value_tree;
-        }
-    }
+    for(Enumeration keys = value_trees.keys(); keys.hasMoreElements(); )
+        {
+        ElementWrapper sibling = (ElementWrapper) keys.nextElement();
+        if(sibling.equals(element))
+            {
+            GValueModel value_tree = (GValueModel) value_trees.get(sibling);
+            value_trees.remove(sibling);
+            return value_tree;
+            }
+        }
     return null;
     }

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

@@ -110 +110 @@
        @param: new_name: The new (language-dependent) name for the current_set. Multiple names in different languages is not yet implemented in GEMS, but when it is, this method will need to be updated.
 
-       @Pre: There is not another metadata set with namespace new_namespace. Ie namespaces are unique.
-       @Post: The Name and namespace in the metadata file will have been updated. The filename will stay the same.
+       @pre: There is not another metadata set with namespace new_namespace. Ie namespaces are unique.
+       @post: The Name and namespace in the metadata file will have been updated. The filename will stay the same.
 
        @author Matthew Whyte
@@ -376 +376 @@
         //already loaded-Attila 
         for(Enumeration keys = mds_hashtable.keys(); keys.hasMoreElements(); ) {
-        tempSet = (MetadataSet)mds_hashtable.get(keys.nextElement());  
-            
+        //System.err.println("keys: " + keys.nextElement() + "\n"); //debug
+        tempSet = (MetadataSet)mds_hashtable.get(keys.nextElement());        
             all_sets[i] = tempSet.getFile();
             i++;
@@ -426 +426 @@
     }
 
-
-    public void removeElement(ElementWrapper element) {
+    /**
+       Method to remove an element or subelement from a metadata set
+       @param element the element to remove, as an <strong>ElementWrapper</strong>
+       @param parent the parent of the element, as an <strong>ElementWrapper</strong> This is required if removing a subelement (can be null otherwise)
+       @return void
+       Modified by Matthew Whyte 19/01/04
+     */
+    public void removeElement(ElementWrapper element, ElementWrapper parent) {
     // Retrieve the metadata set this element belongs to.
     String namespace = element.getNamespace();
+    //System.err.println("namespace is: " + namespace); //debug
     MetadataSet set = (MetadataSet) mds_hashtable.get(namespace);
     if(set != null) {
         // Bugger. Get the old name -before- we remove the element from the set.
-        String old_name = element.toString();
-        // Remove the element.
-        
-        set.removeElement(element.getElement());
+        //String old_name = element.toString();
+        set.removeElement(element.getElement(), parent); //Remove the element
     }
     else {
-        ///ystem.err.println("no such set " + namespace);
-    }
-    // No such set. No such element.
-    }
+        //This should not happen - no such set, no such element.
+        System.err.println("Cannot remove element \'" + element + "\' because there is no such set \'" + namespace + "\'");
+    }
+    }
+
 
  /**
@@ -457 +463 @@
     if(set != null)
         {
+        //System.err.println("newName is: " + newName); //debug
         set.renameElement(oldElement.getElement(), newName); //Rename the element
         }