Changeset 4505

Timestamp:

2003-06-06T15:45:40+12:00 (21 years ago)

Author:

kjdon

Message:

when adding a new element to a metadata set, we now need to pass in the value tree so that can get added at teh same time

File:

• trunk/gli/src/org/greenstone/gatherer/msm/MetadataSetManager.java (modified) (4 diffs)

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

@@ -654 +654 @@
         boolean cont = false;
         Element mde_new = mds_new.getElement(i);
+        GValueModel mde_values = mds_new.getValueTree(new ElementWrapper(mde_new));
         // See if the element already exists in the current set
         Element mde_cur = mds_cur.getElement(mde_new.getAttribute("name"));
@@ -681 +682 @@
             // Only available to brand new elements, this options 
             // simply adds the element to the set.
-            reason = mds_cur.addElement(mde_new);
+            reason = mds_cur.addElement(mde_new, mde_values);
             if(reason == null) {
             cont = true;
@@ -708 +709 @@
             break;
         case Declarations.RENAME:
-            ///ystem.err.println("Rename element");
             // This case adds the Element, but requires the user to 
             // enter a unique name.
             String new_name = prompt.rename(mde_new);
             if(new_name != null && new_name.length() > 0) {
-            reason = mds_cur.addElement(mde_new, new_name);
+            reason = mds_cur.addElement(mde_new, new_name, mde_values);
             if(reason == null) {
                 mde_cur = mds_cur.getElement(new_name);
@@ -733 +733 @@
         case Declarations.REPLACE:
             // Removes the existing Element then adds the new.
+            
             mds_cur.removeElement(mde_cur);
-            reason = mds_cur.addElement(mde_new);
+            
+            reason = mds_cur.addElement(mde_new, mde_values);
             if(reason == null) {
             cont = true;