Revert "Support enumerated property types in UC interface"

[simantics/platform.git] / bundles / org.simantics.browsing.ui.graph.impl / src / org / simantics / browsing / ui / graph / impl / GetEnumerationValue.java

diff --git a/bundles/org.simantics.browsing.ui.graph.impl/src/org/simantics/browsing/ui/graph/impl/GetEnumerationValue.java b/bundles/org.simantics.browsing.ui.graph.impl/src/org/simantics/browsing/ui/graph/impl/GetEnumerationValue.java
index 9e8adfebea1fa65805c66078c0794e14a49ffec1..c246e7bd9091f5142014ccc37acf53d8250e0372 100644 (file)
--- a/bundles/org.simantics.browsing.ui.graph.impl/src/org/simantics/browsing/ui/graph/impl/GetEnumerationValue.java
+++ b/bundles/org.simantics.browsing.ui.graph.impl/src/org/simantics/browsing/ui/graph/impl/GetEnumerationValue.java
@@ -41,14 +41,6 @@ public class GetEnumerationValue extends ResourceRead<EnumerationValue<Resource>
     public EnumerationValue<Resource> perform(ReadGraph graph) throws DatabaseException {
         return enumerate(graph, resource);
     }
-    
-    public static String getEnumerationValueName(ReadGraph graph, Resource resource) throws DatabaseException {
-        Layer0 L0 = Layer0.getInstance(graph);
-        String label = graph.getPossibleRelatedValue(resource, L0.HasLabel, Bindings.STRING);
-        if(label != null)
-            return label;
-        return safeName(graph, resource);
-    }
 
     public static EnumerationValue<Resource> enumerate(ReadGraph graph, Resource resource) throws DatabaseException {
         Layer0 l0 = Layer0.getInstance(graph);
@@ -69,7 +61,7 @@ public class GetEnumerationValue extends ResourceRead<EnumerationValue<Resource>
                     Collection<Resource> values = graph.getObjects(type, l0.ConsistsOf);
                     List<EnumeratedValue<Resource>> result = new ArrayList<EnumeratedValue<Resource>>(values.size());
                     for (Resource value : values) {
-                        result.add(new EnumeratedValue<Resource>(getEnumerationValueName(graph, value), value));
+                        result.add(new EnumeratedValue<Resource>(safeName(graph, value), value));
                     }
                     Enumeration<Resource> enumeration = new Enumeration<Resource>(result);
                     return new EnumerationValue<Resource>(enumeration, enumeration.find(resource));