X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.e4%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fe4%2Fparts%2FAbstractSuiteDashboard.java;h=1271b0df0fa311dcb2508f400d96b2023f4579c8;hp=521c1fca8741f107ceeb57a2e3255ab72ceb3288;hb=19301ef6555ee03f1d7b9b0764c2d40b5ef6654b;hpb=91ba500dcfe75cde313a513e341b7f9f57d64d75

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 521c1fc..1271b0d 100644
--- 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,13 +5,11 @@ 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.api.NodeConstants;
 import org.argeo.cms.ui.eclipse.forms.FormToolkit;
-import org.argeo.cms.util.CmsUtils;
+import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.connect.SystemAppService;
 import org.argeo.connect.resources.ResourcesService;
 import org.argeo.connect.ui.AppWorkbenchService;
@@ -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_WORKSPACE);
+		mainSession = ConnectJcrUtils.login(repository);
 		// updateTooltip(input);
 	}
 
@@ -85,20 +86,20 @@ public abstract class AbstractSuiteDashboard {
 		gd.widthHint = widthHint;
 		gd.heightHint = heightHint;
 		gadgetCmp.setLayoutData(gd);
-		CmsUtils.style(gadgetCmp, ConnectUiStyles.GADGET_BOX);
+		CmsUiUtils.style(gadgetCmp, ConnectUiStyles.GADGET_BOX);
 		return gadgetCmp;
 	}
 
 	protected Composite createGadgetTitleCmp(Composite parent, String title) {
 		Composite titleCmp = toolkit.createComposite(parent, SWT.BACKGROUND | SWT.INHERIT_NONE);
-		CmsUtils.style(titleCmp, ConnectUiStyles.GADGET_HEADER);
+		CmsUiUtils.style(titleCmp, ConnectUiStyles.GADGET_HEADER);
 		titleCmp.setBackground(null);
 		GridData gd = new GridData(SWT.FILL, SWT.TOP, true, false);
 		titleCmp.setLayoutData(gd);
 		titleCmp.setLayout(new GridLayout());
 
 		Label titleLbl = toolkit.createLabel(titleCmp, title + " ", SWT.BOLD);
-		CmsUtils.style(titleLbl, ConnectUiStyles.GADGET_HEADER);
+		CmsUiUtils.style(titleLbl, ConnectUiStyles.GADGET_HEADER);
 		titleLbl.setBackground(null);
 		return titleCmp;
 	}
@@ -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;
+	// }
 }