Changeset 4504 for trunk/gli

Timestamp:

2003-06-06T15:44:35+12:00 (21 years ago)

Author:

kjdon

Message:

fixed up adding and removing elements from teh set - need to add/remove their associated value trees too./shutdown.sh also removeValueTree now deals with GValueModels rather than Elements which it did in a really old version of value trees

File:

• trunk/gli/src/org/greenstone/gatherer/msm/MetadataSet.java (modified) (6 diffs)

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

@@ -196 +196 @@
     /** 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.
+     * @param model A <strong>GValueModel</strong> value tree 
      * @return <i>null</i> if the add is successful, otherwise a <strong>String</strong> containing an error message (phrase key).
      */
-    public String addElement(Element others_element) {
+    public String addElement(Element others_element, GValueModel model) {
     if(!containsElement(others_element.getAttribute("name"))) {
-                // First get ownership of the new element, then add it.
-        Node our_element = document.importNode(others_element, true);
+        // First get ownership of the new element, then add it.
+        Element our_element = (Element)document.importNode(others_element, true);
+        // add the value tree
         root.appendChild(our_element);
+        if (model != null) {
+        addValueTree(new ElementWrapper(our_element), model);   
+        }    
         return null;
     }
     else {
-        return "Element name already exists!";
+        return "MSMPrompt.Name_Exists";
     }
     }
@@ -213 +218 @@
      * @param others_element An <strong>Element</strong> we wish to add to this metadata set, that currently belongs to some other set.
      * @param new_name The new name to be given this element, as a <strong>String</strong>.
+     * @param model A <strong>GValueModel</strong> value tree 
      * @return <i>null</i> if the add is successful, otherwise a <strong>String</strong> containing an error message (phrase key).
      */
-    public String addElement(Element others_element, String new_name) {
+    public String addElement(Element others_element, String new_name, GValueModel model) {
     if(!containsElement(new_name)) {
-                // First get ownership of the new element, then add it.
+        // First get ownership of the new element, then add it.
         Element our_element = 
         (Element) document.importNode(others_element, true);
-                // Change name
+        // Change name
         our_element.setAttribute("name", new_name);
-                // Add it
+        // we also want to change the english identifier of this element
+        MSMUtils.setIdentifier(our_element, new_name);
+        // Add it to teh set
         root.appendChild(our_element);
+        // add the value tree
+        if (model != null) {
+        addValueTree(new ElementWrapper(our_element), model);
+        }
         return null;
     }
@@ -232 +244 @@
     /** Add a value tree to a given metadata element.
      * @param element The <strong>ElementWrapper</strong> containing the element you wish to add a value tree for.
-     * @param value_tree The root <strong>Element</strong> of the value tree.
+     * @param model A <strong>GValueModel</strong> value tree 
      */
     public void addValueTree(ElementWrapper element, GValueModel model) {
@@ -443 +455 @@
     public GValueModel getValueTree(ElementWrapper element) {
     GValueModel value_tree = null;
-    ///ystem.err.println("Retrieving value tree for element: " + element.toString());
     // Stinking hashtable get doesn't use the overridden equals. So I'll do a loop, which should be pretty small ie O(n) for n metadata elements.
     for(Enumeration keys = value_trees.keys(); keys.hasMoreElements(); ) {
@@ -449 +460 @@
         if(sibling.equals(element)) {
         value_tree = (GValueModel) value_trees.get(sibling);
+        break;
         }
     }
@@ -468 +480 @@
      */
     public void removeElement(Element element) {
+    // we need to remove the value tree too!!
+    removeValueTree(new ElementWrapper(element));
     root.removeChild(element);
     }
     /** Used to remove the value tree for a specific element.
      * @param element The <strong>ElementWrapper</strong> whose tree you wish to remove.
-     * @return The <strong>Element</strong> at the root of the value tree we just removed.
-     */
-    public Element removeValueTree(ElementWrapper element) {
+     * @return The <strong>GValueModel</strong> we just removed
+     */
+    public GValueModel removeValueTree(ElementWrapper element) {
     for(Enumeration keys = value_trees.keys(); keys.hasMoreElements(); ) {
         ElementWrapper sibling = (ElementWrapper) keys.nextElement();
         if(sibling.equals(element)) {
-        Element tree_root = (Element) value_trees.get(sibling);
+        GValueModel value_tree = (GValueModel) value_trees.get(sibling);
         value_trees.remove(sibling);
-        return tree_root;
+        return value_tree;
         }
     }