From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 6 Jun 2013 06:20:17 +0000 (+0000)
Subject: Validate units of lookup tables (fixes #4316)
X-Git-Tag: 1.8.1~301
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=7da0463ccd013d09997fe920dfc22e57b32df66c;p=simantics%2Fsysdyn.git

Validate units of lookup tables (fixes #4316)

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@27509 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/WithLookupExpression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/WithLookupExpression.java
index 2343eb8c..78d90d96 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/WithLookupExpression.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/WithLookupExpression.java
@@ -56,7 +56,7 @@ public class WithLookupExpression extends Expression {
         
         String result = UnitUtils.expressionUnitsValid(graph, model, parent.getParentConfiguration(), equation);
         if(result == null) {
-            result = UnitUtils.expressionUnitsValid(graph, model, parent.getParentConfiguration(), equation);
+            result = UnitUtils.matchUnits(graph, model, parent.getParentConfiguration(), parent.getUnit(), lookupTable);
         }
         
         return result;