X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.workbench.rap%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fworkbench%2Fparts%2FAbstractSuiteDashboard.java;h=6ca460eb55be19fbdb930c520cad702195de9317;hp=5e7d4be5abbcb61ebc5a2966f7c49a2746713778;hb=ce27112f9bc01fc37b1121496f3ad1eb7593d7eb;hpb=e51dee49ebe0d118c9ce3a5cbf06054e7e2df516

diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java
index 5e7d4be..6ca460e 100644
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/AbstractSuiteDashboard.java
@@ -9,14 +9,14 @@ import javax.jcr.Session;
 
 import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.cms.util.CmsUtils;
-import org.argeo.connect.activities.ActivitiesService;
-import org.argeo.connect.documents.DocumentsService;
-import org.argeo.connect.people.PeopleService;
+import org.argeo.connect.SystemAppService;
 import org.argeo.connect.resources.ResourcesService;
 import org.argeo.connect.ui.ConnectUiStyles;
-import org.argeo.connect.ui.workbench.AppWorkbenchService;
-import org.argeo.connect.ui.workbench.util.EntityEditorInput;
 import org.argeo.connect.util.ConnectJcrUtils;
+import org.argeo.connect.workbench.AppWorkbenchService;
+import org.argeo.connect.workbench.SystemWorkbenchService;
+import org.argeo.connect.workbench.commands.OpenEntityEditor;
+import org.argeo.connect.workbench.util.EntityEditorInput;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -41,10 +41,8 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 	// DEPENDENCY INJECTION
 	private Repository repository;
 	private ResourcesService resourcesService;
-	private ActivitiesService activitiesService;
-	private PeopleService peopleService;
-	private DocumentsService documentsService;
-	private AppWorkbenchService appWorkbenchService;
+	private SystemAppService systemAppService;
+	private SystemWorkbenchService systemWorkbenchService;
 
 	private Session session;
 
@@ -141,15 +139,14 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 			@Override
 			public void widgetSelected(final SelectionEvent event) {
 				Map<String, String> params = new HashMap<String, String>();
-				// FIXME
-				params.put("param.jcrId", ConnectJcrUtils.getIdentifier(entity));
+				params.put(OpenEntityEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(entity));
 				CommandUtils.callCommand(peopleUiService.getOpenEntityEditorCmdId(), params);
 			}
 		});
 		return link;
 	}
 
-	// LIFE CYCLE
+	// Life cycle
 	@Override
 	public void dispose() {
 		JcrUtils.logoutQuietly(session);
@@ -186,28 +183,16 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 		return session;
 	}
 
-	public ResourcesService getResourceService() {
+	public ResourcesService getResourcesService() {
 		return resourcesService;
 	}
 
-	protected ActivitiesService getActivityService() {
-		return activitiesService;
+	protected SystemAppService getSystemAppService() {
+		return systemAppService;
 	}
 
-	protected PeopleService getPeopleService() {
-		return peopleService;
-	}
-
-	protected DocumentsService getDocumentsService() {
-		return documentsService;
-	}
-
-	protected AppWorkbenchService getAppWorkbenchService() {
-		return appWorkbenchService;
-	}
-
-	protected Image getLogoImg() {
-		return logoImg;
+	protected SystemWorkbenchService getSystemWorkbenchService() {
+		return systemWorkbenchService;
 	}
 
 	protected FormToolkit getFormToolkit() {
@@ -223,19 +208,11 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 		this.resourcesService = resourcesService;
 	}
 
-	public void setActivitiesService(ActivitiesService activitiesService) {
-		this.activitiesService = activitiesService;
-	}
-
-	public void setDocumentsService(DocumentsService documentsService) {
-		this.documentsService = documentsService;
-	}
-
-	public void setPeopleService(PeopleService peopleService) {
-		this.peopleService = peopleService;
+	public void setSystemAppService(SystemAppService systemAppService) {
+		this.systemAppService = systemAppService;
 	}
 
-	public void setAppWorkbenchService(AppWorkbenchService appWorkbenchService) {
-		this.appWorkbenchService = appWorkbenchService;
+	public void setSystemWorkbenchService(SystemWorkbenchService systemWorkbenchService) {
+		this.systemWorkbenchService = systemWorkbenchService;
 	}
 }