From 0e9a6a7562d44148d1d26b32ab5b450a29c7735e Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Tue, 20 Sep 2016 16:59:29 +0200 Subject: [PATCH] ref #5616 Generalize evaluation of available CdmViewers --- .../eu/etaxonomy/taxeditor/view/CdmViewerUtil.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtil.java index 9f25e6804..019f04b87 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtil.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/CdmViewerUtil.java @@ -19,11 +19,6 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.commands.ICommandService; -import eu.etaxonomy.cdm.api.service.IOccurrenceService; -import eu.etaxonomy.cdm.api.service.ITaxonService; -import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; -import eu.etaxonomy.cdm.model.taxon.Synonym; -import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -52,13 +47,7 @@ public class CdmViewerUtil { //for generic UuidAndTitleCache objects try to load the object if (input instanceof UuidAndTitleCache){ UuidAndTitleCache uuidAndTitleCache = (UuidAndTitleCache)input; - Class type = uuidAndTitleCache.getType(); - if(type == Taxon.class || type == Synonym.class){ - input = CdmStore.getService(ITaxonService.class).load(uuidAndTitleCache.getUuid()); - } - else if(SpecimenOrObservationBase.class.isAssignableFrom(type)){ - input = CdmStore.getService(IOccurrenceService.class).load(uuidAndTitleCache.getUuid()); - } + input = CdmStore.getCommonService().find(uuidAndTitleCache.getType(), uuidAndTitleCache.getUuid()); } -- 2.34.1