Changeset 2445

Timestamp:

11/30/09 22:55:16 (2 years ago)

Author:

mswertz

Message:

Added remove() to enable removal of subtrees.

File:

• molgenis/3.3/src/org/molgenis/util/SimpleTree.java (modified) (2 diffs)

molgenis/3.3/src/org/molgenis/util/SimpleTree.java

@@ -50 +50 @@
                         throw new IllegalArgumentException("name cannot be empty");
                 }
-                if (parent != null && parent.get(name) != null)
-                {
-                        throw new IllegalArgumentException("elements already exists with name = '" + name + "'");
-                }
+                if (parent != null)
+                        try
+                        {
+                                if(parent.get(name) != null)
+                                        throw new IllegalArgumentException("elements already exists with name = '" + name + "'");
+                        } catch(NullPointerException e)
+                        {
+                        }
 
                 // body
@@ -254 +258 @@
                 return this.getName();
         }
+        
+        public void remove()
+        {
+                for(T t: this.getAllChildren())
+                {
+                        this.treeElements.remove(t.getName());
+                }
+                this.treeElements.remove(this.getName());
+        }
 }