Revision 7cbd337d
Added by Katja Luther almost 4 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java | ||
|---|---|---|
| 13 | 13 |
import java.util.HashSet; |
| 14 | 14 |
import java.util.List; |
| 15 | 15 |
import java.util.Set; |
| 16 |
import java.util.stream.Collectors; |
|
| 16 | 17 |
|
| 17 | 18 |
import eu.etaxonomy.cdm.api.service.IVocabularyService; |
| 18 | 19 |
import eu.etaxonomy.cdm.model.description.Feature; |
| ... | ... | |
| 102 | 103 |
public static TermTree getDefaultFeatureTree() {
|
| 103 | 104 |
if(defaultFeatureTree == null) {
|
| 104 | 105 |
List<Feature> features = TermStore.getTerms(Feature.class); |
| 105 |
TermVocabulary voc = CdmStore.getService(IVocabularyService.class).load(VocabularyEnum.NameFeature.getUuid()); |
|
| 106 |
List<Feature> nameFeatures = new ArrayList(voc.getTerms()); |
|
| 107 |
List<Feature> copy = new ArrayList(features); |
|
| 108 |
for (Feature feature: copy){
|
|
| 109 |
if (nameFeatures.contains(feature)){
|
|
| 110 |
features.remove(feature); |
|
| 111 |
} |
|
| 112 |
} |
|
| 113 |
defaultFeatureTree = TermTree.NewInstance(features); |
|
| 106 |
// TermVocabulary voc = CdmStore.getService(IVocabularyService.class).load(VocabularyEnum.NameFeature.getUuid()); |
|
| 107 |
// List<Feature> nameFeatures = new ArrayList(voc.getTerms()); |
|
| 108 |
List<Feature> taxonFeatures = features.stream().filter(f -> f.isAvailableForTaxon()) |
|
| 109 |
.collect(Collectors.toList()); |
|
| 110 |
// for (Feature feature: copy){
|
|
| 111 |
// if (nameFeatures.contains(feature)){
|
|
| 112 |
// features.remove(feature); |
|
| 113 |
// } |
|
| 114 |
// } |
|
| 115 |
defaultFeatureTree = TermTree.NewInstance(taxonFeatures); |
|
| 114 | 116 |
} |
| 115 | 117 |
return defaultFeatureTree; |
| 116 | 118 |
} |
Also available in: Unified diff
ref #9032: adapt featureTree creation to isAvailableFor