X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Fvalidation%2FL0Validations.java;fp=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Fvalidation%2FL0Validations.java;h=99ef91b7aa0040815b23a4dae559fa1ad3d7d6dd;hb=0ffcb1180dcccf28e66a391338885be224ba1c47;hp=a1ed10e77626c56c063aecbabfaa9fd313a2c642;hpb=342a2b006b88330280060c16c2ab50374468a4c6;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/validation/L0Validations.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/validation/L0Validations.java
index a1ed10e77..99ef91b7a 100644
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/validation/L0Validations.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/validation/L0Validations.java
@@ -3,41 +3,50 @@ package org.simantics.db.common.validation;
 import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
+import org.simantics.db.common.utils.CommonDBUtils;
 import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.layer0.Layer0;
+import org.simantics.scl.compiler.types.Type;
 
 public class L0Validations {
 
 	public static String checkValueType(ReadGraph graph, Resource subject, Resource predicate) throws DatabaseException {
+		
 		if (subject == null)
 			return null;
 		if (predicate == null)
 			return null;
 
 		Layer0 L0 = Layer0.getInstance(graph);
-	    if(graph.isSubrelationOf(predicate, L0.HasProperty)) {
+		if(graph.isSubrelationOf(predicate, L0.HasProperty)) {
 			Resource object = graph.getPossibleObject(subject, predicate);
 			if(object == null) return null;
-	    	String valueType = graph.getPossibleRelatedValue(predicate, L0.RequiresValueType, Bindings.STRING);
-	    	if(valueType != null) {
-	    		String valueType2 = graph.getPossibleRelatedValue(object, L0.HasValueType, Bindings.STRING);
-	    		if(!valueType.equals(valueType2)) {
-					StringBuilder sb = new StringBuilder()
-					.append("The value type ")
-					.append(valueType)
-					.append(" of predicate ")
-					.append(NameUtils.getSafeName(graph, predicate, true))
-					.append(" does not match the value type ")
-					.append(valueType2)
-					.append(" of object ")
-					.append(NameUtils.getSafeName(graph, object, true))
-					.append(".");
-					return sb.toString();
-	    		}
-	    	}
-	    }
-	    return null;
+			String valueTypeText = graph.getPossibleRelatedValue(predicate, L0.RequiresValueType, Bindings.STRING);
+			if(valueTypeText != null) {
+				Type valueType = CommonDBUtils.getSCLType(graph, subject, valueTypeText);
+				String valueTypeText2 = graph.getPossibleRelatedValue(object, L0.HasValueType, Bindings.STRING);
+				if(valueTypeText2 != null) {
+					Type valueType2 = CommonDBUtils.getSCLType(graph, subject, valueTypeText2);
+					if(!valueType.equals(valueType2)) {
+						StringBuilder sb = new StringBuilder()
+								.append("The value type ")
+								.append(valueType)
+								.append(" of predicate ")
+								.append(NameUtils.getSafeName(graph, predicate, true))
+								.append(" does not match the value type ")
+								.append(valueType2)
+								.append(" of object ")
+								.append(NameUtils.getSafeName(graph, object, true))
+								.append(".");
+						return sb.toString();
+					}
+				}
+			}
+		}
+		
+		return null;
+		
 	}
 	
 }