ref #8011 Set termType in search controller constructor

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizardPage.java
index 72ea68d69c9fef070533ed8b8ca8fedce8327690..073a381f80d0b32afcde781eb5685bff989b5c59 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizardPage.java
@@ -16,6 +16,7 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.taxeditor.view.search.facet.SearchComposite;
 import eu.etaxonomy.taxeditor.view.search.facet.term.TermSearchController;
@@ -39,7 +40,7 @@ public class TermChooseWizardPage extends WizardPage {
        @Override
        public void createControl(Composite parent) {
         SearchComposite searchComposite = new SearchComposite(parent, SWT.NONE);
-        controller = new TermSearchController(searchComposite);
+        controller = new TermSearchController(searchComposite, TermType.Feature);
                setControl(searchComposite);
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/term/TermSearch.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/term/TermSearch.java
index e9a4ad9dcf42c292216df3bbc3cae477ee376d56..e48209510d8eef1b8163dbae7156b3103040a139 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/term/TermSearch.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/term/TermSearch.java
@@ -30,6 +30,6 @@ public class TermSearch {
     @PostConstruct
     public void create(Composite parent, IEclipseContext context, @Named(IServiceConstants.ACTIVE_SHELL)Shell shell,
             EMenuService menuService){
-        new TermSearchController(new SearchComposite(parent, SWT.NONE));
+        new TermSearchController(new SearchComposite(parent, SWT.NONE), null);
     }
 }

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 b69e93d1ff01ba95edd3a83ccd1c20a6cd0ab5ed..92ed53332284a74109e657814a4f9caf79547998 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
@@ -31,8 +31,11 @@ import eu.etaxonomy.taxeditor.view.search.facet.SearchController;
  */
 public class TermSearchController extends SearchController<TermSearchResult, TermDto> {
 
-    public TermSearchController(SearchComposite composite) {
+    private TermType termType;
+
+    public TermSearchController(SearchComposite composite, TermType termType) {
         super(composite);
+        this.termType = termType;
     }
 
     @Override
@@ -51,7 +54,7 @@ public class TermSearchController extends SearchController<TermSearchResult, Ter
     @Override
     protected List<TermSearchResult> searchResults(String searchString){
         List<TermSearchResult> searchResults = new ArrayList<>();
-        Collection<TermDto> dtos = CdmStore.getService(ITermService.class).findByTitleAsDto(searchString, TermType.Feature);
+        Collection<TermDto> dtos = CdmStore.getService(ITermService.class).findByTitleAsDto(searchString, termType);
         dtos.stream().forEach(dto->searchResults.add(new TermSearchResult(dto)));
         return searchResults;
     }