Escape/unescape names of the externals when converting to/from URIs

[simantics/platform.git] / bundles / org.simantics.graph / src / org / simantics / graph / representation / PrettyPrintTG.java

diff --git a/bundles/org.simantics.graph/src/org/simantics/graph/representation/PrettyPrintTG.java b/bundles/org.simantics.graph/src/org/simantics/graph/representation/PrettyPrintTG.java
index cb06d6addd1604bb13070f5249428816d120bf73..095d9e586ccea634c0ea688ecdaedb53389b7cd4 100644 (file)
--- a/bundles/org.simantics.graph/src/org/simantics/graph/representation/PrettyPrintTG.java
+++ b/bundles/org.simantics.graph/src/org/simantics/graph/representation/PrettyPrintTG.java
@@ -30,6 +30,7 @@ import org.simantics.databoard.container.DataContainers;
 import org.simantics.databoard.parser.DataValuePrinter;
 import org.simantics.databoard.parser.PrintFormat;
 import org.simantics.databoard.parser.repository.DataValueRepository;
+import org.simantics.databoard.util.URIStringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -260,10 +261,10 @@ public class PrettyPrintTG {
         // else {
         Identity id = query.getIdentity(parentId);
         if (id.definition instanceof External) {
-            return getExternalURI((External) id.definition) + "/" + name;
+            return getExternalURI((External) id.definition) + "/" + URIStringUtils.escape(name);
         } else if (id.definition instanceof Root) {
             Root root = (Root) id.definition;
-            return "http:/" + root.name + "/" + name;
+            return "http:/" + URIStringUtils.escape(root.name) + "/" + URIStringUtils.escape(name);
         } else {
             return null;
         }