X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.selectionview%2Fsrc%2Forg%2Fsimantics%2Fselectionview%2Ffunction%2FAll.java;h=79541b06134deb344a5f6f71c4dda854edcfc145;hp=233a1e5a11608fd20088deeb0a82f9c6d31d422d;hb=1b2114e1f1cbae2f85ae396ef37a3199aaf67a3c;hpb=a175b74181c4841b403170f03e1ad9caac946f53

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 233a1e5a1..79541b061 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,7 +2,6 @@ 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,9 +12,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.FontDialog;
 import org.simantics.Simantics;
 import org.simantics.browsing.ui.NodeContext;
-import org.simantics.browsing.ui.common.modifiers.EnumerationValue;
 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;
@@ -65,7 +62,6 @@ 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;
@@ -202,9 +198,7 @@ public class All {
 			Resource parameterResource = parameter.getRepresents(graph);
 			if(graph.sync(new IsEnumeratedValue(parameterResource))) {
 				Map<String, Resource> map = graph.sync(new InstanceEnumerationMap(parameterResource));
-				ArrayList<String> values = new ArrayList<>(map.keySet());
-				Collections.sort(values, AlphanumComparator.COMPARATOR);
-				return values;
+				return new ArrayList<String>(map.keySet());
 			} else if(graph.isInstanceOf(parameterResource, L0.Boolean)) {
 				return CollectionUtils.toList("true", "false");
 			}
@@ -469,14 +463,6 @@ public class All {
 					value = formatterFunction.apply(property.getValue(graph));
 				}
 			}
-
-			Resource possibleValue = context.getParent(graph).getPossibleRepresents(graph);
-			if(possibleValue != null) {
-				if(graph.syncRequest(new IsEnumeratedValue(possibleValue))) {
-                	return GetEnumerationValue.getEnumerationValueName(graph, possibleValue);
-				}
-			}
-
 			if(value == null) {
 
 				Variant variant = property.getVariantValue(graph);
@@ -532,14 +518,8 @@ 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 && !isEnumeration) {
+				if (type != null) {
 
 					Binding binding = Bindings.getBinding(type);