ref #694 add DescriptionElementService to TaxEditor

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 fd641d14b2df17d1333a5c38911fd3aa0cde7695..e4e4b6837cec32449cd1d3aa141688944615715d 100644 (file)
--- 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 0a5d28e4acfaf7c3b53906f8c3c1a3fd823a537a..a441bf8022777a88271a9785a56c3dc15c95293e 100644 (file)
--- 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;\r
 import eu.etaxonomy.cdm.api.service.ICommonService;\r
 import eu.etaxonomy.cdm.api.service.IDatabaseService;\r
+import eu.etaxonomy.cdm.api.service.IDescriptionElementService;\r
 import eu.etaxonomy.cdm.api.service.IDescriptionService;\r
 import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;\r
 import eu.etaxonomy.cdm.api.service.IEntityConstraintViolationService;\r
@@ -289,6 +290,11 @@ public class CdmApplicationRemoteConfiguration implements ICdmRepository, Applic
         return (IDescriptionService) getService(IDescriptionService.class, "/remoting/description.service", new AuthenticatingHttpInvokerRequestExecutor());\r
     }\r
 \r
+    @Override\r
+    public IDescriptionElementService getDescriptionElementService(){\r
+        return (IDescriptionElementService) getService(IDescriptionElementService.class, "/remoting/descriptionelement.service", new AuthenticatingHttpInvokerRequestExecutor());\r
+    }\r
+\r
     @Override\r
     public IOccurrenceService getOccurrenceService(){\r
         return (IOccurrenceService) getService(IOccurrenceService.class, "/remoting/occurrence.service", new AuthenticatingHttpInvokerRequestExecutor());\r

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 7513d3e815198fb0b8ebce06739e0be10d87a5d7..2789603f685ff0fc6a9966cd12754a240921c971 100644 (file)
--- 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<DescriptionEle
        private static DescriptionElementTransfer instance = new DescriptionElementTransfer();
        private static final String TYPE_NAME = "descriptionElement-transfer-format"; //$NON-NLS-1$
        private static final int TYPEID = registerType(TYPE_NAME);
-       
+
        public static synchronized DescriptionElementTransfer getInstance(){
                return instance;
        }
-       
+
        private DescriptionElementTransfer(){}
-       
+
        @Override
        protected int[] getTypeIds() {
                return new int[] { TYPEID };
@@ -43,6 +43,6 @@ public class DescriptionElementTransfer extends CdmObjectTransfer<DescriptionEle
 
        @Override
        public DescriptionElementBase loadElement(UUID uuid) {
-               return CdmStore.getService(IDescriptionService.class).loadDescriptionElement(uuid, null);
+               return CdmStore.getService(IDescriptionElementService.class).load(uuid, null);
        }
 }
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java
index 8c6175dfb5df26b784c937b89716b095450c41b5..056573c58e6e0ecc30c38344e4c2cd8337b14844 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java
@@ -37,13 +37,12 @@ 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;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
-import eu.etaxonomy.cdm.model.metadata.EnabledComputedDescription;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
@@ -101,7 +100,7 @@ public class MoveDescriptionElementsHandlerE4 implements IPostOperationEnabled{
                 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);
                 }
@@ -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 7d35799ad583c7130a927673d59649a891469ee5..b9d086078dc3be4e85ff485958e2e9db3aa96cbd 100755 (executable)
--- 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 cbb0ccfac07daf430a2a2cc9d7c994b015a283c3..32e4da33daffcb08c9b9d1f0e3edb485abdfa1c1 100644 (file)
--- 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();