X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Frequest%2FAdaptValue.java;h=aeea33f0276c8a1de7dc0736bda0e86f03b0f72f;hp=82b6bf965ee0dc94f59a5eec005ada2b3c178dfb;hb=73884c78cf2695329aa3b6559c4c6a196792ac9b;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/AdaptValue.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/AdaptValue.java
index 82b6bf965..aeea33f02 100644
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/AdaptValue.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/AdaptValue.java
@@ -1,47 +1,44 @@
-package org.simantics.db.common.request;
-
-import org.simantics.db.ReadGraph;
-import org.simantics.db.Resource;
-import org.simantics.db.common.utils.Functions;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.exception.RuntimeDatabaseException;
-import org.simantics.layer0.Layer0;
-import org.simantics.scl.reflection.ReflectionUtils;
-import org.simantics.scl.reflection.ValueNotFoundException;
-import org.simantics.scl.runtime.function.FunctionImpl3;
-
-/**
- * Adapts a resource to (SCL) value.
- * @author Hannu Niemistö
- */
-public class AdaptValue extends ResourceRead<Object> {
-    
-    public AdaptValue(Resource resource) {
-        super(resource);
-    }
-
-    private static final FunctionImpl3<ReadGraph,Resource,Object,Object> functionApplication = new FunctionImpl3<ReadGraph,Resource,Object,Object>() {
-
-		@Override
-		public Object apply(ReadGraph graph, Resource resource, Object context) {
-			try {
-				return Functions.exec(graph, resource, graph, resource, context);
-			} catch (DatabaseException e) {
-				throw new RuntimeDatabaseException(e);
-			}
-		}
-
-	};
-    
-    @Override
-    public Object perform(ReadGraph graph) throws DatabaseException {
-        String uri = graph.getURI(resource);        
-        try {
-			if(Layer0.URIs.Functions_functionApplication.equals(uri)) return functionApplication;
-            return ReflectionUtils.getValue(uri).getValue();
-        } catch (ValueNotFoundException e) {
-            throw new DatabaseException("Couldn't adapt the value " + uri, e);
-        }
-    }
-
-}
+package org.simantics.db.common.request;
+
+import org.simantics.db.ComputationalValue;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.common.utils.Functions;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.exception.RuntimeDatabaseException;
+import org.simantics.layer0.Layer0;
+import org.simantics.scl.runtime.function.FunctionImpl3;
+
+/**
+ * Adapts a resource to (SCL) value.
+ * @author Hannu Niemist&ouml;
+ */
+public class AdaptValue extends ResourceRead<Object> {
+
+    public AdaptValue(Resource resource) {
+        super(resource);
+    }
+
+    public static final FunctionImpl3<ReadGraph,Resource,Object,Object> functionApplication = new FunctionImpl3<ReadGraph,Resource,Object,Object>() {
+
+		@Override
+		public Object apply(ReadGraph graph, Resource resource, Object context) {
+			try {
+				return Functions.exec(graph, resource, graph, resource, context);
+			} catch (DatabaseException e) {
+				throw new RuntimeDatabaseException(e);
+			}
+		}
+
+	};
+
+    @Override
+    public Object perform(ReadGraph graph) throws DatabaseException {
+        Layer0 L0 = graph.l0();
+        if (L0.Functions_functionApplication.equalsResource(resource))
+            return functionApplication;
+        ComputationalValue ev = graph.adapt(resource, ComputationalValue.class);
+        return ev.getValue(graph, resource);
+    }
+
+}