Enable model loading using an existing transaction.

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / scl / P3DScriptNodeMap.java

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scl/P3DScriptNodeMap.java b/org.simantics.plant3d/src/org/simantics/plant3d/scl/P3DScriptNodeMap.java
index e5726d60eb605f47d58c28e51deead1888667735..d38af1718b14068331192d82c5bf5aa203220c9e 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scl/P3DScriptNodeMap.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scl/P3DScriptNodeMap.java
@@ -4,13 +4,13 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.simantics.db.ReadGraph;
-import org.simantics.db.Session;
+import org.simantics.db.RequestProcessor;
+import org.simantics.db.Resource;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.g3d.ontology.G3D;
 import org.simantics.g3d.scenegraph.base.INode;
 import org.simantics.g3d.scenegraph.base.ParentNode;
 import org.simantics.g3d.scl.ScriptNodeMap;
-import org.simantics.g3d.vtk.common.VtkView;
 import org.simantics.objmap.graph.IMapping;
 import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.IP3DNode;
@@ -22,15 +22,13 @@ import org.simantics.plant3d.scenegraph.PipeRun;
 import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint;
 import org.simantics.plant3d.scenegraph.controlpoint.PipingRules;
 
-import vtk.vtkProp3D;
-
-public class P3DScriptNodeMap extends ScriptNodeMap<INode>{
+public class P3DScriptNodeMap extends ScriptNodeMap<Resource,INode> {
        
        private static final boolean DEBUG = false;
        
-       public P3DScriptNodeMap(Session session, IMapping mapping, P3DRootNode rootNode) {
+       public P3DScriptNodeMap(RequestProcessor session, IMapping mapping, P3DRootNode rootNode) {
                super(session,mapping,rootNode);
-               //rootNode.setNodeMap(this);
+               rootNode.setMapping(mapping);
        }
        
        @Override
@@ -93,6 +91,7 @@ public class P3DScriptNodeMap extends ScriptNodeMap<INode>{
 
                
                if (node instanceof ParentNode<?>) {
+                       @SuppressWarnings("unchecked")
                        ParentNode<IP3DNode> p = (ParentNode<IP3DNode>)node;
                        for (IP3DNode n : p.getNodes())
                                updateTransform(n);