ref #9252 adapting texedior to renamed DTO classes

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/occurrence/OccurrenceSearchController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/occurrence/OccurrenceSearchController.java
index 63366a6d58139ccf0371eafbc76d72ececc0ede0..7d84ac79391d23000f2328c25026a78902e77936 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/occurrence/OccurrenceSearchController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/occurrence/OccurrenceSearchController.java
@@ -18,7 +18,7 @@ import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.config.FindOccurrencesConfigurator;
-import eu.etaxonomy.cdm.api.service.dto.PreservedSpecimenDTO;
+import eu.etaxonomy.cdm.api.service.dto.DerivedUnitDTO;
 import eu.etaxonomy.cdm.persistence.query.MatchMode;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.view.search.facet.SearchController;
  * @since Jan 22, 2019
  *
  */
-public class OccurrenceSearchController extends SearchController<OccurrenceSearchResult, PreservedSpecimenDTO> {
+public class OccurrenceSearchController extends SearchController<OccurrenceSearchResult, DerivedUnitDTO> {
 
     public OccurrenceSearchController(SearchComposite composite) {
         super(composite);
@@ -55,7 +55,7 @@ public class OccurrenceSearchController extends SearchController<OccurrenceSearc
         FindOccurrencesConfigurator config = new FindOccurrencesConfigurator();
         config.setTitleSearchString(searchString);
         config.setMatchMode(MatchMode.ANYWHERE);
-        Collection<PreservedSpecimenDTO> dtos = CdmStore.getService(IOccurrenceService.class).findByTitlePreservedSpecimenDTO(config);
+        Collection<DerivedUnitDTO> dtos = CdmStore.getService(IOccurrenceService.class).findByTitleDerivedUnitDTO(config);
         dtos.stream().forEach(dto->searchResults.add(new OccurrenceSearchResult(dto)));
         return searchResults;
     }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/occurrence/OccurrenceSearchResult.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/occurrence/OccurrenceSearchResult.java
index 15c90e0d975cdcad488383483fc8702848883cc3..caffbf25d65905e90e40e65e8db8fabfe0a0896d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/occurrence/OccurrenceSearchResult.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/occurrence/OccurrenceSearchResult.java
@@ -11,7 +11,7 @@ package eu.etaxonomy.taxeditor.view.search.facet.occurrence;
 import java.util.HashSet;
 import java.util.Set;
 
-import eu.etaxonomy.cdm.api.service.dto.PreservedSpecimenDTO;
+import eu.etaxonomy.cdm.api.service.dto.DerivedUnitDTO;
 import eu.etaxonomy.taxeditor.view.search.facet.Facet;
 import eu.etaxonomy.taxeditor.view.search.facet.SearchResult;
 
@@ -20,14 +20,14 @@ import eu.etaxonomy.taxeditor.view.search.facet.SearchResult;
  * @since Jan 24, 2019
  *
  */
-public class OccurrenceSearchResult extends SearchResult<PreservedSpecimenDTO> {
+public class OccurrenceSearchResult extends SearchResult<DerivedUnitDTO> {
 
-    public OccurrenceSearchResult(PreservedSpecimenDTO content) {
+    public OccurrenceSearchResult(DerivedUnitDTO content) {
         super(content);
     }
 
     @Override
-    protected Set<Facet> initFacets(PreservedSpecimenDTO content) {
+    protected Set<Facet> initFacets(DerivedUnitDTO content) {
         Set<Facet> facets = new HashSet<>();
         content.getAssociatedTaxa().forEach(pair->facets.add(new Facet(pair.getValue(), content.getKindOfUnit())));
         return facets;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/occurrence/OccurrenceSearchResultComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/occurrence/OccurrenceSearchResultComposite.java
index edcf5e2be25ef9d45f71dd28c165df6c335aa3f5..8fd6c40242e52a8502454b9d05477330ce9db7de 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/occurrence/OccurrenceSearchResultComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/occurrence/OccurrenceSearchResultComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 
-import eu.etaxonomy.cdm.api.service.dto.PreservedSpecimenDTO;
+import eu.etaxonomy.cdm.api.service.dto.DerivedUnitDTO;
 import eu.etaxonomy.taxeditor.view.search.facet.CheckBoxSearchResultComposite;
 
 /**
@@ -26,7 +26,7 @@ import eu.etaxonomy.taxeditor.view.search.facet.CheckBoxSearchResultComposite;
  * @since Jan 23, 2019
  *
  */
-public class OccurrenceSearchResultComposite extends CheckBoxSearchResultComposite<PreservedSpecimenDTO, OccurrenceSearchResult> {
+public class OccurrenceSearchResultComposite extends CheckBoxSearchResultComposite<DerivedUnitDTO, OccurrenceSearchResult> {
 
     private Label label;