X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.web%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fweb%2FDefaultMainPage.java;h=5a48487d84c7e5d2dc6daf62ccd1011aa7908e0a;hp=b2617e376e5bc1bf0ebca74de35e8e939f8260a9;hb=a5e5ab1e12391c0d6514ac7fa8fd3a242340b4a0;hpb=e51dee49ebe0d118c9ce3a5cbf06054e7e2df516 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 b2617e3..5a48487 100644 --- 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,8 +16,8 @@ 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.ConnectTypes; 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; @@ -42,7 +42,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 peopleIconPaths; @@ -52,8 +52,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,7 +62,7 @@ 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())) return peoplePage.createUi(parent, context); @@ -123,8 +123,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) {