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 aa9a2c03c9fdb962c7e7955ef5b8533ecf697917..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
@@ -23,6 +23,8 @@ 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;
@@ -42,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;
@@ -56,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();
     }
 
@@ -139,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());
     }
 
     /**
@@ -348,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();
@@ -368,32 +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);
     }
+
+    @Override
+    public IPrimerService getPrimerService() {
+        return defaultApplicationConfiguration.getPrimerService();
+    }
+
+    @Override
+    public IAmplificationService getAmplificationService() {
+        return defaultApplicationConfiguration.getAmplificationService();
+    }
+
+    @Override
+    public ISequenceService getSequenceService() {
+        return defaultApplicationConfiguration.getSequenceService();
+    }
+
+       @Override
+       public IEntityConstraintViolationService getEntityConstraintViolationService() {
+               return defaultApplicationConfiguration.getEntityConstraintViolationService();
+       }
+
+       @Override
+       public IEntityValidationService getEntityValidationService() {
+               return defaultApplicationConfiguration.getEntityValidationService();
+       }
 }