Fixed multiple issues causing dangling references to discarded queries

[simantics/platform.git] / bundles / org.simantics.selectionview / src / org / simantics / selectionview / function / All.java

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 233a1e5a11608fd20088deeb0a82f9c6d31d422d..fa3f0f8d11b065881e428f46ab4ee989d746e374 100644 (file)
--- a/bundles/org.simantics.selectionview/src/org/simantics/selectionview/function/All.java
+++ b/bundles/org.simantics.selectionview/src/org/simantics/selectionview/function/All.java
@@ -13,7 +13,6 @@ 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;
@@ -44,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;
@@ -473,7 +473,7 @@ public class All {
                        Resource possibleValue = context.getParent(graph).getPossibleRepresents(graph);
                        if(possibleValue != null) {
                                if(graph.syncRequest(new IsEnumeratedValue(possibleValue))) {
-                       return GetEnumerationValue.getEnumerationValueName(graph, possibleValue);
+                                       return CommonDBUtils.getEnumerationValueName(graph, possibleValue);
                                }
                        }