Adapt after AppService API modification

[gpl/argeo-suite.git] / org.argeo.suite.web / src / org / argeo / suite / web / DefaultMainPage.java

diff --git a/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java b/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
index b2617e376e5bc1bf0ebca74de35e8e939f8260a9..3adbc294bdb4b64ecd2572e2911c65e9d6977bd4 100644 (file)
--- a/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
+++ b/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
@@ -16,11 +16,12 @@ import org.argeo.cms.ui.CmsView;
 import org.argeo.cms.ui.LifeCycleUiProvider;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.cms.widgets.auth.CmsLogin;
-import org.argeo.connect.people.PeopleService;
-import org.argeo.connect.people.PeopleTypes;
-import org.argeo.connect.people.web.pages.PeopleDefaultPage;
+import org.argeo.connect.ConnectTypes;
 import org.argeo.connect.resources.ResourcesService;
 import org.argeo.eclipse.ui.EclipseUiUtils;
+import org.argeo.people.PeopleService;
+import org.argeo.people.PeopleTypes;
+import org.argeo.people.web.pages.PeopleDefaultPage;
 import org.argeo.suite.web.fs.MyFilesBrowserPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionListener;
@@ -42,7 +43,7 @@ public class DefaultMainPage implements LifeCycleUiProvider {
        private CmsUiProvider fsBrowserPage;
 
        /* DEPENDENCY INJECTION */
-       private ResourcesService resourceService;
+       private ResourcesService resourcesService;
        private PeopleService peopleService;
        private FileSystemProvider nodeFileSystemProvider;
        private Map<String, String> peopleIconPaths;
@@ -52,8 +53,8 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 
        @Override
        public void init(Session adminSession) throws RepositoryException {
-               dashboardPage = new DefaultDashboard(resourceService, peopleService, peopleIconPaths);
-               peoplePage = new PeopleDefaultPage(resourceService, peopleService, peopleIconPaths);
+               dashboardPage = new DefaultDashboard(resourcesService, peopleService, peopleIconPaths);
+               peoplePage = new PeopleDefaultPage(resourcesService, peopleService, peopleIconPaths);
                fsBrowserPage = new MyFilesBrowserPage(nodeFileSystemProvider);
        }
 
@@ -62,9 +63,9 @@ public class DefaultMainPage implements LifeCycleUiProvider {
                if (CurrentUser.isAnonymous())
                        return createAnonymousUi(parent, context);
 
-               if (context.isNodeType(PeopleTypes.PEOPLE_ENTITY))
+               if (context.isNodeType(ConnectTypes.CONNECT_ENTITY))
                        return peoplePage.createUi(parent, context);
-               else if (peopleService.getDefaultBasePath().equals(context.getPath()))
+               else if (("/"+peopleService.getBaseRelPath(PeopleTypes.PEOPLE_PERSON)).equals(context.getPath()))
                        return peoplePage.createUi(parent, context);
                else if (context.isNodeType(NodeType.NT_FOLDER) || context.isNodeType(NodeType.NT_FILE))
                        return fsBrowserPage.createUi(parent, context);
@@ -123,8 +124,8 @@ public class DefaultMainPage implements LifeCycleUiProvider {
        }
 
        /* DEPENDENCY INJECTION */
-       public void setResourceService(ResourcesService resourceService) {
-               this.resourceService = resourceService;
+       public void setResourcesService(ResourcesService resourcesService) {
+               this.resourcesService = resourcesService;
        }
 
        public void setPeopleService(PeopleService peopleService) {