ref #10365: termTrees should be usable in term selection wizards

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / view / search / facet / term / TermSearchController.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/term/TermSearchController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/term/TermSearchController.java
index 5b300aa96d9358d3a274c70b3520234a220f5b6f..37741b2847d55a512cdd37994503b56ebe920059 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/term/TermSearchController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/term/TermSearchController.java
@@ -26,8 +26,8 @@ import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.model.term.VocabularyEnum;
 import eu.etaxonomy.cdm.persistence.dto.AbstractTermDto;
+import eu.etaxonomy.cdm.persistence.dto.TermCollectionDto;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
-import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.termtree.TermChooseWizardPage;
@@ -68,33 +68,35 @@ public class TermSearchController extends SearchController<TermSearchResult, Abs
     }
 
     @Override
-    protected List<TermSearchResult> searchResults(String searchString){
+    protected List<TermSearchResult> searchResults(String searchString) {
         List<TermSearchResult> searchResults = new ArrayList<>();
-        if(CdmUtils.isNotBlank(searchString)){
-            TermType type = term!= null ? term.getTermType():null;
-            Collection<TermDto> dtos = CdmStore.getService(ITermService.class).findByTitleAsDtoWithVocDto(searchString, type);
+        if (CdmUtils.isNotBlank(searchString)) {
+            TermType type = term != null ? term.getTermType() : null;
+            Collection<TermDto> dtos = CdmStore.getService(ITermService.class).findByTitleAsDtoWithVocDto(searchString,
+                    type);
             dtos.remove(term);
 
             if (this.page != null && this.page.isSkipStandartVocs()) {
-                   Collection<TermDto> filteredDtos = dtos
-                                 .stream()
-                                 .filter(c -> VocabularyEnum.getVocabularyEnumByUuid(c.getVocabularyUuid()) == null).collect(Collectors.toSet());
+                Collection<TermDto> filteredDtos = dtos.stream()
+                        .filter(c -> VocabularyEnum.getVocabularyEnumByUuid(c.getVocabularyUuid()) == null)
+                        .collect(Collectors.toSet());
 
-                   dtos = filteredDtos;
+                dtos = filteredDtos;
             }
 
-            dtos.stream().forEach(dto->searchResults.add(new TermSearchResult(dto)));
-            if (page != null){
-                Collection<TermVocabularyDto> vocDtos = CdmStore.getService(IVocabularyService.class).findVocabularyDtoByTermTypeAndPattern(searchString, type);
+            dtos.stream().forEach(dto -> searchResults.add(new TermSearchResult(dto)));
+            if (page != null) {
+                Collection<TermCollectionDto> vocDtos = CdmStore.getService(IVocabularyService.class)
+                        .findVocabularyDtoByTermTypeAndPattern(searchString, type);
                 if (this.page.isSkipStandartVocs()) {
-                   Collection<TermVocabularyDto> filteredDtos = vocDtos
-                                 .stream()
-                                 .filter(c -> VocabularyEnum.getVocabularyEnumByUuid(c.getUuid()) == null).collect(Collectors.toSet());
+                    Collection<TermCollectionDto> filteredDtos = vocDtos.stream()
+                            .filter(c -> VocabularyEnum.getVocabularyEnumByUuid(c.getUuid()) == null)
+                            .collect(Collectors.toSet());
 
-                   vocDtos = filteredDtos;
+                    vocDtos = filteredDtos;
                 }
 
-                vocDtos.stream().forEach(vocDto->searchResults.add(new TermSearchResult(vocDto)));
+                vocDtos.stream().forEach(vocDto -> searchResults.add(new TermSearchResult(vocDto)));
             }
         }
         return searchResults;
@@ -109,11 +111,11 @@ public class TermSearchController extends SearchController<TermSearchResult, Abs
             public void widgetSelected(SelectionEvent e) {
                 Button selectedComp = (Button) e.widget;
                 boolean selected = selectedComp.getSelection();
-                for (CheckBoxSearchResultComposite<?,?> comp: getSearchResultComposites()){
+                for (CheckBoxSearchResultComposite<?, ?> comp : getSearchResultComposites()) {
                     comp.getBtnCheck().setSelection(false);
                 }
                 selectedComp.setSelection(selected);
-                if (page != null){
+                if (page != null) {
                     page.setPageComplete(selected);
                 }
             }
@@ -132,7 +134,7 @@ public class TermSearchController extends SearchController<TermSearchResult, Abs
     }
 
     @Override
-    protected void search(){
+    protected void search() {
         super.search();
 
     }