From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Fri, 27 Aug 2010 12:22:09 +0000 (+0000)
Subject: git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@17660 ac1ea38d-2e2b... 
X-Git-Tag: simantics-1.2.0~69
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=3549a497db61b91f01897c5092ff0d1e7f958071;p=simantics%2Fsysdyn.git

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

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionTypes.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionTypes.java
index 3741a34e..8b73d0b3 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionTypes.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionTypes.java
@@ -12,10 +12,10 @@ public class ExpressionTypes {
     public static enum ExpressionType {Auxiliary, Parameter, Constant, Lookup, WithLookup, Stock, Delay, Empty};
 
     public static ExpressionType[] auxiliaryExpressions = new ExpressionType[] {
-        ExpressionType.Parameter, 
         ExpressionType.Auxiliary, 
+        ExpressionType.Parameter, 
         ExpressionType.Constant, 
-        ExpressionType.Lookup, 
+       // ExpressionType.Lookup, 
         ExpressionType.WithLookup};
 
     public static ExpressionType[] valveExpressions = new ExpressionType[] {
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionWidget.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionWidget.java
index d569cd96..a3ad7704 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionWidget.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ExpressionWidget.java
@@ -66,6 +66,7 @@ public class ExpressionWidget implements Widget {
         ExpressionType et = ExpressionTypes.getExpressionTypeForVariable(variable);
         
         displayExpression(et.toString(), true);
+        
     }
     
     
@@ -109,6 +110,8 @@ public class ExpressionWidget implements Widget {
             this.expression = exp;
             this.parent.layout();
             validateFields();
+            
+            save();
         }  
     }