Adapt to changes in Argeo Commons.

[gpl/argeo-suite.git] / org.argeo.suite.e4 / src / org / argeo / suite / e4 / parts / AbstractSuiteDashboard.java

diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java
index 521c1fca8741f107ceeb57a2e3255ab72ceb3288..f473297431cd8c9d50e4e19220bf6019247995ec 100644 (file)
--- a/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java
+++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/parts/AbstractSuiteDashboard.java
@@ -5,11 +5,8 @@ import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.jcr.Node;
 import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.ui.eclipse.forms.FormToolkit;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.connect.SystemAppService;
@@ -20,6 +17,7 @@ import org.argeo.connect.ui.SystemWorkbenchService;
 import org.argeo.connect.util.ConnectJcrUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
+import org.argeo.node.NodeConstants;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.client.service.BrowserNavigation;
@@ -35,7 +33,8 @@ import org.eclipse.swt.widgets.Link;
 
 /** Generic dashboard for Argeo Suite applications */
 public abstract class AbstractSuiteDashboard {
-       private final static Log log = LogFactory.getLog(AbstractSuiteDashboard.class);
+       // private final static Log log =
+       // LogFactory.getLog(AbstractSuiteDashboard.class);
 
        // DEPENDENCY INJECTION
        @Inject
@@ -47,7 +46,8 @@ public abstract class AbstractSuiteDashboard {
        @Inject
        private SystemWorkbenchService systemWorkbenchService;
 
-       private Session session;
+       private Session homeSession;
+       private Session mainSession;
 
        // UI Objects
        private FormToolkit toolkit;
@@ -56,7 +56,8 @@ public abstract class AbstractSuiteDashboard {
        private BrowserNavigation browserNavigation;
 
        public void init() {
-               session = ConnectJcrUtils.login(repository);
+               homeSession = ConnectJcrUtils.login(repository, NodeConstants.HOME);
+               mainSession = ConnectJcrUtils.login(repository);
                // updateTooltip(input);
        }
 
@@ -133,7 +134,8 @@ public abstract class AbstractSuiteDashboard {
        // Life cycle
        @PreDestroy
        public void dispose() {
-               JcrUtils.logoutQuietly(session);
+               JcrUtils.logoutQuietly(homeSession);
+               JcrUtils.logoutQuietly(mainSession);
        }
 
        @Focus
@@ -142,8 +144,12 @@ public abstract class AbstractSuiteDashboard {
        }
 
        // Expose to implementing classes
-       protected Session getSession() {
-               return session;
+       protected Session getHomeSession() {
+               return homeSession;
+       }
+
+       public Session getMainSession() {
+               return mainSession;
        }
 
        public ResourcesService getResourcesService() {
@@ -163,19 +169,20 @@ public abstract class AbstractSuiteDashboard {
        }
 
        /* DEPENDENCY INJECTION */
-       public void setRepository(Repository repository) {
-               this.repository = repository;
-       }
-
-       public void setResourcesService(ResourcesService resourcesService) {
-               this.resourcesService = resourcesService;
-       }
-
-       public void setSystemAppService(SystemAppService systemAppService) {
-               this.systemAppService = systemAppService;
-       }
-
-       public void setSystemWorkbenchService(SystemWorkbenchService systemWorkbenchService) {
-               this.systemWorkbenchService = systemWorkbenchService;
-       }
+       // public void setRepository(Repository repository) {
+       // this.repository = repository;
+       // }
+       //
+       // public void setResourcesService(ResourcesService resourcesService) {
+       // this.resourcesService = resourcesService;
+       // }
+       //
+       // public void setSystemAppService(SystemAppService systemAppService) {
+       // this.systemAppService = systemAppService;
+       // }
+       //
+       // public void setSystemWorkbenchService(SystemWorkbenchService
+       // systemWorkbenchService) {
+       // this.systemWorkbenchService = systemWorkbenchService;
+       // }
 }