From 162b8a2c32415a9e3581ecb194ed144edac911d0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 23 Nov 2021 20:08:54 +0100 Subject: [PATCH] ref #694 add DescriptionElementService to TaxEditor --- .../e4/ReferencingObjectsViewE4.java | 3 ++- .../CdmApplicationRemoteConfiguration.java | 6 ++++++ .../descriptive/DescriptionElementTransfer.java | 14 +++++++------- .../handler/MoveDescriptionElementsHandlerE4.java | 7 +++---- ...escriptionElementsSetNameInSourceHandlerE5.java | 6 +++--- .../GrantedAuthorityLabelTextProvider.java | 3 ++- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java index fd641d14b..e4e4b6837 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java @@ -49,6 +49,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; import eu.etaxonomy.cdm.api.service.IAgentService; +import eu.etaxonomy.cdm.api.service.IDescriptionElementService; import eu.etaxonomy.cdm.api.service.IDescriptionService; import eu.etaxonomy.cdm.api.service.IEventBaseService; import eu.etaxonomy.cdm.api.service.IGroupService; @@ -373,7 +374,7 @@ public class ReferencingObjectsViewE4 extends AbstractCdmEditorPartE4 implements } else if (DescriptionBase.class.isAssignableFrom(objectClass)){ referencedObject = CdmStore.getService(IDescriptionService.class).load(entity); } else if (DescriptionElementBase.class.isAssignableFrom(objectClass)){ - referencedObject = CdmStore.getService(IDescriptionService.class).loadDescriptionElement(entity, null); + referencedObject = CdmStore.getService(IDescriptionElementService.class).load(entity, null); } else if (objectClass.equals(Sequence.class)){ referencedObject = CdmStore.getService(ISequenceService.class).load(entity, null); } else if (PolytomousKey.class.isAssignableFrom(objectClass)){ diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java index 0a5d28e4a..a441bf802 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java @@ -43,6 +43,7 @@ import eu.etaxonomy.cdm.api.service.IClassificationService; import eu.etaxonomy.cdm.api.service.ICollectionService; import eu.etaxonomy.cdm.api.service.ICommonService; import eu.etaxonomy.cdm.api.service.IDatabaseService; +import eu.etaxonomy.cdm.api.service.IDescriptionElementService; import eu.etaxonomy.cdm.api.service.IDescriptionService; import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService; import eu.etaxonomy.cdm.api.service.IEntityConstraintViolationService; @@ -289,6 +290,11 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic return (IDescriptionService) getService(IDescriptionService.class, "/remoting/description.service", new AuthenticatingHttpInvokerRequestExecutor()); } + @Override + public IDescriptionElementService getDescriptionElementService(){ + return (IDescriptionElementService) getService(IDescriptionElementService.class, "/remoting/descriptionelement.service", new AuthenticatingHttpInvokerRequestExecutor()); + } + @Override public IOccurrenceService getOccurrenceService(){ return (IOccurrenceService) getService(IOccurrenceService.class, "/remoting/occurrence.service", new AuthenticatingHttpInvokerRequestExecutor()); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementTransfer.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementTransfer.java index 7513d3e81..2789603f6 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementTransfer.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementTransfer.java @@ -1,8 +1,8 @@ /** * Copyright (C) 2007 EDIT -* European Distributed Institute of Taxonomy +* European Distributed Institute of Taxonomy * http://www.e-taxonomy.eu -* +* * The contents of this file are subject to the Mozilla Public License Version 1.1 * See LICENSE.TXT at the top of this package for the full license terms. */ @@ -10,7 +10,7 @@ package eu.etaxonomy.taxeditor.editor.view.descriptive; import java.util.UUID; -import eu.etaxonomy.cdm.api.service.IDescriptionService; +import eu.etaxonomy.cdm.api.service.IDescriptionElementService; import eu.etaxonomy.cdm.model.description.DescriptionElementBase; import eu.etaxonomy.taxeditor.model.CdmObjectTransfer; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -24,13 +24,13 @@ public class DescriptionElementTransfer extends CdmObjectTransfer 0){ - element = CdmStore.getService(IDescriptionService.class).loadDescriptionElement(uuid, null); + element = CdmStore.getService(IDescriptionElementService.class).load(uuid, null); }else{ element = ((DescriptionElementBase) object); } @@ -111,7 +110,7 @@ public class MoveDescriptionElementsHandlerE4 implements IPostOperationEnabled{ for (DescriptionElementBase de : ((FeatureNodeContainer) object).getDescriptionElements()) { DescriptionElementBase element ; if (de.getId() > 0){ - element = CdmStore.getService(IDescriptionService.class).loadDescriptionElement(de.getUuid(), null); + element = CdmStore.getService(IDescriptionElementService.class).load(de.getUuid(), null); }else{ element = (de); } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsSetNameInSourceHandlerE5.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsSetNameInSourceHandlerE5.java index 7d35799ad..b9d086078 100755 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsSetNameInSourceHandlerE5.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsSetNameInSourceHandlerE5.java @@ -37,7 +37,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import eu.etaxonomy.cdm.api.service.IDescriptionService; +import eu.etaxonomy.cdm.api.service.IDescriptionElementService; import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; import eu.etaxonomy.cdm.model.description.DescriptionBase; import eu.etaxonomy.cdm.model.description.DescriptionElementBase; @@ -100,7 +100,7 @@ public class MoveDescriptionElementsSetNameInSourceHandlerE5 implements IPostOpe description = ((DescriptionElementBase) object).getInDescription(); DescriptionElementBase element ; if (((DescriptionElementBase) object).getId() > 0){ - element = CdmStore.getService(IDescriptionService.class).loadDescriptionElement(uuid, null); + element = CdmStore.getService(IDescriptionElementService.class).load(uuid, null); }else{ element = ((DescriptionElementBase) object); } @@ -110,7 +110,7 @@ public class MoveDescriptionElementsSetNameInSourceHandlerE5 implements IPostOpe for (DescriptionElementBase de : ((FeatureNodeContainer) object).getDescriptionElements()) { DescriptionElementBase element ; if (de.getId() > 0){ - element = CdmStore.getService(IDescriptionService.class).loadDescriptionElement(de.getUuid(), null); + element = CdmStore.getService(IDescriptionElementService.class).load(de.getUuid(), null); }else{ element = (de); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityLabelTextProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityLabelTextProvider.java index cbb0ccfac..32e4da33d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityLabelTextProvider.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/grantedAuthority/GrantedAuthorityLabelTextProvider.java @@ -7,6 +7,7 @@ import org.springframework.security.core.GrantedAuthority; import eu.etaxonomy.cdm.api.service.IAgentService; import eu.etaxonomy.cdm.api.service.IClassificationService; +import eu.etaxonomy.cdm.api.service.IDescriptionElementService; import eu.etaxonomy.cdm.api.service.IDescriptionService; import eu.etaxonomy.cdm.api.service.INameService; import eu.etaxonomy.cdm.api.service.IOccurrenceService; @@ -76,7 +77,7 @@ public class GrantedAuthorityLabelTextProvider { targetText = CdmStore.getService(IDescriptionService.class).load(uuid).getTitleCache(); break; case DESCRIPTIONELEMENTBASE: - targetText = CdmStore.getService(IDescriptionService.class).loadDescriptionElement(uuid, null).toString(); + targetText = CdmStore.getService(IDescriptionElementService.class).load(uuid, null).toString(); break; case TAXONBASE: targetText = CdmStore.getService(ITaxonService.class).load(uuid).getTitleCache(); -- 2.34.1