Project

General

Profile

« Previous | Next » 

Revision cb89f4f7

Added by Andreas Müller over 4 years ago

ref #6794 adapt TaxEditor to new term structure (rename FeatureNode and FeatureTree)

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureNodeContainer.java
16 16
import eu.etaxonomy.cdm.model.description.DescriptionBase;
17 17
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
18 18
import eu.etaxonomy.cdm.model.description.Feature;
19
import eu.etaxonomy.cdm.model.term.FeatureNode;
20
import eu.etaxonomy.cdm.model.term.FeatureTree;
21 19
import eu.etaxonomy.cdm.model.description.TaxonDescription;
20
import eu.etaxonomy.cdm.model.term.TermNode;
22 21

  
23 22
/**
24 23
 * This class is a simple container to allow generation of a datastructure that
......
41 40

  
42 41

  
43 42

  
44
	private FeatureNode<Feature> featureNode;
43
	private TermNode<Feature> featureNode;
45 44
	private List<FeatureNodeContainer> children = new ArrayList<FeatureNodeContainer>();
46 45
	private List<DescriptionElementBase> descriptionElements = new ArrayList<DescriptionElementBase>();
47 46

  
......
64 63
	 * @param description
65 64
	 * @return
66 65
	 */
67
	protected void findLeaves(FeatureNode<Feature> featureNode) {
66
	protected void findLeaves(TermNode<Feature> featureNode) {
68 67
		if(featureNode.isLeaf()){
69 68
			buildLeaf(featureNode);
70 69
		}else{
71
			for(FeatureNode<Feature> childNode : featureNode.getChildNodes()){
70
			for(TermNode<Feature> childNode : featureNode.getChildNodes()){
72 71
				findLeaves(childNode);
73 72
			}
74 73
		}
......
80 79
	 * @param description
81 80
	 * @return
82 81
	 */
83
	private void buildLeaf(FeatureNode<Feature> featureNode){
82
	private void buildLeaf(TermNode<Feature> featureNode){
84 83
		if(featureNode.getTerm() == null){
85 84
			throw new IllegalArgumentException("The given feature node does not have a feature.");
86 85
		}
......
140 139
	 */
141 140
	private void buildBranch(){
142 141
		if(getParent() == null){
143
			FeatureNode<Feature> parentFeatureNode = getFeatureNode().getParent();
142
			TermNode<Feature> parentFeatureNode = getFeatureNode().getParent();
144 143

  
145 144
			if(parentFeatureNode.isRoot()){
146 145
				containerTree.getRoot().addChild(this);
......
277 276
	 *
278 277
	 * @param featureNode a {@link eu.etaxonomy.cdm.model.term.FeatureNode} object.
279 278
	 */
280
	public void setFeatureNode(FeatureNode<Feature> featureNode) {
279
	public void setFeatureNode(TermNode<Feature> featureNode) {
281 280
		this.featureNode = featureNode;
282 281
	}
283 282

  
......
286 285
	 *
287 286
	 * @return a {@link eu.etaxonomy.cdm.model.term.FeatureNode} object.
288 287
	 */
289
	public FeatureNode<Feature> getFeatureNode() {
288
	public TermNode<Feature> getFeatureNode() {
290 289
		return featureNode;
291 290
	}
292 291

  

Also available in: Unified diff