From b1e6589f948b00272ba99f4fd5e7326fd72651ef Mon Sep 17 00:00:00 2001 From: bsinou Date: Wed, 1 Mar 2017 16:55:36 +0100 Subject: [PATCH] Adapt after AppService API modification --- .../suite/core/DefaultSuiteAppService.java | 21 +++++++++++++++++++ .../org/argeo/suite/web/DefaultMainPage.java | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java b/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java index 3718eae..52a9867 100644 --- a/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java +++ b/org.argeo.suite.core/src/org/argeo/suite/core/DefaultSuiteAppService.java @@ -14,11 +14,31 @@ public class DefaultSuiteAppService implements AppService { // result will be returned by the various methods. private List knownAppServices; + @Override + public Node createEntity(Node parent, String nodeType, Node srcNode, boolean removeSrcNode) + throws RepositoryException { + for (AppService appService : knownAppServices) { + if (appService.isKnownType(nodeType)) + return appService.createEntity(parent, nodeType, srcNode, removeSrcNode); + } + return null; + } + @Override public String getAppBaseName() { return SuiteConstants.SUITE_APP_BASE_NAME; } + @Override + public String getBaseRelPath(String nodeType) { + for (AppService appService : knownAppServices) { + if (appService.isKnownType(nodeType)) + return appService.getBaseRelPath(nodeType); + } + return null; + // return getAppBaseName(); + } + @Override public String getDefaultRelPath(Node entity) throws RepositoryException { for (AppService appService : knownAppServices) { @@ -68,4 +88,5 @@ public class DefaultSuiteAppService implements AppService { public void setKnownAppServices(List knownAppServices) { this.knownAppServices = knownAppServices; } + } 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 9ead94a..3adbc29 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 @@ -20,6 +20,7 @@ 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; @@ -64,7 +65,7 @@ public class DefaultMainPage implements LifeCycleUiProvider { 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); -- 2.30.2