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=e18d202e035e6aea4b16c493fd83550c5267bb48;hb=ce27112f9bc01fc37b1121496f3ad1eb7593d7eb;hpb=aa4589e3623bd00210ce1a9f56153beee45e6c1d

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 e18d202..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,15 +9,14 @@ import javax.jcr.Session;
 
 import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.cms.util.CmsUtils;
-import org.argeo.connect.documents.DocumentsService;
-import org.argeo.connect.resources.ResourceService;
-import org.argeo.connect.activities.ActivityService;
-import org.argeo.connect.activities.ActivitiesTypes;
-import org.argeo.connect.people.PeopleService;
-import org.argeo.connect.people.workbench.rap.PeopleStyles;
-import org.argeo.connect.people.workbench.rap.editors.util.EntityEditorInput;
-import org.argeo.connect.ui.workbench.AppWorkbenchService;
+import org.argeo.connect.SystemAppService;
+import org.argeo.connect.resources.ResourcesService;
+import org.argeo.connect.ui.ConnectUiStyles;
 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,11 +40,9 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 
 	// DEPENDENCY INJECTION
 	private Repository repository;
-	private ResourceService resourceService;
-	private ActivityService activityService;
-	private PeopleService peopleService;
-	private DocumentsService documentsService;
-	private AppWorkbenchService appWorkbenchService;
+	private ResourcesService resourcesService;
+	private SystemAppService systemAppService;
+	private SystemWorkbenchService systemWorkbenchService;
 
 	private Session session;
 
@@ -106,20 +103,20 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 		gd.widthHint = widthHint;
 		gd.heightHint = heightHint;
 		gadgetCmp.setLayoutData(gd);
-		CmsUtils.style(gadgetCmp, PeopleStyles.PEOPLE_CLASS_GADGET);
+		CmsUtils.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, PeopleStyles.GADGET_HEADER);
+		CmsUtils.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, PeopleStyles.GADGET_HEADER);
+		CmsUtils.style(titleLbl, ConnectUiStyles.GADGET_HEADER);
 		titleLbl.setBackground(null);
 		return titleCmp;
 	}
@@ -142,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);
@@ -187,29 +183,16 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 		return session;
 	}
 
-	public ResourceService getResourceService() {
-		return resourceService;
+	public ResourcesService getResourcesService() {
+		return resourcesService;
 	}
-	
-	protected ActivityService getActivityService() {
-		return activityService;
-	}
-
-	protected PeopleService getPeopleService() {
-		return peopleService;
-	}
-
-	protected DocumentsService getDocumentsService() {
-		return documentsService;
-	}
-
 
-	protected AppWorkbenchService getAppWorkbenchService() {
-		return appWorkbenchService;
+	protected SystemAppService getSystemAppService() {
+		return systemAppService;
 	}
 
-	protected Image getLogoImg() {
-		return logoImg;
+	protected SystemWorkbenchService getSystemWorkbenchService() {
+		return systemWorkbenchService;
 	}
 
 	protected FormToolkit getFormToolkit() {
@@ -221,25 +204,15 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 		this.repository = repository;
 	}
 
-	public void setResourceService(ResourceService resourceService) {
-		this.resourceService = resourceService;
-	}
-	
-	public void setActivityService(ActivityService activityService) {
-		this.activityService = activityService;
+	public void setResourcesService(ResourcesService resourcesService) {
+		this.resourcesService = resourcesService;
 	}
 
-	public void setDocumentsService(DocumentsService documentsService) {
-		this.documentsService = documentsService;
+	public void setSystemAppService(SystemAppService systemAppService) {
+		this.systemAppService = systemAppService;
 	}
 
-	public void setPeopleService(PeopleService peopleService) {
-		this.peopleService = peopleService;
+	public void setSystemWorkbenchService(SystemWorkbenchService systemWorkbenchService) {
+		this.systemWorkbenchService = systemWorkbenchService;
 	}
-
-
-	public void setAppWorkbenchService(AppWorkbenchService appWorkbenchService) {
-		this.appWorkbenchService = appWorkbenchService;
-	}
-
 }