ref #6774 Adapt to service layer change

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / featuretree / FeatureTreeContentProvider.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
index a8278c654fc451051195f3c706b4cab7fe137e44..2b78666f0ec76417fefb6b3629dccec3eb06ceae 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
@@ -1,9 +1,8 @@
-// $Id$
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -15,8 +14,8 @@ import java.util.List;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
-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;
 
 /**
  * <p>FeatureTreeContentProvider class.</p>
@@ -61,7 +60,7 @@ public class FeatureTreeContentProvider implements ITreeContentProvider {
                        List<FeatureNode> children = ((FeatureTree) parentElement).getRootChildren();
                        return children.toArray();
                }else if(parentElement instanceof FeatureNode){
-                       List<FeatureNode> children = ((FeatureNode) parentElement).getChildren();
+                       List<FeatureNode> children = ((FeatureNode) parentElement).getChildNodes();
                        return children.toArray();
                }else if(parentElement instanceof List){
                        return ((List) parentElement).toArray();
@@ -73,6 +72,9 @@ public class FeatureTreeContentProvider implements ITreeContentProvider {
        /** {@inheritDoc} */
        @Override
        public Object getParent(Object element) {
+           if(element instanceof FeatureNode){
+               return ((FeatureNode) element).getParent();
+           }
                return null;
        }