X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.core%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fcore%2FDefaultSuiteAppService.java;h=b87527af828b30736790d6a85a5f0bc30934dde9;hp=52a9867cc7168bb1f4c710e9b6eb9b71621bd6b6;hb=5bbce644be337f1ad9916c23dba141ad1f38b3ba;hpb=b1e6589f948b00272ba99f4fd5e7326fd72651ef

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 52a9867..b87527a 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
@@ -4,22 +4,26 @@ import java.util.List;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
+import javax.jcr.Session;
 
 import org.argeo.connect.AppService;
+import org.argeo.connect.SystemAppService;
+import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.suite.SuiteConstants;
+import org.argeo.suite.SuiteException;
 
-public class DefaultSuiteAppService implements AppService {
+public class DefaultSuiteAppService implements SystemAppService {
 
 	// Injected known AppWorkbenchServices: order is important, first found
 	// result will be returned by the various methods.
 	private List<AppService> knownAppServices;
 
 	@Override
-	public Node createEntity(Node parent, String nodeType, Node srcNode, boolean removeSrcNode)
+	public Node publishEntity(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 appService.publishEntity(parent, nodeType, srcNode, removeSrcNode);
 		}
 		return null;
 	}
@@ -49,10 +53,20 @@ public class DefaultSuiteAppService implements AppService {
 	}
 
 	@Override
-	public String getDefaultRelPath(String nodetype, String id) {
+	public String getMainNodeType(Node node) {
+		for (AppService appService : knownAppServices) {
+			String foundType = appService.getMainNodeType(node);
+			if (EclipseUiUtils.notEmpty(foundType))
+				return foundType;
+		}
+		return null;
+	}
+
+	@Override
+	public String getDefaultRelPath(Session session, String nodetype, String id) {
 		for (AppService appService : knownAppServices) {
 			if (appService.isKnownType(nodetype))
-				return appService.getDefaultRelPath(nodetype, id);
+				return appService.getDefaultRelPath(session, nodetype, id);
 		}
 		return null;
 	}
@@ -64,7 +78,8 @@ public class DefaultSuiteAppService implements AppService {
 			if (appService.isKnownType(entity))
 				return appService.saveEntity(entity, publish);
 		}
-		return AppService.super.saveEntity(entity, publish);
+		throw new SuiteException("Unknown NodeType for " + entity + ". Cannot save");
+		// return AppService.super.saveEntity(entity, publish);
 	}
 
 	@Override