Enhance refactoring, bug shooting

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

diff --git a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
index 7e51ede103ce8c1d35c2c49c761b30d2da421919..a9dd0e5e969b4c3d3e78514d7c2d592f4e6b1e4a 100644 (file)
--- a/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
+++ b/org.argeo.suite.workbench.rap/src/org/argeo/suite/workbench/parts/DefaultDashboardEditor.java
@@ -5,9 +5,11 @@ import javax.jcr.NodeIterator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.connect.people.PeopleConstants;
+import org.argeo.connect.ConnectConstants;
+import org.argeo.connect.activities.ActivitiesTypes;
 import org.argeo.connect.people.PeopleTypes;
-import org.argeo.connect.people.workbench.rap.PeopleRapUtils;
+import org.argeo.connect.resources.ResourcesTypes;
+import org.argeo.connect.ui.workbench.ConnectWorkbenchUtils;
 import org.argeo.connect.ui.workbench.Refreshable;
 import org.argeo.connect.util.ConnectJcrUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
@@ -26,7 +28,7 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
        private int wh = 300;
        private int hh = 350;
 
-       private Composite projectsGadget;
+       private Composite lastUpdatedDocsGadget;
 
        @Override
        public void createPartControl(Composite parent) {
@@ -42,13 +44,12 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
                bodyLayout.verticalSpacing = 20;
                body.setLayout(bodyLayout);
 
-               // Last updated doc List
-               projectsGadget = createGadgetCmp(body, wh, hh);
-               // refreshDocListGadget(projectsGadget);
-
                // Contacts
                Composite contactGadget = createGadgetCmp(body, wh, hh);
                populateContactsGadget(contactGadget);
+
+               // Last updated doc List
+               lastUpdatedDocsGadget = createGadgetCmp(body, wh, hh);
        }
 
        @Override
@@ -63,17 +64,17 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
 
        /** Links to the various last updated docs */
        private void refreshDocListGadget() {
-               EclipseUiUtils.clear(projectsGadget);
-               projectsGadget.setLayout(EclipseUiUtils.noSpaceGridLayout());
-               createGadgetTitleCmp(projectsGadget, "Last updated documents");
-               Composite bodyCmp = createGadgetBodyCmp(projectsGadget);
+               EclipseUiUtils.clear(lastUpdatedDocsGadget);
+               lastUpdatedDocsGadget.setLayout(EclipseUiUtils.noSpaceGridLayout());
+               createGadgetTitleCmp(lastUpdatedDocsGadget, "Last updated documents");
+               Composite bodyCmp = createGadgetBodyCmp(lastUpdatedDocsGadget);
 
                NodeIterator nit = getDocumentsService().getLastUpdatedDocuments(getSession());
                while (nit.hasNext()) {
                        Node file = nit.nextNode();
                        createOpenEntityEditorLink(getAppWorkbenchService(), bodyCmp, ConnectJcrUtils.getName(file), file);
                }
-               projectsGadget.layout(true, true);
+               lastUpdatedDocsGadget.layout(true, true);
        }
 
        /** Links to the various contact search pages */
@@ -82,25 +83,22 @@ public class DefaultDashboardEditor extends AbstractSuiteDashboard implements Re
                createGadgetTitleCmp(parent, "Contacts");
                Composite bodyCmp = createGadgetBodyCmp(parent);
 
-               PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Persons",
+               ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Persons",
                                PeopleTypes.PEOPLE_PERSON, getPeopleService().getBasePath(PeopleTypes.PEOPLE_PERSON));
 
-               PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Organisations",
+               ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Organisations",
                                PeopleTypes.PEOPLE_ORG, getPeopleService().getBasePath(PeopleTypes.PEOPLE_ORG));
 
-               Node tagParent = getPeopleService().getResourceService().getTagLikeResourceParent(getSession(),
-                               PeopleTypes.PEOPLE_MAILING_LIST);
-               PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Mailing lists",
+               Node tagParent = getResourceService().getTagLikeResourceParent(getSession(), PeopleTypes.PEOPLE_MAILING_LIST);
+               ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Mailing lists",
                                PeopleTypes.PEOPLE_MAILING_LIST, ConnectJcrUtils.getPath(tagParent));
+               ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tasks",
+                               ActivitiesTypes.ACTIVITIES_TASK, getPeopleService().getBasePath(null));
 
-               PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tasks", PeopleTypes.PEOPLE_TASK,
-                               getPeopleService().getBasePath(null));
-
-               tagParent = getPeopleService().getResourceService().getTagLikeResourceParent(getSession(),
-                               PeopleConstants.RESOURCE_TAG);
+               tagParent = getResourceService().getTagLikeResourceParent(getSession(), ConnectConstants.RESOURCE_TAG);
 
-               PeopleRapUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tags",
-                               PeopleTypes.PEOPLE_TAG_INSTANCE, ConnectJcrUtils.getPath(tagParent));
+               ConnectWorkbenchUtils.createOpenSearchEditorLink(getAppWorkbenchService(), bodyCmp, "Tags",
+                               ResourcesTypes.RESOURCES_TAG_INSTANCE, ConnectJcrUtils.getPath(tagParent));
 
        }
 }