merge from trunk

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

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCdmRepository.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCdmRepository.java
index 3cc18f7fe85164801a9973111b888debd05808ad..36cc5234578d40859de73acbbcb8b04c6a8ea99c 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCdmRepository.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCdmRepository.java
@@ -17,6 +17,7 @@ import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionStatus;
 
 import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
+import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.api.service.IClassificationService;
@@ -45,15 +46,16 @@ import eu.etaxonomy.cdm.api.service.IVocabularyService;
 import eu.etaxonomy.cdm.api.service.IWorkingSetService;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+import eu.etaxonomy.cdm.persistence.hibernate.permission.ICdmPermissionEvaluator;
 
 /**
  * @author pplitzner
  * @date 26.09.2013
  *
  */
-public class TransientCdmRepository implements ICdmApplicationConfiguration {
+public class TransientCdmRepository implements ICdmApplicationDefaultConfiguration {
 
-    private ICdmApplicationConfiguration defaultApplicationConfiguration;
+    private ICdmApplicationDefaultConfiguration defaultApplicationConfiguration;
     private TransientOccurenceService occurenceService;
 
     public List<SpecimenOrObservationBase> getUnits(){
@@ -63,7 +65,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration {
     /**
      * @param defaultApplicationConfiguration
      */
-    public TransientCdmRepository(ICdmApplicationConfiguration defaultApplicationConfiguration) {
+    public TransientCdmRepository(ICdmApplicationDefaultConfiguration defaultApplicationConfiguration) {
         this.defaultApplicationConfiguration = defaultApplicationConfiguration;
     }
 
@@ -266,7 +268,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration {
      * @see eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration#getPermissionEvaluator()
      */
     @Override
-    public PermissionEvaluator getPermissionEvaluator() {
+    public ICdmPermissionEvaluator getPermissionEvaluator() {
         return defaultApplicationConfiguration.getPermissionEvaluator();
     }