Fixed labels for search results restored from previous search memento

[simantics/platform.git] / bundles / org.simantics.debug.ui / src / org / simantics / debug / ui / SearchResourceDialog.java

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 1ae23d7197c0b61bd5f039611872388f9641a739..ffdc681754940015690d29e92ed7a6f832a4d4b4 100644 (file)
--- 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\r
                     public String perform(ReadGraph g) throws DatabaseException {\r
                         String name = NameUtils.getSafeName(g, r);\r
-                        String uri = g.getPossibleURI(r);\r
-                        String label = "[" + r.getResourceId() + "] - " + name;\r
-                        if (uri != null)\r
-                            label = label + " - " + uri;\r
-                        return label;\r
+                        String uri = DebugUtils.getPossibleRootRelativePath(g, r);\r
+                        return\r
+                                "[" + r.getResourceId() + "] - "\r
+                                + name\r
+                                + (uri != null ? " - " : "")\r
+                                + (uri != null ? uri : "");\r
                     }\r
                 });\r
             } catch (DatabaseException e) {\r
@@ -216,7 +217,7 @@ public class SearchResourceDialog extends FilteredItemsSelectionDialog {
                             return null;\r
                         try {\r
                             try {\r
-                                return g.adapt(r, String.class);\r
+                                return DebugUtils.getSafeLabel(g, r);\r
                             } catch (Exception ex) {\r
                                 System.out.println("Exception thrown from restoreItemFromMemento");\r
                             }\r