git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@19508 ac1ea38d-2e2b...

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ExpressionUtils.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ExpressionUtils.java
index 097ff3cba8df4500f9f50e12ec5eb6331d3f8f2d..2caf1d20c2e134340fad0b4e67149cddd8f735c5 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ExpressionUtils.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/utils/ExpressionUtils.java
@@ -277,12 +277,19 @@ public class ExpressionUtils {
                                        if(v != null && v instanceof Enumeration) {\r
                                                boolean isFound = false;\r
                                                Enumeration e = (Enumeration)v;\r
-                                               for(EnumerationIndex ei : e.getEnumerationIndexes()) {\r
-                                                       if(ei.getName().equals(et.image)) {\r
-                                                               isFound = true;\r
-                                                               break;\r
+                                               \r
+                                               if(enumeration.equals(et.image)) {\r
+                                                       // The full enumeration\r
+                                                       isFound = true;\r
+                                               } else {\r
+                                                       for(EnumerationIndex ei : e.getEnumerationIndexes()) {\r
+                                                               if(ei.getName().equals(et.image)) {\r
+                                                                       isFound = true;\r
+                                                                       break;\r
+                                                               }\r
                                                        }\r
                                                }\r
+                                               \r
                                                if(!isFound) {\r
                                                        StringBuilder sb = new StringBuilder();\r
                                                        sb.append("Enumeration ");\r