adapt vaadin to new package structure for persistence.permission

[cdm-vaadin.git] / src / main / java / eu / etaxonomy / vaadin / mvp / CdmEditorPresenterBase.java

diff --git a/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java b/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java
index fc0f7974b24dfd827e228b72a1cf48124e700eba..16a88bed1ec9cd2498badcd559a177c6f58779dc 100644 (file)
--- a/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java
+++ b/src/main/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterBase.java
@@ -23,9 +23,8 @@ import eu.etaxonomy.cdm.cache.CdmTransientEntityAndUuidCacher;
 import eu.etaxonomy.cdm.debug.PersistentContextAnalyzer;
 import eu.etaxonomy.cdm.model.ICdmEntityUuidCacher;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.User;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;
-import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority;
+import eu.etaxonomy.cdm.model.permission.CRUD;
+import eu.etaxonomy.cdm.persistence.permission.CdmAuthority;
 import eu.etaxonomy.cdm.service.CdmBeanItemContainerFactory;
 import eu.etaxonomy.cdm.service.CdmFilterablePagingProviderFactory;
 import eu.etaxonomy.cdm.service.CdmStore;
@@ -93,18 +92,11 @@ public abstract class CdmEditorPresenterBase<DTO, CDM extends CdmBase, V extends
         logger.trace(this._toString() + " constructor");
     }
 
-    CdmStore<CDM, IService<CDM>> store ;
+    @Autowired
+    protected CdmStore cdmStore;
 
     protected CdmAuthority newAuthorityCreated;
 
-
-    protected CdmStore<CDM, IService<CDM>> getStore() {
-        if(store == null){
-            store = new CdmStore<>(getRepo(), getService());
-        }
-        return store;
-    }
-
     @Override
     protected DTO loadBeanById(Object identifier) {
 
@@ -149,10 +141,8 @@ public abstract class CdmEditorPresenterBase<DTO, CDM extends CdmBase, V extends
         boolean canDelte = userHelper.userHasPermission(cdmEntitiy, CRUD.DELETE);
         boolean canEdit = userHelper.userHasPermission(cdmEntitiy, CRUD.UPDATE);
 
-        User user = userHelper.user();
-
-        if(AbstractCdmPopupEditor.class.isAssignableFrom(getView().getClass())){
-            AbstractCdmPopupEditor popupView = ((AbstractCdmPopupEditor)getView());
+        if(AbstractPopupEditor.class.isAssignableFrom(getView().getClass())){
+            AbstractPopupEditor popupView = ((AbstractPopupEditor)getView());
 
             if(cdmEntitiy.isPersited() && !canEdit){
                 popupView.setReadOnly(true); // never reset true to false here!
@@ -232,7 +222,7 @@ public abstract class CdmEditorPresenterBase<DTO, CDM extends CdmBase, V extends
         EntityChangeEvent<?> changeEvent = null;
         try {
             dto = preSaveBean(dto);
-            changeEvent = getStore().saveBean(cdmEntity, (AbstractView<?>) getView());
+            changeEvent = cdmStore.saveBean(cdmEntity, (AbstractView<?>) getView());
 
             if(changeEvent != null){
                 viewEventBus.publish(this, changeEvent);
@@ -294,7 +284,7 @@ public abstract class CdmEditorPresenterBase<DTO, CDM extends CdmBase, V extends
     @Override
     protected void deleteBean(DTO bean){
         CDM cdmEntity = cdmEntity(bean);
-        EntityChangeEvent changeEvent = getStore().deleteBean(cdmEntity, (AbstractView) getView());
+        EntityChangeEvent changeEvent = cdmStore.deleteBean(cdmEntity, (AbstractView) getView());
         if(changeEvent != null){
             viewEventBus.publish(this, changeEvent);
         }