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 39ea5ec8b85d3ebce721e69454e881013dd3b568..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,19 +9,20 @@ 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.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.AppWorkbenchService;
+import org.argeo.connect.ui.ConnectEditor;
+import org.argeo.connect.ui.ConnectUiStyles;
+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;
@@ -38,14 +39,13 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
 
        // DEPENDENCY INJECTION
        private Repository repository;
-       private PeopleService peopleService;
-       private DocumentsService documentsService;
-       private AppWorkbenchService appWorkbenchService;
+       private ResourcesService resourcesService;
+       private SystemAppService systemAppService;
+       private SystemWorkbenchService systemWorkbenchService;
 
        private Session session;
 
        // UI Objects
-       private Image logoImg;
        private FormToolkit toolkit;
 
        @Override
@@ -54,7 +54,6 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
                setInput(input);
 
                session = ConnectJcrUtils.login(repository);
-               // initialiseImg();
                updateTooltip(input);
        }
 
@@ -65,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
@@ -101,20 +80,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;
        }
@@ -137,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();
        }
 
@@ -178,24 +154,20 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
        }
 
        // Expose to implementing classes
-       protected PeopleService getPeopleService() {
-               return peopleService;
-       }
-
-       protected AppWorkbenchService getAppWorkbenchService() {
-               return appWorkbenchService;
-       }
-
        protected Session getSession() {
                return session;
        }
 
-       protected Image getLogoImg() {
-               return logoImg;
+       public ResourcesService getResourcesService() {
+               return resourcesService;
+       }
+
+       protected SystemAppService getSystemAppService() {
+               return systemAppService;
        }
 
-       protected DocumentsService getDocumentsService() {
-               return documentsService;
+       protected SystemWorkbenchService getSystemWorkbenchService() {
+               return systemWorkbenchService;
        }
 
        protected FormToolkit getFormToolkit() {
@@ -207,15 +179,15 @@ public abstract class AbstractSuiteDashboard extends EditorPart {
                this.repository = repository;
        }
 
-       public void setAppWorkbenchService(AppWorkbenchService appWorkbenchService) {
-               this.appWorkbenchService = appWorkbenchService;
+       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;
        }
 }