Adapt to changes in Connect

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

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 48053da45ba7bc5f6841d4a94b18f396f8d4206f..29c5672440eeb0db04b6c6c54df4996945c6855f 100644 (file)
--- 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,21 +9,20 @@ 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.AppWorkbenchService;
+import org.argeo.connect.ui.ConnectEditor;
 import org.argeo.connect.ui.ConnectUiStyles;
-import org.argeo.connect.ui.workbench.AppWorkbenchService;
-import org.argeo.connect.ui.workbench.parts.EntityEditorInput;
+import org.argeo.connect.ui.SystemWorkbenchService;
 import org.argeo.connect.util.ConnectJcrUtils;
+import org.argeo.connect.workbench.util.EntityEditorInput;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -41,15 +40,12 @@ 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;
 
        // UI Objects
-       private Image logoImg;
        private FormToolkit toolkit;
 
        @Override
@@ -58,7 +54,6 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
                setInput(input);
 
                session = ConnectJcrUtils.login(repository);
-               // initialiseImg();
                updateTooltip(input);
        }
 
@@ -69,26 +64,6 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
                }
        }
 
-       // private void initialiseImg() {
-       // InputStream is = null;
-       // try {
-       // String imgPath = peopleService.getInstanceConfPath() + "/"
-       // + AoNames.AO_DEFAULT_LOGO;
-       // if (session.nodeExists(imgPath)) {
-       // Node imageNode = session.getNode(imgPath).getNode(
-       // Node.JCR_CONTENT);
-       // is = imageNode.getProperty(Property.JCR_DATA).getBinary()
-       // .getStream();
-       // logoImg = new Image(this.getSite().getShell().getDisplay(), is);
-       // }
-       // } catch (RepositoryException re) {
-       // throw new AoException(
-       // "Unable to initialise specific logo for demo app", re);
-       // } finally {
-       // IOUtils.closeQuietly(is);
-       // }
-       // }
-
        /**
         * Implementing classes must call super in order to create the correct form
         * toolkit
@@ -141,20 +116,17 @@ 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(ConnectEditor.PARAM_JCR_ID, ConnectJcrUtils.getIdentifier(entity));
                                CommandUtils.callCommand(peopleUiService.getOpenEntityEditorCmdId(), params);
                        }
                });
                return link;
        }
 
-       // LIFE CYCLE
+       // Life cycle
        @Override
        public void dispose() {
                JcrUtils.logoutQuietly(session);
-               if (logoImg != null)
-                       logoImg.dispose();
                super.dispose();
        }
 
@@ -186,28 +158,16 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
                return session;
        }
 
-       public ResourcesService getResourceService() {
+       public ResourcesService getResourcesService() {
                return resourcesService;
        }
 
-       protected ActivitiesService getActivityService() {
-               return activitiesService;
-       }
-
-       protected PeopleService getPeopleService() {
-               return peopleService;
+       protected SystemAppService getSystemAppService() {
+               return systemAppService;
        }
 
-       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 +183,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;
        }
 }