X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.browsing.ui.graph.impl%2Fsrc%2Forg%2Fsimantics%2Fbrowsing%2Fui%2Fgraph%2Fimpl%2FGetEnumerationValue.java;h=37b5cfa18012d3e19b5203e57a044546d509c28f;hp=0f9d119aca3400a7cd6fbb32ff866514c0de50a8;hb=0b4ab685b0aa54ba8fbe0a5742e27726c862cfd9;hpb=6fc013b9a70621230879014575b244f3714d5ba8

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 0f9d119ac..37b5cfa18 100644
--- 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
@@ -23,8 +23,7 @@ import org.simantics.databoard.Bindings;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.common.request.ResourceRead;
-import org.simantics.db.common.utils.NameUtils;
-import org.simantics.db.exception.AdaptionException;
+import org.simantics.db.common.utils.CommonDBUtils;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.layer0.Layer0;
 
@@ -42,14 +41,11 @@ public class GetEnumerationValue extends ResourceRead<EnumerationValue<Resource>
         return enumerate(graph, resource);
     }
 
+    @Deprecated
     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);
+        return CommonDBUtils.getEnumerationValueName(graph, resource);
     }
-
+    
     public static EnumerationValue<Resource> enumerate(ReadGraph graph, Resource resource) throws DatabaseException {
         Layer0 l0 = Layer0.getInstance(graph);
         Set<Resource> types = graph.getTypes(resource);
@@ -69,7 +65,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>(CommonDBUtils.getEnumerationValueName(graph, value), value));
                     }
                     Enumeration<Resource> enumeration = new Enumeration<Resource>(result);
                     return new EnumerationValue<Resource>(enumeration, enumeration.find(resource));
@@ -79,22 +75,4 @@ public class GetEnumerationValue extends ResourceRead<EnumerationValue<Resource>
         return null;
     }
 
-    private static String safeName(ReadGraph graph, Resource value) throws DatabaseException {
-        return graph.syncRequest(new NameRequest(value));
-    }
-
-    public static class NameRequest extends ResourceRead<String> {
-        public NameRequest(Resource resource) {
-            super(resource);
-        }
-        @Override
-        public String perform(ReadGraph graph) throws DatabaseException {
-            try {
-                return graph.adapt(resource, String.class);
-            } catch (AdaptionException e) {
-                return NameUtils.getSafeName(graph, resource);
-            }
-        }
-    }
-
 }