X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.selectionview%2Fsrc%2Forg%2Fsimantics%2Fselectionview%2Ffunction%2FAll.java;h=fa3f0f8d11b065881e428f46ab4ee989d746e374;hb=refs%2Fchanges%2F10%2F3810%2F4;hp=5137dd742ded7dfa2294364aa0e9340cea1fc904;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.selectionview/src/org/simantics/selectionview/function/All.java b/bundles/org.simantics.selectionview/src/org/simantics/selectionview/function/All.java
index 5137dd742..fa3f0f8d1 100644
--- a/bundles/org.simantics.selectionview/src/org/simantics/selectionview/function/All.java
+++ b/bundles/org.simantics.selectionview/src/org/simantics/selectionview/function/All.java
@@ -2,6 +2,7 @@ package org.simantics.selectionview.function;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Map;
 import java.util.function.Consumer;
 
@@ -13,6 +14,7 @@ import org.eclipse.swt.widgets.FontDialog;
 import org.simantics.Simantics;
 import org.simantics.browsing.ui.NodeContext;
 import org.simantics.browsing.ui.content.Labeler.DialogModifier;
+import org.simantics.browsing.ui.graph.impl.GetEnumerationValue;
 import org.simantics.common.format.Formatter;
 import org.simantics.databoard.Bindings;
 import org.simantics.databoard.Datatypes;
@@ -41,6 +43,7 @@ import org.simantics.db.common.request.InstanceEnumerationMap;
 import org.simantics.db.common.request.IsEnumeratedValue;
 import org.simantics.db.common.request.UniqueRead;
 import org.simantics.db.common.request.WriteRequest;
+import org.simantics.db.common.utils.CommonDBUtils;
 import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.util.Layer0Utils;
@@ -53,13 +56,16 @@ import org.simantics.scl.compiler.types.TVar;
 import org.simantics.scl.compiler.types.Type;
 import org.simantics.scl.compiler.types.Types;
 import org.simantics.scl.reflection.annotations.SCLValue;
+import org.simantics.scl.runtime.function.Function1;
 import org.simantics.selectionview.SelectionInput;
+import org.simantics.selectionview.SelectionViewResources;
 import org.simantics.selectionview.StandardSelectionInput;
 import org.simantics.ui.colors.Colors;
 import org.simantics.ui.fonts.Fonts;
 import org.simantics.ui.selection.WorkbenchSelectionElement;
 import org.simantics.ui.selection.WorkbenchSelectionUtils;
 import org.simantics.utils.datastructures.collections.CollectionUtils;
+import org.simantics.utils.strings.AlphanumComparator;
 import org.simantics.utils.ui.AdaptionUtils;
 import org.simantics.utils.ui.ErrorLogger;
 import org.simantics.utils.ui.ISelectionUtils;
@@ -196,7 +202,9 @@ public class All {
 			Resource parameterResource = parameter.getRepresents(graph);
 			if(graph.sync(new IsEnumeratedValue(parameterResource))) {
 				Map<String, Resource> map = graph.sync(new InstanceEnumerationMap(parameterResource));
-				return new ArrayList<String>(map.keySet());
+				ArrayList<String> values = new ArrayList<>(map.keySet());
+				Collections.sort(values, AlphanumComparator.COMPARATOR);
+				return values;
 			} else if(graph.isInstanceOf(parameterResource, L0.Boolean)) {
 				return CollectionUtils.toList("true", "false");
 			}
@@ -208,6 +216,9 @@ public class All {
 	public static Object getPropertyChildName(ReadGraph graph, Resource resource, Object context) throws DatabaseException {
 		if(context instanceof Variable) {
 			Variable variable = (Variable)context;
+			String label = variable.getParent(graph).getPossiblePropertyValue(graph, "HasLabel", Bindings.STRING);
+			if(label != null)
+				return label;
 			return variable.getParent(graph).getName(graph);
 		}
 		throw new DatabaseException("Unknown context " + context);
@@ -448,15 +459,28 @@ public class All {
 			Object value = null;
 			Resource formatter = property.getPossiblePropertyValue(graph, Variables.FORMATTER);
 			if(formatter != null) {
-				
 				Formatter fmt = graph.adaptContextual(formatter, property, Variable.class, Formatter.class);
 				value = fmt.format(property.getValue(graph));
-				
-			} else {
+			}
+			if(value == null) {
+				SelectionViewResources SEL = SelectionViewResources.getInstance(graph);
+				Function1<Object,String> formatterFunction = property.getPossiblePropertyValue(graph, SEL.formatter);
+				if(formatterFunction != null) {
+					value = formatterFunction.apply(property.getValue(graph));
+				}
+			}
+
+			Resource possibleValue = context.getParent(graph).getPossibleRepresents(graph);
+			if(possibleValue != null) {
+				if(graph.syncRequest(new IsEnumeratedValue(possibleValue))) {
+					return CommonDBUtils.getEnumerationValueName(graph, possibleValue);
+				}
+			}
+
+			if(value == null) {
 
 				Variant variant = property.getVariantValue(graph);
 				value = variant.getValue();
-				
 				Binding binding = variant.getBinding();
 				if(binding != null) {
 					Datatype dt = binding.type();	
@@ -508,8 +532,14 @@ public class All {
 				String parsedLabel = (String)_value;
 				Object value = parsedLabel;
 
+				boolean isEnumeration = false;
+				Resource possibleValue = context.getParent(graph).getPossibleRepresents(graph);
+				if(possibleValue != null) {
+					isEnumeration = graph.syncRequest(new IsEnumeratedValue(possibleValue));
+				}
+
 				Datatype type = context.getParent(graph).getPossibleDatatype(graph);
-				if (type != null) {
+				if (type != null && !isEnumeration) {
 
 					Binding binding = Bindings.getBinding(type);