X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.layer0%2Fsrc%2Forg%2Fsimantics%2Fdb%2Flayer0%2Fvariable%2FStandardGraphPropertyVariable.java;h=7927614cd37f9779292ee4ace98e5fd4ba7f00f0;hb=701fffa16a9aec0e0565da12bd5da5d372f6e612;hp=582277c905bbcbd19a2a1308021f5f71c66510f6;hpb=85c1daf4b3d4a48613e0c61c359cb8aac2157f01;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardGraphPropertyVariable.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardGraphPropertyVariable.java
index 582277c90..7927614cd 100644
--- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardGraphPropertyVariable.java
+++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/variable/StandardGraphPropertyVariable.java
@@ -11,19 +11,22 @@ import org.simantics.databoard.accessor.reference.ChildReference;
 import org.simantics.databoard.binding.Binding;
 import org.simantics.databoard.binding.impl.ObjectVariantBinding;
 import org.simantics.databoard.type.Datatype;
+import org.simantics.db.DevelopmentKeys;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.procedure.adapter.TransientCacheAsyncListener;
 import org.simantics.db.common.validation.L0Validations;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.exception.DatatypeNotFoundException;
 import org.simantics.db.exception.ValidationException;
+import org.simantics.db.layer0.exception.InvalidVariableException;
 import org.simantics.db.layer0.exception.MissingVariableValueException;
 import org.simantics.db.layer0.exception.PendingVariableException;
-import org.simantics.db.layer0.exception.VariableException;
 import org.simantics.db.layer0.function.All;
 import org.simantics.db.layer0.request.PropertyInfo;
 import org.simantics.db.layer0.request.PropertyInfoRequest;
+import org.simantics.db.layer0.scl.SCLDatabaseException;
 import org.simantics.db.layer0.util.Layer0Utils;
 import org.simantics.layer0.Layer0;
 import org.simantics.utils.Development;
@@ -35,7 +38,7 @@ public class StandardGraphPropertyVariable extends AbstractPropertyVariable {
     private static final Logger LOGGER = LoggerFactory.getLogger(StandardGraphPropertyVariable.class);
     
 	protected static final PropertyInfo NO_PROPERTY = new PropertyInfo(null, null,
-			false, Collections.<String> emptySet(), null, null, null, null, null, null,
+			false, false, Collections.<String> emptySet(), null, null, null, null, null, null,
 			Collections.<String, Pair<Resource, ChildReference>> emptyMap(),
 			null, false);
 
@@ -119,10 +122,12 @@ public class StandardGraphPropertyVariable extends AbstractPropertyVariable {
 	public <T> T getValue(ReadGraph graph) throws DatabaseException {
 		
 		if(Development.DEVELOPMENT) {
-			String error = L0Validations.checkValueType(graph, parentResource, property.predicate);
-			if(error != null) {
-			    LOGGER.error(error);
-				//throw new ValidationException(error);
+			if(Development.<Boolean>getProperty(DevelopmentKeys.L0_VALIDATION, Bindings.BOOLEAN)) {
+				String error = L0Validations.checkValueType(graph, parentResource, property.predicate);
+				if(error != null) {
+				    LOGGER.error(error);
+					throw new ValidationException(error);
+				}
 			}
 		}
 		
@@ -138,18 +143,22 @@ public class StandardGraphPropertyVariable extends AbstractPropertyVariable {
 			return getValue(graph);		
 
 		if(Development.DEVELOPMENT) {
-			String error = L0Validations.checkValueType(graph, parentResource, property.predicate);
-			if(error != null) {
-			    LOGGER.error(error);
-				throw new ValidationException(error);
+			if(Development.<Boolean>getProperty(DevelopmentKeys.L0_VALIDATION, Bindings.BOOLEAN)) {
+				String error = L0Validations.checkValueType(graph, parentResource, property.predicate);
+				if(error != null) {
+					LOGGER.error(error);
+					throw new ValidationException(error);
+				}
 			}
 		}
         
 		try {
 			
-			return (T)getValueAccessor(graph).getValue(graph, this, binding);
-		} catch (PendingVariableException e) {
-		    throw e;
+			return (T) getValueAccessor(graph).getValue(graph, this, binding);
+		} catch (SCLDatabaseException e) { // these can be thrown when compiling e.g. derived properties
+			throw e;
+		} catch (MissingVariableValueException | PendingVariableException e) {
+			throw e;
 		} catch (Throwable t) {
 			throw new MissingVariableValueException(t);
 		}
@@ -159,7 +168,7 @@ public class StandardGraphPropertyVariable extends AbstractPropertyVariable {
 	@Override
 	public Resource getRepresents(ReadGraph graph) throws DatabaseException {
 		if(represents == null)
-			throw new VariableException("Variable is not represented by any resource (URI=" + getPossibleURI(graph) + ").");
+			throw new InvalidVariableException("Variable is not represented by any resource (URI=" + getPossibleURI(graph) + ").");
 		return represents;
 //		return graph.getSingleObject(parentResource, property.predicate);
 	}
@@ -175,10 +184,12 @@ public class StandardGraphPropertyVariable extends AbstractPropertyVariable {
 	public void setValue(WriteGraph graph, Object value, Binding binding) throws DatabaseException {
 		
 		if(Development.DEVELOPMENT) {
-			String error = L0Validations.checkValueType(graph, parentResource, property.predicate);
-			if(error != null) {
-			    LOGGER.error(error);
-				//throw new ValidationException(error);
+			if(Development.<Boolean>getProperty(DevelopmentKeys.L0_VALIDATION, Bindings.BOOLEAN)) {
+				String error = L0Validations.checkValueType(graph, parentResource, property.predicate);
+				if(error != null) {
+					LOGGER.error(error);
+					throw new ValidationException(error);
+				}
 			}
 		}
 		
@@ -190,10 +201,12 @@ public class StandardGraphPropertyVariable extends AbstractPropertyVariable {
 	public void setValue(WriteGraph graph, Object value) throws DatabaseException {
 		
 		if(Development.DEVELOPMENT) {
-			String error = L0Validations.checkValueType(graph, parentResource, property.predicate);
-			if(error != null) {
-			    LOGGER.error(error);
-				throw new ValidationException(error);
+			if(Development.<Boolean>getProperty(DevelopmentKeys.L0_VALIDATION, Bindings.BOOLEAN)) {
+				String error = L0Validations.checkValueType(graph, parentResource, property.predicate);
+				if(error != null) {
+					LOGGER.error(error);
+					throw new ValidationException(error);
+				}
 			}
 		}
 		
@@ -233,9 +246,9 @@ public class StandardGraphPropertyVariable extends AbstractPropertyVariable {
 		if (type == null) {
 			String uri = this.getPossibleURI(graph);
 			if (uri != null)
-				throw new DatabaseException("No data type for " + uri);
+				throw new DatatypeNotFoundException("No data type for " + uri);
 			else
-				throw new DatabaseException("No data type for " + this.getIdentifier());
+				throw new DatatypeNotFoundException("No data type for " + this.getIdentifier());
 		}
 		
 		return type;