Changeset 4405

Timestamp:

2003-05-29T15:23:52+12:00 (21 years ago)

Author:

jmt12

Message:

2030088: Changed add and remove method to used SynchronizedTreeModelTools (even though many of the events a subsequently run invokeLater due to the add and remove calls occuring on the Event Dispatch thread).

File:

• trunk/gli/src/org/greenstone/gatherer/valuetree/GValueModel.java (modified) (8 diffs)

trunk/gli/src/org/greenstone/gatherer/valuetree/GValueModel.java

@@ -82 +82 @@
     /** Value may include path ie news/newssw */
     public GValueNode addValue(String value) {
-    ///ystem.err.println("Adding value to valuetree: " + value);
     StringTokenizer tokenizer = new StringTokenizer(value, "\\");
     GValueNode subject = (GValueNode) root;
@@ -88 +87 @@
         String token = tokenizer.nextToken();
         subject = addValue(token, subject, null);
-                ///ystem.err.println("Found or created a node " + token);
+        ///ystem.err.println("Found or created a node " + token);
     }
     return subject;
@@ -97 +96 @@
     GValueNode value_node = subject.getValue(Utility.stripNL(value));
     if(value_node == null) {
-                // Now add the new value.
+        // Now add the new value.
         Document document = subject.getElement().getOwnerDocument();
-                // Now we create a new subject and add it subject
+        // Now we create a new subject and add it subject
         Element new_subject = document.createElementNS("","Subject");
         Element new_value = document.createElementNS("","Value");
@@ -112 +111 @@
         } 
         value_node = new GValueNode(new_subject);
-                // Figure out where this node will be inserted in subjects 
-                // children.
-        int position = -1;
-        for(int i = 0; position == -1 && i < subject.getChildCount(); i++) {
-        Object sibling = subject.getChildAt(i);
-        int rel_pos = value.compareTo(sibling.toString());
-        ///ystem.err.println("'"+value+"'.compareTo('"+sibling+"') = " + rel_pos);
-        if(rel_pos <= 0) {
-            position = i;
-        }
-        }
-        if(position == -1) {
-        position = subject.getChildCount();
-        }
-                // Insert it. If position is still -1, append it to the end of subjects children.
-                ///ystem.err.println("Inserting '" + value + "' at position " + position);
-        insertNodeInto(value_node, subject, position);
-                // Inform listeners that we've changed.
+        // Insert it. If position is still -1, append it to the end of subjects children.
+        SynchronizedTreeModelTools.insertNodeInto(this, subject, value_node);
+        // Inform listeners that we've changed.
         Gatherer.c_man.getCollection().msm.fireValueChanged(element, null, this);
     }
@@ -159 +143 @@
     GValueNode result = null;
     if(isHierarchy() && Utility.isIndex(index_str)) {
-                // StringTokenize the index
+        // StringTokenize the index
         StringTokenizer tokenizer = new StringTokenizer(index_str, ".");
         result = (GValueNode) root;
-                // Using the index numbers retrieve the appropriate node.
+        // Using the index numbers retrieve the appropriate node.
         try {
         while(result != null && tokenizer.hasMoreTokens()) {
@@ -177 +161 @@
         }
         }
-                // Most likely caused by parseInt throwing a wobbly.
+        // Most likely caused by parseInt throwing a wobbly.
         catch (Exception error) {
         result = null;
         }
-        if(result != null) {
-        // Ensure result is enabled
-        result.setEnabled(true);
-        }
     }
     if(result == null) {
-                ///ystem.err.println("No existing value. Adding " + index_str);
+        ///ystem.err.println("No existing value. Adding " + index_str);
         result = addValue(index_str);
     }
@@ -210 +190 @@
 
     public void removeValue(GValueNode child) {
-    child.setEnabled(false); // Doesn't appear anymore.
     SynchronizedTreeModelTools.removeNodeFromParent(this, child);
     Gatherer.c_man.getCollection().msm.fireValueChanged(new ElementWrapper(child.getElement()), null, this);
@@ -218 +197 @@
     // Retrieve the node to be removed.
     GValueNode node = getValue(value);
-    // Now remove it
-    removeNodeFromParent(node);
-    }
-
-    /** Called to remove a certain value of metadata within a specific
-     * subject within a sbject hierarchy. 
-     * Note that this method currently doesn't do anything.
-     * @param value A String representing the value to be removed.
-     * @param subject An Element representing the subject you wish to remove 
-     * this value from.
-     */ 
-    public void removeValue(String value, GValueNode subject) {
+    if(node != null) {
+        removeValue(node);
+    }
     }