/ - Diff - EDIT - EDIT Project Management

     import org.hibernate.annotations.Table;
     import org.hibernate.envers.Audited;
     import eu.etaxonomy.cdm.hibernate.HHH_9751_Util;
     import eu.etaxonomy.cdm.model.common.ITreeNode;
     import eu.etaxonomy.cdm.model.common.VersionableEntity;
-...
     	 */
     	@Override
         public List<FeatureNode> getChildNodes() {
     	    HHH_9751_Util.removeAllNull(children);
     	    updateSortIndex();
     		return children;
+    	}
-...
     	 * @see				#removeChild(int)
     	 */
     	public void removeChild(FeatureNode child){
     	    HHH_9751_Util.removeAllNull(children);
     	    updateSortIndex();
     		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){
     			children.remove(index);
-...
     	 * @see					#removeChild(int)
     	 */
     	public FeatureNode getChildAt(int childIndex) {
     			return children.get(childIndex);
     	    HHH_9751_Util.removeAllNull(children);
     	    updateSortIndex();
     		return children.get(childIndex);
+    	}
     	/**
-...
     	 * @see			#removeChild(int)
     	 */
     	public int getIndex(FeatureNode node) {
     	    HHH_9751_Util.removeAllNull(children);
     	    updateSortIndex();
     		if (! children.contains(node)){
     			return -1;
     		}else{
-...
+    		}
+    	}
     	private void updateSortIndex(){
     	 // TODO workaround (see sortIndex doc)
             for (int i = 0; i < children.size(); i++) {
                 children.get(i).setSortIndex(i);
+            }
+    	}
+    }

     	 */
     	public List<PolytomousKeyNode> getChildren() {
     	    HHH_9751_Util.removeAllNull(children);
     	    updateSortIndex();
     		return children;
+    	}
-...
     			throw new IndexOutOfBoundsException("Wrong index: " + index);
+    		}
     		HHH_9751_Util.removeAllNull(children);
     		updateSortIndex();
     		if(nodeNumber == null) {
                 	nodeNumber = getMaxNodeNumberFromRoot() + 1;
-...
     		children.add(index, child);
     		child.setKey(this.getKey());
     		// TODO workaround (see sortIndex doc)
     		for (int i = 0; i < children.size(); i++) {
     			children.get(i).setSortIndex(i);
+    		}
     		updateSortIndex();
     		child.setSortIndex(index);
     		child.setParent(this);
+    	}
-...
     	 */
     	public void removeChild(PolytomousKeyNode child) {
     		HHH_9751_Util.removeAllNull(children);
     		updateSortIndex();
     		int index = children.indexOf(child);
     		if (index >= 0) {
     			removeChild(index);
-...
     			newNodeN++;
     			List<PolytomousKeyNode> children = node.getChildren();
     			HHH_9751_Util.removeAllNull(children);
     			updateSortIndex();
     			for (PolytomousKeyNode child : children) {
     				if (node == child){
     					throw new RuntimeException("Parent and child are the same for the given key node. This will lead to an infinite loop when updating node numbers.");
-...
+        }
         private void updateSortIndex(){
             // TODO workaround (see sortIndex doc)
             for (int i = 0; i < children.size(); i++) {
                 children.get(i).setSortIndex(i);
+            }
+        }
+    }

     import org.springframework.transaction.annotation.Transactional;
     import eu.etaxonomy.cdm.api.service.config.CreateHierarchyForClassificationConfigurator;
     import eu.etaxonomy.cdm.api.service.config.NodeDeletionConfigurator.ChildHandling;
     import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
     import eu.etaxonomy.cdm.api.service.pager.Pager;
     import eu.etaxonomy.cdm.api.service.pager.PagerUtils;
     import eu.etaxonomy.cdm.api.service.pager.impl.AbstractPagerImpl;
-...
            return dao.classificationLookup(classification);
+       }
         public DeleteResult delete(UUID classificationUuid, TaxonDeletionConfigurator config){
             DeleteResult result = new DeleteResult();
             Classification classification = dao.findByUuid(classificationUuid);
             if (classification == null){
                 result.addException(new IllegalArgumentException("The classification does not exist in database."));
                 result.setAbort();
                 return result;
+            }
             if (!classification.hasChildNodes()){
                 dao.delete(classification);
+            }
             if (config.getTaxonNodeConfig().getChildHandling().equals(ChildHandling.DELETE) ){
                 TaxonNode root = classification.getRootNode();
                 taxonNodeDao.delete(root, true);
                 dao.delete(classification);
+            }
             return result;
+        }
+    }

     import java.util.UUID;
     import eu.etaxonomy.cdm.api.service.config.CreateHierarchyForClassificationConfigurator;
     import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
     import eu.etaxonomy.cdm.api.service.pager.Pager;
     import eu.etaxonomy.cdm.model.media.MediaRepresentation;
     import eu.etaxonomy.cdm.model.name.Rank;
-...
          */
         ClassificationLookupDTO classificationLookup(Classification classification);
         DeleteResult delete(UUID classificationUuid, TaxonDeletionConfigurator config);
+    }

Project

General

Profile

EDIT

Revision 969dbe3e

Added by Katja Luther over 6 years ago