Revert "ref #8263 Set term vocabulary DTO when fetching terms"

This reverts commit a9f5e4932d7f9f2b149dd10807935e79f25adf16.

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermDtoContentProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermDtoContentProvider.java
index 6e08c0826da19d01c7620c0919d1d509efb1d0d6..6b32392db7a127f02b9cacbb2d4d7187c660f17b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermDtoContentProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermDtoContentProvider.java
@@ -36,10 +36,7 @@ public class TermDtoContentProvider extends TreeNodeContentProvider {
        public Object[] getChildren(Object parentElement) {
            Collection<TermDto> children = new HashSet<>();
            if(parentElement instanceof TermVocabularyDto){
        public Object[] getChildren(Object parentElement) {
            Collection<TermDto> children = new HashSet<>();
            if(parentElement instanceof TermVocabularyDto){

-               children.addAll(CdmStore.getService(IVocabularyService.class).getCompleteTermHierarchy(((TermVocabularyDto)parentElement).getUuid()));
-               // FIXME this is only temporarily done on the taxeditor side for the hotfix
-               // the cdmlib service method already sets the vocabulary DTO but cdmlib is not released with this hotfix
-               children.forEach(child->child.setVocabularyDto((TermVocabularyDto) parentElement));
+               children.addAll(CdmStore.getService(IVocabularyService.class).getCompleteTermHierarchy((TermVocabularyDto)parentElement));

            } else if(parentElement instanceof TermDto){
                    if(((TermDto) parentElement).getIncludes()!=null){
                        children.addAll(((TermDto) parentElement).getIncludes());
            } else if(parentElement instanceof TermDto){
                    if(((TermDto) parentElement).getIncludes()!=null){
                        children.addAll(((TermDto) parentElement).getIncludes());