/ - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 541f08b0

Added by Katja Luther almost 8 years ago

ID 541f08b046466324987ed2de77508d9b28677a02
Parent d3752fac
Child 5f7cb15c

remove updateSortindex and move removeNullValues to the mergeListener

     	 */
     	@Override
         public List<FeatureNode> getChildNodes() {
     	    HHH_9751_Util.removeAllNull(children);
     	    updateSortIndex();
     		return children;
     	    return children;
+    	}
     	/**
-...
     	 * @see				#removeChild(int)
     	 */
     	public void removeChild(FeatureNode child){
     	    HHH_9751_Util.removeAllNull(children);
     	    updateSortIndex();
     		int index = children.indexOf(child);
     	    int index = children.indexOf(child);
     		if (index >= 0){
     			removeChild(index);
+    		}
-...
     	 * @see				#removeChild(FeatureNode)
     	 */
     	public void removeChild(int index){
     	    HHH_9751_Util.removeAllNull(children);
         	updateSortIndex();
     		FeatureNode child = children.get(index);
     		if (child != null){
     	   FeatureNode child = children.get(index);
     	   if (child != null){
     			children.remove(index);
     			child.setParent(null);
     			child.setFeatureTree(null);
-...
     	 * @see					#removeChild(int)
     	 */
     	public FeatureNode getChildAt(int childIndex) {
     	    HHH_9751_Util.removeAllNull(children);
     	    updateSortIndex();
     		return children.get(childIndex);
     	    return children.get(childIndex);
+    	}
     	/**
-...
     	 * @see			#removeChild(int)
     	 */
     	public int getIndex(FeatureNode node) {
     	    HHH_9751_Util.removeAllNull(children);
     	    updateSortIndex();
     		if (! children.contains(node)){
     	    if (! children.contains(node)){
     			return -1;
     		}else{
     			return children.indexOf(node);
-...
+            }
+    	}
     	public void removeNullValueFromChildren(){
     	    HHH_9751_Util.removeAllNull(children);
     	    updateSortIndex();
+    	}
+    }

     	 * <i>this</i> feature node.
     	 */
     	public List<PolytomousKeyNode> getChildren() {
     	    HHH_9751_Util.removeAllNull(children);
     	    updateSortIndex();
     		return children;
+    	}
-...
     		if (index < 0 || index > children.size() + 1) {
     			throw new IndexOutOfBoundsException("Wrong index: " + index);
+    		}
     		HHH_9751_Util.removeAllNull(children);
     		updateSortIndex();
     		if(nodeNumber == null) {
                 	nodeNumber = getMaxNodeNumberFromRoot() + 1;
+            }
-...
     	 * @see #removeChild(int)
     	 */
     	public void removeChild(PolytomousKeyNode child) {
     		HHH_9751_Util.removeAllNull(children);
     		updateSortIndex();
     		int index = children.indexOf(child);
     	    int index = children.indexOf(child);
     		if (index >= 0) {
     			removeChild(index);
+    		}
-...
+            }
+        }
         public void removeNullValueFromChildren(){
             HHH_9751_Util.removeAllNull(children);
             updateSortIndex();
+        }
+    }

         @Transient
         public Integer getSortIndex() {
             TaxonNode parent = HibernateProxyHelper.deproxy(this.parent, TaxonNode.class);
             parent.removeNullValueFromChildren();
     		return sortIndex;
             return sortIndex;
+    	}
         /**
          * SortIndex shall be handled only internally, therefore not public.
-...
          */
         protected boolean removeChildNode(TaxonNode childNode){
             boolean result = true;
             removeNullValueFromChildren();
             //removeNullValueFromChildren();
             if(childNode == null){
                 throw new IllegalArgumentException("TaxonNode may not be null");
+            }

Also available in: Unified diff

Project

General

Profile

EDIT

Revision 541f08b0

Added by Katja Luther almost 8 years ago