Sync git svn branch with SVN repository r33158.

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

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/Variables.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/Variables.java
index 81e1e46e94a3d027faed3853938a739e8d78d05e..e323f4f8c28bc4cb755bb38e609b7d0c6461ea44 100644 (file)
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/Variables.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/Variables.java
@@ -26,13 +26,13 @@ import org.simantics.databoard.util.URIStringUtils;
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.RequestProcessor;\r
 import org.simantics.db.Resource;\r
 import org.simantics.db.ReadGraph;\r
 import org.simantics.db.RequestProcessor;\r
 import org.simantics.db.Resource;\r

+import org.simantics.db.common.request.PossibleIndexRoot;\r

 import org.simantics.db.common.request.TernaryRead;\r
 import org.simantics.db.common.utils.Logger;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.db.layer0.exception.MissingVariableException;\r
 import org.simantics.db.layer0.request.Model;\r
 import org.simantics.db.layer0.request.PossibleActiveVariableFromVariable;\r
 import org.simantics.db.common.request.TernaryRead;\r
 import org.simantics.db.common.utils.Logger;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.db.layer0.exception.MissingVariableException;\r
 import org.simantics.db.layer0.request.Model;\r
 import org.simantics.db.layer0.request.PossibleActiveVariableFromVariable;\r

-import org.simantics.db.layer0.request.PossibleModel;\r

 import org.simantics.db.layer0.request.PossibleVariableIndexRoot;\r
 import org.simantics.db.layer0.request.PossibleVariableModel;\r
 import org.simantics.db.layer0.request.PropertyInfo;\r
 import org.simantics.db.layer0.request.PossibleVariableIndexRoot;\r
 import org.simantics.db.layer0.request.PossibleVariableModel;\r
 import org.simantics.db.layer0.request.PropertyInfo;\r


@@ -332,7 +332,7 @@ final public class Variables {
 \r
     public static Variable getPossibleConfigurationContext(ReadGraph graph, Resource resource) throws DatabaseException {\r
         SimulationResource SIMU = SimulationResource.getInstance(graph);\r
 \r
     public static Variable getPossibleConfigurationContext(ReadGraph graph, Resource resource) throws DatabaseException {\r
         SimulationResource SIMU = SimulationResource.getInstance(graph);\r

-        if (!graph.isInstanceOf(resource, SIMU.Model)) resource = graph.sync(new PossibleModel(resource));\r
+        if (!graph.isInstanceOf(resource, SIMU.Model)) resource = graph.sync(new PossibleIndexRoot(resource));\r

         if (resource == null)\r
             return null;\r
         Resource configurationResource = graph.getPossibleObject(resource, SIMU.HasConfiguration);\r
         if (resource == null)\r
             return null;\r
         Resource configurationResource = graph.getPossibleObject(resource, SIMU.HasConfiguration);\r


@@ -343,7 +343,7 @@ final public class Variables {
 \r
     public static Variable getPossibleConfigurationContext(ReadGraph graph, Variable variable) throws DatabaseException {\r
         SimulationResource SIMU = SimulationResource.getInstance(graph);\r
 \r
     public static Variable getPossibleConfigurationContext(ReadGraph graph, Variable variable) throws DatabaseException {\r
         SimulationResource SIMU = SimulationResource.getInstance(graph);\r

-        Resource model = getPossibleModel(graph, variable);\r
+        Resource model = getPossibleIndexRoot(graph, variable);\r

         if (model == null)\r
             return null;\r
         Resource configurationResource = graph.getPossibleObject(model, SIMU.HasConfiguration);\r
         if (model == null)\r
             return null;\r
         Resource configurationResource = graph.getPossibleObject(model, SIMU.HasConfiguration);\r