Merge changes I78c3a258,I7bf72f04

[simantics/platform.git] / bundles / org.simantics.modeling.ui / src / org / simantics / modeling / ui / componentTypeEditor / ComponentTypeViewer.java

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeViewer.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeViewer.java
index ef63fabe09dc52db6ce5cad752b352c09247d3c6..38f24b4f7ddb53d8d7b6b3dafc84403c35042533 100644 (file)
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeViewer.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/componentTypeEditor/ComponentTypeViewer.java
@@ -200,12 +200,12 @@ public class ComponentTypeViewer {
                         
                         for(Resource assertion : graph.getAssertedObjects(data.componentType, relation)) {
                             try {
-                               expression = graph.getPossibleRelatedValue(assertion, L0.SCLValue_expression, Bindings.STRING);
+                                expression = graph.getPossibleRelatedValue(assertion, L0.SCLValue_expression, Bindings.STRING);
                                 if(expression != null) {
                                        defaultValue = "=" + expression; //$NON-NLS-1$
                                 } else if (graph.sync(new IsEnumeratedValue(assertion))) {
-                                   defaultValue = GetEnumerationValue.getEnumerationValueName(graph, assertion);
-                               } else {
+                                    defaultValue = GetEnumerationValue.getEnumerationValueName(graph, assertion);
+                                } else {
                                        Datatype dt = getPossibleDatatype(graph, assertion);
                                        if (dt == null)
                                            continue;