Changeset 4406

Timestamp:

2003-05-29T15:26:37+12:00 (21 years ago)

Author:

jmt12

Message:

2030089: While it later turned out the problem was due to the root node of the tree not being expanded immediately after adding a node (only later due to JTrees built in mechanisms) I did prune a lot of code here that was responsible for handling 'disabled' values, an idea which never got further than creating a whole bunch of bugs when it came to removing previous values.

File:

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

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

@@ -57 +57 @@
 import java.util.Hashtable;
 import java.util.Vector;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.TreePath;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.tree.*;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.msm.ElementWrapper;
@@ -73 +70 @@
 public class GValueNode 
     extends DefaultMutableTreeNode {
+
     private String element_name = null;
     private String default_value = null;
+
     public GValueNode(Element element) {
     this.children = null;
@@ -155 +154 @@
     /** Returns the child <I>TreeNode</I> at index <I>childIndex</I>.*/
     public TreeNode getChildAt(int index) {
-    GValueNode result = null;
     if(default_value != null) {
         return this;
     }
-    else {
-        if(children == null) {
-        map();
-        }
-        for(int i = 0; index >= 0 && i < children.size(); i++) {
-        GValueNode child = (GValueNode) children.get(i);
-        if(child.getEnabled()) {
-            result = child;
-            index--;
-        }
-        }
-    }
-    return result;
+    if(children == null) {
+        map();
+    }
+    return (GValueNode) children.get(index);
     }
     /** Returns the number of children <I>TreeNode</I>s the reciever contains. */
@@ -179 +168 @@
         size = 0;
     }
-    else {
-        if(children == null) {
-        map();
-        }
-        for(int i = 0; i < children.size(); i++) {
-        GValueNode child = (GValueNode) children.get(i);
-        if(child.getEnabled()) {
-            size++;
-        }
-        }
-    }
-    return size;
-    }
+    if(children == null) {
+        map();
+    }
+    return children.size();
+    }
+
     public Element getElement() {
     return (Element) userObject;
-    }
-    public boolean getEnabled() {
-    return !(((Element)userObject).getAttribute("enabled").equals("false"));
     }
 
@@ -267 +246 @@
     }
     if(index >= children.size()) {
-                // Append to children.
+        // Append to children.
         children.add(child);
-                // And to document
+        // And to document
         getElement().appendChild(((GValueNode)child).getElement());
     }
     else {
         GValueNode sibling = (GValueNode) children.get(index);
-                // Insert in children
+        // Insert in children
         children.add(index, child);
-                // And in document
+        // And in document
         getElement().insertBefore(((GValueNode)child).getElement(), sibling.getElement());
     }
     child.setParent(this);
     }
+
     /** Returns <I>true</I> if the reciever is a leaf. */
     public boolean isLeaf() {
@@ -315 +295 @@
     }
 
-    /** Removes the child at <I>index</I> from the reciever. */
-    public void remove(int index) {
-    // Can't ever remove Elements from here. Have to use editor. */
-    }
-
-    /** Removes <I>node</I> from the reciever. <I>setParent</I> will be 
-     * messaged on node. 
-     */
-    public void remove(MutableTreeNode node) {
-    // Can't ever remove Elements from here. Have to use editor. */
-    }
-
-    /** Removes the reciever from its parent. */
-    public void removeFromParent() {
-    // Can't ever remove Elements from here. Have to use editor. */
-    }
-
     public void setAlias(String alias) {
     setNodeValue("Alias", alias);
-    }
-
-    public void setEnabled(boolean state) {
-    Element element = (Element) userObject;
-    if(state) {
-        element.setAttribute("enabled", "true");
-    }
-    else {
-        element.setAttribute("enabled", "false");
-    }
     }
 
@@ -382 +335 @@
     }
     return Utility.stripNL(result);
-    }
-
-    public void unmap() {
-    children = null;
     }
 
@@ -396 +345 @@
         children.add(child);
         }
+    }
+    }
+
+    /** Removes the child at index from the receiver. */
+    public void remove(int index) {
+    remove((MutableTreeNode)getChildAt(index));
+    }
+     
+    /** Removes node from the receiver. */
+    public void remove(MutableTreeNode node) {
+    children.remove(node);
+    parent = null;
+    // Remove from DOM
+    Node child_node = (Node) userObject;
+    Node parent_node = child_node.getParentNode();
+    parent_node.removeChild(child_node);
+    }
+          
+    /** Removes the receiver from its parent. */
+    public void removeFromParent() {
+    if(parent != null) {
+        parent.remove(this);
     }
     }