/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PolytomousKeyNode.java - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision c5aa066b

fix move taxonnode and remove null values from childrenlists in several places

     	 * <i>this</i> feature node.
     	 */
     	public List<PolytomousKeyNode> getChildren() {
     	    removeNullValueFromChildren();
     		return children;
+    	}
-...
     		if (index < 0 || index > children.size() + 1) {
     			throw new IndexOutOfBoundsException("Wrong index: " + index);
+    		}
     		removeNullValueFromChildren();
     		if(nodeNumber == null) {
     			nodeNumber = getMaxNodeNumberFromRoot() + 1;
+    		}
                 	nodeNumber = getMaxNodeNumberFromRoot() + 1;
+            }
     		children.add(index, child);
     		child.setKey(this.getKey());
-...
     	 */
     	public void removeChild(PolytomousKeyNode child) {
     		int index = children.indexOf(child);
     		if (children.contains(null)){
     		    while(children.contains(null)){
     		        children.remove(null);
+    		    }
+    		}
     		removeNullValueFromChildren();
     		if (index >= 0) {
     			removeChild(index);
+    		}
+    	}
     	private void removeNullValueFromChildren(){
     	    if (children.contains(null)){
                 while(children.contains(null)){
                     children.remove(null);
+                }
+            }
+    	}
     	/**
     	 * Removes the feature node placed at the given (index + 1) position from
     	 * the list of {@link #getChildren() children} of <i>this</i> feature node.

Also available in: Unified diff