X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2FcomponentTypeEditor%2FComponentTypeViewer.java;h=ef63fabe09dc52db6ce5cad752b352c09247d3c6;hb=refs%2Fchanges%2F94%2F3094%2F4;hp=75c60d24cd28d27190c382fba285def14f1f46a6;hpb=99fde2d98f5eda43f77c3fad4c07a2f4f234380c;p=simantics%2Fplatform.git

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 75c60d24c..ef63fabe0 100644
--- 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
@@ -34,6 +34,7 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.ServiceReference;
 import org.simantics.Simantics;
+import org.simantics.browsing.ui.graph.impl.GetEnumerationValue;
 import org.simantics.databoard.Bindings;
 import org.simantics.databoard.binding.Binding;
 import org.simantics.databoard.binding.error.BindingException;
@@ -42,6 +43,7 @@ import org.simantics.databoard.type.NumberType;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.NamedResource;
+import org.simantics.db.common.request.IsEnumeratedValue;
 import org.simantics.db.common.request.UniqueRead;
 import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.exception.DatabaseException;
@@ -198,10 +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 {
+                                } else if (graph.sync(new IsEnumeratedValue(assertion))) {
+                            	    defaultValue = GetEnumerationValue.getEnumerationValueName(graph, assertion);
+                            	} else {
 	                                Datatype dt = getPossibleDatatype(graph, assertion);
 	                                if (dt == null)
 	                                    continue;