Clean legacy Code, Adapt spring links

[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 d7ae0324669d78c3ab2986b1b0c1ab93942dbc9a..b2617e376e5bc1bf0ebca74de35e8e939f8260a9 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
@@ -19,6 +19,7 @@ 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.resources.ResourcesService;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.suite.web.fs.MyFilesBrowserPage;
 import org.eclipse.swt.SWT;
@@ -41,6 +42,7 @@ public class DefaultMainPage implements LifeCycleUiProvider {
        private CmsUiProvider fsBrowserPage;
 
        /* DEPENDENCY INJECTION */
+       private ResourcesService resourceService;
        private PeopleService peopleService;
        private FileSystemProvider nodeFileSystemProvider;
        private Map<String, String> peopleIconPaths;
@@ -50,8 +52,8 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 
        @Override
        public void init(Session adminSession) throws RepositoryException {
-               dashboardPage = new DefaultDashboard(peopleService, peopleIconPaths);
-               peoplePage = new PeopleDefaultPage(peopleService, peopleIconPaths);
+               dashboardPage = new DefaultDashboard(resourceService, peopleService, peopleIconPaths);
+               peoplePage = new PeopleDefaultPage(resourceService, peopleService, peopleIconPaths);
                fsBrowserPage = new MyFilesBrowserPage(nodeFileSystemProvider);
        }
 
@@ -62,7 +64,7 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 
                if (context.isNodeType(PeopleTypes.PEOPLE_ENTITY))
                        return peoplePage.createUi(parent, context);
-               else if (peopleService.getBasePath(null).equals(context.getPath()))
+               else if (peopleService.getDefaultBasePath().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);
@@ -121,6 +123,10 @@ public class DefaultMainPage implements LifeCycleUiProvider {
        }
 
        /* DEPENDENCY INJECTION */
+       public void setResourceService(ResourcesService resourceService) {
+               this.resourceService = resourceService;
+       }
+
        public void setPeopleService(PeopleService peopleService) {
                this.peopleService = peopleService;
        }