Merge "Set tycho-packaging-plugin qualifier format to 'v'yyyyMMdd-HHmmss"

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/VariableValueWithBinding.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/VariableValueWithBinding.java
new file mode 100644 (file)
index 0000000..c9fb13f
--- /dev/null
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/VariableValueWithBinding.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Semantum Oy - initial API and implementation
+ *******************************************************************************/
+package org.simantics.db.layer0.request;
+
+import org.simantics.databoard.binding.Binding;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.common.request.BinaryRead;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.variable.Variable;
+
+final public class VariableValueWithBinding<T> extends BinaryRead<Variable, Binding, T> {
+
+    public VariableValueWithBinding(Variable variable, Binding binding) {
+        super(variable, binding);
+    }
+
+    @Override
+    public T perform(ReadGraph graph) throws DatabaseException {
+        return parameter.getValue(graph, parameter2);
+    }
+
+}

diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
index 2ba85b733adc1d10d8888afe9cb0f27f6161c1bd..e374b700f9a821168ac14811d44c436b36ae390b 100644 (file)
--- a/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
+++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java
@@ -29,7 +29,7 @@ import org.simantics.db.layer0.function.All;
 import org.simantics.db.layer0.request.ProjectModels;\r
 import org.simantics.db.layer0.request.VariableProperty;\r
 import org.simantics.db.layer0.request.VariableRead;\r
-import org.simantics.db.layer0.request.VariableValue;\r
+import org.simantics.db.layer0.request.VariableValueWithBinding;\r
 import org.simantics.db.layer0.variable.ConstantPropertyVariable;\r
 import org.simantics.db.layer0.variable.ProxyChildVariable;\r
 import org.simantics.db.layer0.variable.ProxySessionRequest;\r
@@ -1071,7 +1071,7 @@ public class Functions {
     \r
     public static Object getPropertyValueCached(ReadGraph graph, Variable variable, String name, Binding binding) throws DatabaseException {\r
        Variable property = graph.syncRequest(new VariableProperty(variable, name));\r
-       return graph.syncRequest(new VariableValue<Object>(property));\r
+       return graph.syncRequest(new VariableValueWithBinding<Object>(property, binding));\r
     }\r
 \r
     public static class ParentExistsRequest extends VariableRead<Boolean> {\r