Revision 3048fbc9
Added by Andreas Müller almost 5 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermTreeNode.java | ||
---|---|---|
125 | 125 |
//no factory methods should be provided as FeatureNodes should only |
126 | 126 |
//be created as children of their parent node (#8257) |
127 | 127 |
|
128 |
|
|
128 | 129 |
// ******************** CONSTRUCTOR ***************************************/ |
129 | 130 |
|
130 | 131 |
//TODO needed? |
... | ... | |
547 | 548 |
/** |
548 | 549 |
* Returns all terms that are contained in this node or a child node |
549 | 550 |
* |
551 |
<<<<<<< HEAD:cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermTreeNode.java |
|
550 | 552 |
* @param terms |
553 |
======= |
|
554 |
* @param features |
|
555 |
>>>>>>> ref #6794 add TermRelation and rename FeatureNode -> TermTreeNode:cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermTreeNode.java |
|
551 | 556 |
* @return |
552 | 557 |
*/ |
553 | 558 |
@Transient |
... | ... | |
578 | 583 |
return terms; |
579 | 584 |
} |
580 | 585 |
|
581 |
|
|
582 | 586 |
//*********************** CLONE ********************************************************/ |
583 | 587 |
|
584 | 588 |
/** |
... | ... | |
662 | 666 |
HHH_9751_Util.removeAllNull(children); |
663 | 667 |
updateSortIndex(); |
664 | 668 |
} |
665 |
<<<<<<< HEAD |
|
666 |
======= |
|
667 |
|
|
668 |
>>>>>>> ref #6794 add TermRelation and rename FeatureNode -> TermTreeNode |
|
669 | 669 |
} |
Also available in: Unified diff
ref #6794 add TermRelation and rename FeatureNode -> TermTreeNode
ref #6794 add TermRelation and TermRelationBase