Project

General

Profile

« Previous | Next » 

Revision a81acd75

Added by Katja Luther over 5 years ago

revert commit ff21181c

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
324 324
     */
325 325
    protected void setParent(TaxonNode parent) {
326 326
        this.parent = parent;
327
//        this.treeIndex = parent.treeIndex() + "#"+this.getId()+"#";
327
//        this.treeIndex = parent.treeIndex() +
328 328
    }
329 329

  
330 330
    // *************** Excluded Note ***************
......
526 526
     */
527 527
    @Transient
528 528
    private void setClassificationRecursively(Classification newClassification) {
529
        try{
530
            if (newClassification == null){
531
            	throw new IllegalArgumentException("New Classification must not be 'null' when setting new classification.");
532
            }
533
        	if(! newClassification.equals(this.getClassification())){
534
                this.setClassification(newClassification);
535
                for(TaxonNode childNode : this.getChildNodes()){
536
                    childNode.setClassificationRecursively(newClassification);
537
                }
529
        if (newClassification == null){
530
        	throw new IllegalArgumentException("New Classification must not be 'null' when setting new classification.");
531
        }
532
    	if(! newClassification.equals(this.getClassification())){
533
            this.setClassification(newClassification);
534
            for(TaxonNode childNode : this.getChildNodes()){
535
                childNode.setClassificationRecursively(newClassification);
538 536
            }
539
        }catch (NullPointerException e){
540
            System.err.println("NPE???");
541 537
        }
542 538
    }
543 539

  

Also available in: Unified diff