ref #9032: adapt featureTree creation to isAvailableFor

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java
index 03ea8b621c16ed37cb7adf8308866ceb5525b445..df9416700f165a081600eda69a30d3233cbcc0a8 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java
@@ -13,6 +13,7 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
 import eu.etaxonomy.cdm.model.description.Feature;
@@ -102,15 +103,16 @@ public class TermEditorInput extends AbstractDefinedTermEditorInput<DefinedTerm>
     public static TermTree getDefaultFeatureTree() {
         if(defaultFeatureTree == null) {
             List<Feature> features = TermStore.getTerms(Feature.class);
-            TermVocabulary voc = CdmStore.getService(IVocabularyService.class).load(VocabularyEnum.NameFeature.getUuid());
-            List<Feature> nameFeatures = new ArrayList(voc.getTerms());
-            List<Feature> copy = new ArrayList(features);
-            for (Feature feature: copy){
-                if (nameFeatures.contains(feature)){
-                    features.remove(feature);
-                }
-            }
-            defaultFeatureTree = TermTree.NewInstance(features);
+//            TermVocabulary voc = CdmStore.getService(IVocabularyService.class).load(VocabularyEnum.NameFeature.getUuid());
+//            List<Feature> nameFeatures = new ArrayList(voc.getTerms());
+            List<Feature> taxonFeatures = features.stream().filter(f -> f.isAvailableForTaxon())
+                    .collect(Collectors.toList());
+//            for (Feature feature: copy){
+//                if (nameFeatures.contains(feature)){
+//                    features.remove(feature);
+//                }
+//            }
+            defaultFeatureTree = TermTree.NewInstance(taxonFeatures);
         }
         return defaultFeatureTree;
     }