X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.r%2Fsrc%2Forg%2Fsimantics%2Fr%2FRVariableBuilder.java;h=6c0366f22fb5bf2c303426e02df978fedf10768d;hb=c43c222434e58130299ad9bfc797718d49f52989;hp=90261a34d2f0045f298875c14b6ec66930013b9c;hpb=2e278cf242c87a7851c68d6c5f03f169e28d3a7e;p=simantics%2Fr.git

diff --git a/org.simantics.r/src/org/simantics/r/RVariableBuilder.java b/org.simantics.r/src/org/simantics/r/RVariableBuilder.java
index 90261a3..6c0366f 100644
--- a/org.simantics.r/src/org/simantics/r/RVariableBuilder.java
+++ b/org.simantics.r/src/org/simantics/r/RVariableBuilder.java
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
+ *     Semantum Oy
  *******************************************************************************/
 package org.simantics.r;
 
@@ -16,9 +17,10 @@ import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.variable.NodeManagerVariableBuilder;
+import org.simantics.db.layer0.variable.NodeSupport;
 import org.simantics.db.layer0.variable.StandardGraphChildVariable;
 import org.simantics.db.layer0.variable.Variable;
-import org.simantics.db.layer0.variable.VariableBuilder;
 import org.simantics.db.layer0.variable.VariableNode;
 import org.simantics.layer0.Layer0;
 import org.simantics.r.scl.RSession;
@@ -27,7 +29,7 @@ import org.simantics.r.scl.RSessionManager;
 import org.simantics.r.scl.variable.RVariableNode;
 import org.simantics.simulator.variable.NodeManager;
 
-public class RVariableBuilder implements VariableBuilder {
+public class RVariableBuilder extends NodeManagerVariableBuilder {
 
     @Override
     public Variable buildChild(ReadGraph graph, Variable parent, VariableNode node, Resource child) throws DatabaseException {
@@ -49,13 +51,19 @@ public class RVariableBuilder implements VariableBuilder {
             }
         }
         
+        NodeSupport<?> support = getNodeSupport(graph, name);
         NodeManager<RVariableNode> nodeManager = session.getNodeManager();
-        return new StandardGraphChildVariable(parent, new VariableNode(nodeManager, /*node=*/nodeManager), child);
+        return new StandardGraphChildVariable(parent, new VariableNode(support, nodeManager), child);
     }
 
     @Override
-    public Variable buildProperty(ReadGraph graph, Variable parent, VariableNode node, Resource subject, Resource predicate) throws DatabaseException {
-        throw new UnsupportedOperationException();
+    protected NodeSupport<?> getNodeSupport(ReadGraph graph, String sessionName) throws DatabaseException {
+        return RSessionManager.getOrCreateNodeSupport(sessionName);
+    }
+
+    @Override
+    protected Object getRoot(ReadGraph graph, NodeSupport<?> support, String sessionName) throws DatabaseException {
+        return support.manager;
     }
 
 }