X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Futil%2FLayer0Utils.java;fp=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Futil%2FLayer0Utils.java;h=7c7412d18bbd17e273541a6cac0c0478e6d37246;hb=0ffcb1180dcccf28e66a391338885be224ba1c47;hp=62c7093da11e999d7e22b60a17ccb1221088fe18;hpb=342a2b006b88330280060c16c2ab50374468a4c6;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java
index 62c7093da..7c7412d18 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/Layer0Utils.java
@@ -74,6 +74,7 @@ import org.simantics.db.common.request.ObjectsWithType;
 import org.simantics.db.common.request.PossibleChild;
 import org.simantics.db.common.request.PossibleIndexRoot;
 import org.simantics.db.common.request.WriteRequest;
+import org.simantics.db.common.utils.CommonDBUtils;
 import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.event.ChangeListener;
 import org.simantics.db.exception.CancelTransactionException;
@@ -353,13 +354,9 @@ public class Layer0Utils {
 		throw new IllegalArgumentException("Unable to convert datatype into SCL type: " + type);
 	}
 
-
+	@Deprecated
 	public static Type getSCLType(ReadGraph graph, RuntimeEnvironment runtimeEnvironment, String typeText) throws DatabaseException {
-        try {
-			return Environments.getType(runtimeEnvironment.getEnvironment(), typeText);
-		} catch (SCLExpressionCompilationException e) {
-			throw new DatabaseException(e);
-		}
+	    return CommonDBUtils.getSCLType(graph, runtimeEnvironment, typeText);
 	}
 
 	public static Type getSCLType(ReadGraph graph, Variable property) throws DatabaseException {
@@ -646,15 +643,14 @@ public class Layer0Utils {
 		return graph.getPossibleResource(graph.getURI(root) + suffix);
 	}
 
+	@Deprecated
 	public static Resource getPossibleChild(ReadGraph graph, Resource resource, String name) throws DatabaseException {
-		return graph.sync(new PossibleChild(resource, name));
+		return CommonDBUtils.getPossibleChild(graph, resource, name);
 	}
 
+	@Deprecated
 	public static Resource getPossibleChild(ReadGraph graph, Resource resource, Resource type, String name) throws DatabaseException {
-		Resource child = graph.sync(new PossibleChild(resource, name));
-		if(child == null) return null;
-		if(!graph.isInstanceOf(child, type)) return null;
-		return child;
+		return CommonDBUtils.getPossibleChild(graph, resource, type, name);
 	}
 
 	public static RelationContext relationContext(ReadGraph graph, Resource subject, Resource predicate) throws DatabaseException {
@@ -1385,7 +1381,31 @@ public class Layer0Utils {
     	}
     	return result;
     }
+    
+    public static Resource possibleObjectForType(ReadGraph graph, Resource type, Resource relation) throws DatabaseException {
+        PropertyInfo pi = graph.syncRequest(new PropertyInfoRequest(relation));
+        return possibleObjectForType(graph, type, relation, pi.isFunctional);
+    }
 
+    public static Resource possibleObjectForType(ReadGraph graph, Resource type, Resource relation, boolean functional) throws DatabaseException {
+        if(functional) {
+            Layer0 L0 = Layer0.getInstance(graph);
+            Resource result = graph.getPossibleObject(type, relation);
+            if(result != null) return result;
+            for(Resource su : graph.getObjects(L0.Inherits, type)) {
+                Resource r = possibleObjectForType(graph, su, relation);
+                if(r != null) {
+                    if(result != null) return null;
+                    result = r;
+                }
+            }
+            return result;
+        } else {
+            throw new UnsupportedOperationException("asd");
+        }
+    }
+
+    
     public static Resource getPossiblePredicateByNameFromType(ReadGraph graph, Resource type, String name) throws DatabaseException {
     	Map<String,Resource> domain = getDomainOf(graph, type);
     	return domain.get(name);