Fixes to variable implementations

[simantics/platform.git] / bundles / org.simantics.db.layer0 / src / org / simantics / db / layer0 / variable / StandardGraphChildVariable.java

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardGraphChildVariable.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardGraphChildVariable.java
index af8f75c494dd242534373523bbdfb45d0b6f664f..cffd74727c8000ed8e84cb15dfc582480702c106 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardGraphChildVariable.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardGraphChildVariable.java
@@ -255,14 +255,18 @@ public class StandardGraphChildVariable extends AbstractChildVariable {
        return getClass().getSimpleName() + "[" + resource + "]";
     }
        
-       protected VariableMap getPossiblePropertyVariableMap(ReadGraph graph) throws DatabaseException {
+    protected VariableMap getPossiblePropertyVariableMap(ReadGraph graph) throws DatabaseException {
         if(resource == null) return All.standardChildDomainProperties;
-               return graph.getPossibleRelatedValue2(resource, Layer0.getInstance(graph).domainProperties, this);
-       }
+        Resource domainProperties = Layer0.getInstance(graph).domainProperties; 
+        return graph.getPossibleRelatedValue2(resource, domainProperties, 
+            new StandardGraphPropertyVariable(graph, this, domainProperties));
+    }
 
        protected VariableMap getPossibleChildVariableMap(ReadGraph graph) throws DatabaseException {
            if(resource == null) return All.standardChildDomainChildren;
-               return graph.getPossibleRelatedValue2(resource, Layer0.getInstance(graph).domainChildren, this);
+           Resource domainChildren = Layer0.getInstance(graph).domainChildren;
+               return graph.getPossibleRelatedValue2(resource, domainChildren, 
+                               new StandardGraphPropertyVariable(graph, this, domainChildren));
        }
        
        @Override