X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Frequest%2FPropertyInfoRequest.java;h=90e63e29f639c10cc7d4ec04caf053c0909116e6;hb=e3446802a81064942a7cbfea0c577e21ae5ae658;hp=3b819cbabf5ab609188c21417ee8a19f8cf75e3a;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PropertyInfoRequest.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PropertyInfoRequest.java
index 3b819cbab..90e63e29f 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PropertyInfoRequest.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/request/PropertyInfoRequest.java
@@ -41,10 +41,12 @@ final public class PropertyInfoRequest extends ResourceRead<PropertyInfo> {
 		String name = graph.getPossibleRelatedValue(resource, L0.HasName, Bindings.STRING);
 		if(name != null) name = name.intern();
 		
+		boolean isFunctional = graph.isInstanceOf(resource, L0.FunctionalRelation);
+		
 		Set<String> classifications = graph.sync(new ClassificationsRequest(graph.getPrincipalTypes(resource)));
-		VariableBuilder variableBuilder = graph.getPossibleAdapter(resource, VariableBuilder.class);
+		VariableBuilder<?> variableBuilder = graph.getPossibleAdapter(resource, VariableBuilder.class);
 		
-		Datatype requiredDataType = graph.getPossibleRelatedValue(resource, L0X.RequiresDataType, Layer0Utils.datatype_binging);
+		Datatype requiredDataType = graph.getPossibleRelatedValue(resource, L0X.RequiresDataType, Bindings.DATATYPE);
 		
 		String definedUnit = graph.getPossibleRelatedValue(resource, L0X.HasUnit, Bindings.STRING);
 		
@@ -88,13 +90,13 @@ final public class PropertyInfoRequest extends ResourceRead<PropertyInfo> {
 						}
 					}
 					
-					return PropertyInfo.make(graph, resource, name, isHasProperty, classifications, variableBuilder, literalRange, requiredDataType, definedUnit, requiredValueType, map, accessor, hasEnumerationRange);
+					return PropertyInfo.make(graph, resource, name, isFunctional, isHasProperty, classifications, variableBuilder, literalRange, requiredDataType, definedUnit, requiredValueType, map, accessor, hasEnumerationRange);
 					
 				}
 			}
 		}
 		
-		return PropertyInfo.make(graph, resource, name, isHasProperty, classifications, variableBuilder, literalRange, requiredDataType, definedUnit, requiredValueType, Collections.<String,Pair<Resource,ChildReference>>emptyMap(), accessor, hasEnumerationRange);
+		return PropertyInfo.make(graph, resource, name, isFunctional, isHasProperty, classifications, variableBuilder, literalRange, requiredDataType, definedUnit, requiredValueType, Collections.<String,Pair<Resource,ChildReference>>emptyMap(), accessor, hasEnumerationRange);
 		
 	}