X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscl%2FSCLUtil.java;h=6b1947d43e802e2b1a5609987e4b727cfd9ab454;hb=d207cfa3235339e7d7b894494be400160b121bd5;hp=1070803046ec1e38eed5279682c03bc2320dc805;hpb=4ba0c31ec2e71a3ed612c012a7f35bd5342a833b;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scl/SCLUtil.java b/org.simantics.plant3d/src/org/simantics/plant3d/scl/SCLUtil.java
index 10708030..6b1947d4 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scl/SCLUtil.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scl/SCLUtil.java
@@ -1,11 +1,12 @@
 package org.simantics.plant3d.scl;
 
-
 import org.simantics.Simantics;
 import org.simantics.db.ReadGraph;
+import org.simantics.db.RequestProcessor;
 import org.simantics.db.Resource;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.request.Read;
+import org.simantics.g3d.scenegraph.base.INode;
 import org.simantics.objmap.graph.IMapping;
 import org.simantics.objmap.graph.Mappings;
 import org.simantics.objmap.graph.schema.IMappingSchema;
@@ -16,23 +17,63 @@ import org.simantics.plant3d.scenegraph.controlpoint.ControlPointFactory;
 import org.simantics.plant3d.scenegraph.controlpoint.PipingRules;
 import org.simantics.plant3d.utils.ComponentUtils;
 import org.simantics.plant3d.utils.P3DUtil;
+import org.simantics.scl.runtime.SCLContext;
 
 public class SCLUtil {
+
+	public static interface SchemaProvider {
+		IMappingSchema<Resource,INode> get(ReadGraph graph) throws DatabaseException;
+	}
+
+	public static interface NodeMapProvider {
+		P3DScriptNodeMap get(IMapping<Resource, INode> mapping, P3DRootNode rootNode);
+	}
 	
 	public static P3DScriptNodeMap load(final Resource root) throws DatabaseException {
+		return load(getRequestProcessor(), root);
+	}
+	
+	public static P3DScriptNodeMap load(RequestProcessor session, final Resource root) throws DatabaseException {
+		preload(Simantics.getSession(), Plant3D.URIs.Builtin);
+
+		SchemaProvider schemaProvider = g -> SchemaBuilder.getSchema(g);
+		NodeMapProvider mapProvider = (mapping, rootNode) -> new P3DScriptNodeMap(Simantics.getSession(), mapping, rootNode);
+		return load(session, root, schemaProvider, mapProvider);
+	}
+
+	public static P3DRootNode loadReadOnly(final Resource root) throws DatabaseException {
+		return loadReadOnly(getRequestProcessor(), root);
+	}
+
+	public static P3DRootNode loadReadOnly(RequestProcessor session, final Resource root) throws DatabaseException {
+		preload(session, Plant3D.URIs.Builtin);
+		
+		SchemaProvider schemaProvider = g -> SchemaBuilder.getSchema(g);
+		return loadReadOnly(session, root, schemaProvider);
+	}
+
+	public static void preload(RequestProcessor session, String symbolSet) throws DatabaseException {
 		try {
-			ControlPointFactory.preloadCache(Plant3D.URIs.Builtin);
-			ComponentUtils.preloadCache();
+			ControlPointFactory.preloadCache(session, symbolSet);
+			ComponentUtils.preloadCache(session);
 		} catch (Exception e) {
 			throw new DatabaseException(e);
 		}
-		return Simantics.getSession().syncRequest(new Read<P3DScriptNodeMap>() {
+	}
+
+	public static <NodeMap extends P3DScriptNodeMap> NodeMap load(final Resource root, SchemaProvider schemaProvider, NodeMapProvider mapProvider) throws DatabaseException {
+		return load(getRequestProcessor(), root, schemaProvider, mapProvider);
+	}
+	
+	public static <NodeMap extends P3DScriptNodeMap> NodeMap load(RequestProcessor session, final Resource root, SchemaProvider schemaProvider, NodeMapProvider mapProvider) throws DatabaseException {
+		return session.syncRequest(new Read<NodeMap>() {
 			@Override
-			public P3DScriptNodeMap perform(ReadGraph graph) throws DatabaseException {
+			public NodeMap perform(ReadGraph graph) throws DatabaseException {
 				PipingRules.setEnabled(false);
-				IMappingSchema<Resource, Object> schema = SchemaBuilder.getSchema(graph);
-				IMapping<Resource, Object> mapping = Mappings.createWithListening(schema);
-				P3DRootNode rootNode = (P3DRootNode)mapping.map(graph, root);
+				IMappingSchema<Resource, INode> schema = schemaProvider.get(graph);
+				IMapping<Resource, INode> mapping = Mappings.createWithListening(schema);
+				P3DRootNode rootNode = (P3DRootNode) mapping.map(graph, root);
+				rootNode.setMapping(mapping);
 				try {
 					P3DUtil.finalizeDBLoad(rootNode);
 					// FIXME: Something needs to be done here...
@@ -40,38 +81,50 @@ public class SCLUtil {
 				} catch (Exception e) {
 					throw new DatabaseException(e);
 				}
-				P3DScriptNodeMap nodeMap = new P3DScriptNodeMap(Simantics.getSession(), mapping, rootNode);
-				return nodeMap;
 				
+				@SuppressWarnings("unchecked")
+				NodeMap nodeMap = (NodeMap) mapProvider.get(mapping, rootNode);
+				return nodeMap;
 			}
 		});
-		
 	}
-	
-	public static P3DRootNode loadReadOnly(final Resource root) throws DatabaseException {
-		try {
-			ControlPointFactory.preloadCache(Plant3D.URIs.Builtin);
-			ComponentUtils.preloadCache();
-		} catch (Exception e) {
-			throw new DatabaseException(e);
-		}
-		return Simantics.getSession().syncRequest(new Read<P3DRootNode>() {
+
+	public static <Root extends P3DRootNode> Root loadReadOnly(RequestProcessor session, final Resource root, SchemaProvider schemaProvider)
+			throws DatabaseException {
+		return session.syncRequest(new Read<Root>() {
 			@Override
-			public P3DRootNode perform(ReadGraph graph) throws DatabaseException {
+			public Root perform(ReadGraph graph) throws DatabaseException {
 				PipingRules.setEnabled(false);
-				IMappingSchema<Resource, Object> schema = SchemaBuilder.getSchema(graph);
-				IMapping<Resource, Object> mapping = Mappings.createWithoutListening(schema);
-				P3DRootNode rootNode = (P3DRootNode)mapping.map(graph, root);
+				IMappingSchema<Resource, INode> schema = schemaProvider.get(graph);
+				IMapping<Resource, INode> mapping = Mappings.createWithoutListening(schema);
+				@SuppressWarnings("unchecked")
+				Root rootNode = (Root) mapping.map(graph, root);
+				rootNode.setMapping(mapping);
 				try {
 					P3DUtil.finalizeDBLoad(rootNode);
 					P3DUtil.finalizeDBLoad2(rootNode);
 				} catch (Exception e) {
 					throw new DatabaseException(e);
 				}
-				return rootNode;
 				
+				return rootNode;
 			}
 		});
 	}
 
+	/**
+	 * Load a read-only Java object representation of a Plant3d model.
+	 * 
+	 * This method can be called from SCL either as a &lt;Proc&gt; or a &lt;ReadGraph&gt; function.
+	 */
+	public static <Root extends P3DRootNode> Root loadReadOnly(final Resource root, SchemaProvider schemaProvider)
+			throws DatabaseException {
+		return loadReadOnly(getRequestProcessor(), root, schemaProvider);
+	}
+
+	public static RequestProcessor getRequestProcessor() {
+		RequestProcessor rp = (RequestProcessor) SCLContext.getCurrent().get("graph");
+		return rp != null ? rp : Simantics.getSession();
+	}
+
 }