merge from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / store / CdmStore.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index 97919a11238cea547e679addb9c63011280adaf2..42f14e5ce1ea0473dbf9b4473d30ce5edec6ed7c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -24,7 +24,6 @@ import org.springframework.security.authentication.ProviderManager;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;
 import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IService;
@@ -186,12 +185,12 @@ public class CdmStore {
                cdmDatasource = null;
        }
 
-       static void setInstance(CdmApplicationController applicationController,
+       static void setInstance(ICdmApplicationConfiguration applicationController,
                        ICdmDataSource dataSource) {
                instance = new CdmStore(applicationController, dataSource);
        }
 
-       private CdmStore(CdmApplicationController applicationController,
+       private CdmStore(ICdmApplicationConfiguration applicationController,
                        ICdmDataSource dataSource) {
                this.applicationConfiguration = applicationController;
                this.cdmDatasource = dataSource;
@@ -218,7 +217,7 @@ public class CdmStore {
         * </p>
         * 
         * @return a
-        *         {@link eu.etaxonomy.cdm.api.application.CdmApplicationController}
+        *         {@link eu.etaxonomy.cdm.remote.api.application.CdmApplicationController}
         *         object.
         */
        public static ICdmApplicationConfiguration getCurrentApplicationConfiguration() {
@@ -337,6 +336,7 @@ public class CdmStore {
        public static boolean currentAuthentiationHasPermission(CdmBase targetDomainObject, EnumSet<CRUD> permission){
                //TODO use getCurrentApplicationConfiguration().currentAuthentiationHasPermission(CdmBase targetDomainObject, Operation permission) instead
                SecurityContext context = SecurityContextHolder.getContext();
+               PermissionEvaluator pe = getPermissionEvaluator();
                return getPermissionEvaluator().hasPermission(context.getAuthentication(), targetDomainObject, permission);
        }