Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / dataimport / transientServices / TransientCdmRepository.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java
index 9b8f6f1bc6f6881536de494d98e7072475c12b1a..caa6991897609acb5672a25d1935bddccf132a7b 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java
@@ -18,12 +18,13 @@ import org.springframework.transaction.TransactionStatus;
 import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IAgentService;
-import eu.etaxonomy.cdm.api.service.IAmplificationService;
 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.IDescriptionService;
+import eu.etaxonomy.cdm.api.service.IEntityConstraintViolationService;
+import eu.etaxonomy.cdm.api.service.IEntityValidationService;
 import eu.etaxonomy.cdm.api.service.IFeatureNodeService;
 import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
 import eu.etaxonomy.cdm.api.service.IGrantedAuthorityService;
@@ -35,9 +36,7 @@ import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService;
 import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;
-import eu.etaxonomy.cdm.api.service.IPrimerService;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
-import eu.etaxonomy.cdm.api.service.ISequenceService;
 import eu.etaxonomy.cdm.api.service.IService;
 import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
@@ -45,6 +44,9 @@ import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.api.service.IUserService;
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
 import eu.etaxonomy.cdm.api.service.IWorkingSetService;
+import eu.etaxonomy.cdm.api.service.molecular.IAmplificationService;
+import eu.etaxonomy.cdm.api.service.molecular.IPrimerService;
+import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.persistence.hibernate.permission.ICdmPermissionEvaluator;
@@ -59,7 +61,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration {
     private final ICdmApplicationConfiguration defaultApplicationConfiguration;
     private TransientOccurenceService occurenceService;
 
-    public Collection<SpecimenOrObservationBase> getUnits(){
+    public Collection<SpecimenOrObservationBase<?>> getUnits(){
         return occurenceService.getUnits();
     }
 
@@ -142,8 +144,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration {
      */
     @Override
     public ICollectionService getCollectionService() {
-        return defaultApplicationConfiguration.getCollectionService();
-//        return new TransientCollectionService(defaultApplicationConfiguration.getCollectionService());
+        return new TransientCollectionService(defaultApplicationConfiguration.getCollectionService());
     }
 
     /**
@@ -351,10 +352,6 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration {
         return defaultApplicationConfiguration.getTransactionManager();
     }
 
-    /**
-     * @return
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getUserService()
-     */
     @Override
     public IUserService getUserService() {
         return defaultApplicationConfiguration.getUserService();
@@ -371,56 +368,45 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration {
 //        return new TransientVocabularyService(defaultApplicationConfiguration.getVocabularyService());
     }
 
-    /**
-     * @return
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getWorkingSetService()
-     */
     @Override
     public IWorkingSetService getWorkingSetService() {
         return defaultApplicationConfiguration.getWorkingSetService();
 //        return new TransientWorkingSetService(defaultApplicationConfiguration.getWorkingSetService());
     }
 
-    /**
-     * @return
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#startTransaction()
-     */
     @Override
     public TransactionStatus startTransaction() {
         return defaultApplicationConfiguration.startTransaction();
     }
 
-    /**
-     * @param arg0
-     * @return
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#startTransaction(java.lang.Boolean)
-     */
+
     @Override
     public TransactionStatus startTransaction(Boolean arg0) {
         return defaultApplicationConfiguration.startTransaction(arg0);
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getPrimerService()
-     */
     @Override
     public IPrimerService getPrimerService() {
         return defaultApplicationConfiguration.getPrimerService();
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getAmplificationService()
-     */
     @Override
     public IAmplificationService getAmplificationService() {
         return defaultApplicationConfiguration.getAmplificationService();
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getSequenceService()
-     */
     @Override
     public ISequenceService getSequenceService() {
         return defaultApplicationConfiguration.getSequenceService();
     }
+
+       @Override
+       public IEntityConstraintViolationService getEntityConstraintViolationService() {
+               return defaultApplicationConfiguration.getEntityConstraintViolationService();
+       }
+
+       @Override
+       public IEntityValidationService getEntityValidationService() {
+               return defaultApplicationConfiguration.getEntityValidationService();
+       }
 }