Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / model / FeatureNodeContainer.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureNodeContainer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureNodeContainer.java
index ce88d1cbc473a87d87bbc713427f5b12d65a5ef7..6a5316169bf69b911df49d55f84a375fcf721727 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureNodeContainer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureNodeContainer.java
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2007 EDIT
 * European Distributed Institute of Taxonomy
@@ -17,8 +16,8 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureNode;
-import eu.etaxonomy.cdm.model.description.FeatureTree;
+import eu.etaxonomy.cdm.model.term.FeatureNode;
+import eu.etaxonomy.cdm.model.term.FeatureTree;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 
 /**
@@ -42,7 +41,7 @@ public class FeatureNodeContainer{
 
 
 
-       private FeatureNode featureNode;
+       private FeatureNode<Feature> featureNode;
        private List<FeatureNodeContainer> children = new ArrayList<FeatureNodeContainer>();
        private List<DescriptionElementBase> descriptionElements = new ArrayList<DescriptionElementBase>();
 
@@ -65,11 +64,11 @@ public class FeatureNodeContainer{
         * @param description
         * @return
         */
-       protected void findLeaves(FeatureNode featureNode) {
+       protected void findLeaves(FeatureNode<Feature> featureNode) {
                if(featureNode.isLeaf()){
                        buildLeaf(featureNode);
                }else{
-                       for(FeatureNode childNode : featureNode.getChildNodes()){
+                       for(FeatureNode<Feature> childNode : featureNode.getChildNodes()){
                                findLeaves(childNode);
                        }
                }
@@ -81,12 +80,12 @@ public class FeatureNodeContainer{
         * @param description
         * @return
         */
-       private void buildLeaf(FeatureNode featureNode){
-               if(featureNode.getFeature() == null){
+       private void buildLeaf(FeatureNode<Feature> featureNode){
+               if(featureNode.getTerm() == null){
                        throw new IllegalArgumentException("The given feature node does not have a feature.");
                }
 
-               Feature feature = (Feature) HibernateProxyHelper.deproxy(featureNode.getFeature());
+               Feature feature = HibernateProxyHelper.deproxy(featureNode.getTerm());
 
                // get feature node container for the given feature
                FeatureNodeContainer container = containerTree.getFeatureNodeContainer(feature);
@@ -141,7 +140,7 @@ public class FeatureNodeContainer{
         */
        private void buildBranch(){
                if(getParent() == null){
-                       FeatureNode parentFeatureNode = getFeatureNode().getParent();
+                       FeatureNode<Feature> parentFeatureNode = getFeatureNode().getParent();
 
                        if(parentFeatureNode.isRoot()){
                                containerTree.getRoot().addChild(this);
@@ -276,18 +275,18 @@ public class FeatureNodeContainer{
        /**
         * <p>Setter for the field <code>featureNode</code>.</p>
         *
-        * @param featureNode a {@link eu.etaxonomy.cdm.model.description.FeatureNode} object.
+        * @param featureNode a {@link eu.etaxonomy.cdm.model.term.FeatureNode} object.
         */
-       public void setFeatureNode(FeatureNode featureNode) {
+       public void setFeatureNode(FeatureNode<Feature> featureNode) {
                this.featureNode = featureNode;
        }
 
        /**
         * <p>Getter for the field <code>featureNode</code>.</p>
         *
-        * @return a {@link eu.etaxonomy.cdm.model.description.FeatureNode} object.
+        * @return a {@link eu.etaxonomy.cdm.model.term.FeatureNode} object.
         */
-       public FeatureNode getFeatureNode() {
+       public FeatureNode<Feature> getFeatureNode() {
                return featureNode;
        }
 
@@ -298,7 +297,7 @@ public class FeatureNodeContainer{
         */
        public Feature getFeature(){
                if(featureNode != null){
-                       return featureNode.getFeature();
+                       return featureNode.getTerm();
                }
                return null;
        }