@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
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