refs #5223

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

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/Expression.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/Expression.java
index b4122296a52d1d711caaebe04cec6027e5c0067b..48ac5957b63cb9b1cea8ce50c35e5fecd35e6b47 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/Expression.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/expressions/Expression.java
@@ -81,11 +81,7 @@ public abstract class Expression implements IExpression {
     \r
     @Override\r
     public String validateUnits(ReadGraph graph, SysdynModel model) {\r
-       try {\r
-               return UnitUtils.matchUnits(graph, model, parent.getParentConfiguration(), parent.getUnit(), getExpression());\r
-       } catch (TokenMgrError e) {\r
-               return e.getMessage();\r
-       }\r
+       return UnitUtils.matchUnits(graph, model, parent.getParentConfiguration(), parent.getUnit(), getExpression());\r
     }\r
     \r
     @Override\r

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/utils/UnitUtils.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/utils/UnitUtils.java
index 8418b14fe91cee2f3b4d7d35e9b8b406b4b02173..66566c80cd0678175c81c0326073bd9f85326bf7 100644 (file)
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/utils/UnitUtils.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/utils/UnitUtils.java
@@ -35,6 +35,7 @@ import org.simantics.sysdyn.representation.Module;
 import org.simantics.sysdyn.representation.Shadow;\r
 import org.simantics.sysdyn.representation.Variable;\r
 import org.simantics.sysdyn.unitParser.ParseException;\r
+import org.simantics.sysdyn.unitParser.TokenMgrError;\r
 import org.simantics.sysdyn.unitParser.UnitCheckingException;\r
 import org.simantics.sysdyn.unitParser.UnitCheckingNode;\r
 import org.simantics.sysdyn.unitParser.UnitParser;\r
@@ -128,6 +129,8 @@ public class UnitUtils {
             }\r
         } catch (ParseException e) {\r
                return "Cannot validate units: Syntax error in expression.";\r
+       } catch (TokenMgrError e) {\r
+               return "Cannot validate units: Syntax error in expression.";\r
         }\r
         return null;\r
     }\r