X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.debug.ui%2Fsrc%2Forg%2Fsimantics%2Fdebug%2Fui%2FSearchResourceDialog.java;h=ffdc681754940015690d29e92ed7a6f832a4d4b4;hb=refs%2Fchanges%2F14%2F214%2F1;hp=1ae23d7197c0b61bd5f039611872388f9641a739;hpb=0a314ce9afeeac53b4d4653125cf56cb99be7976;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/SearchResourceDialog.java b/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/SearchResourceDialog.java
index 1ae23d719..ffdc68175 100644
--- a/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/SearchResourceDialog.java
+++ b/bundles/org.simantics.debug.ui/src/org/simantics/debug/ui/SearchResourceDialog.java
@@ -115,11 +115,12 @@ public class SearchResourceDialog extends FilteredItemsSelectionDialog {
                     @Override
                     public String perform(ReadGraph g) throws DatabaseException {
                         String name = NameUtils.getSafeName(g, r);
-                        String uri = g.getPossibleURI(r);
-                        String label = "[" + r.getResourceId() + "] - " + name;
-                        if (uri != null)
-                            label = label + " - " + uri;
-                        return label;
+                        String uri = DebugUtils.getPossibleRootRelativePath(g, r);
+                        return
+                                "[" + r.getResourceId() + "] - "
+                                + name
+                                + (uri != null ? " - " : "")
+                                + (uri != null ? uri : "");
                     }
                 });
             } catch (DatabaseException e) {
@@ -216,7 +217,7 @@ public class SearchResourceDialog extends FilteredItemsSelectionDialog {
                             return null;
                         try {
                             try {
-                                return g.adapt(r, String.class);
+                                return DebugUtils.getSafeLabel(g, r);
                             } catch (Exception ex) {
                                 System.out.println("Exception thrown from restoreItemFromMemento");
                             }