X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Frequest%2FTypeString.java;h=1813b0744f0318b5418a64c7e0d439a468429103;hp=a2faedb5abcd9aba3a784ce76d3901b85d281b8b;hb=3c524553c98b56075d854f355bc7bab2e3ae17f7;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypeString.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypeString.java
index a2faedb5a..1813b0744 100644
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypeString.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/TypeString.java
@@ -1,58 +1,64 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.db.common.request;
-
-import java.util.Set;
-
-import org.simantics.databoard.Bindings;
-import org.simantics.db.ReadGraph;
-import org.simantics.db.Resource;
-import org.simantics.db.ResourceSet;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.layer0.Layer0;
-
-public class TypeString extends BinaryRead<ResourceSet, String, String> {
-
-    final private Layer0 L0;
-    
-    public TypeString(Layer0 L0, Set<Resource> set) {
-        super((ResourceSet)set, " ");
-        this.L0 = L0;
-    }
-
-//    public TypeString(Layer0 L0, ResourceSet set, String separator) {
-//        super(set, separator);
-//        if (separator == null)
-//            throw new NullPointerException("null separator");
-//        this.L0 = L0;
-//    }
-
-    @Override
-    public String perform(ReadGraph graph) throws DatabaseException {
-
-    	if (parameter == null || parameter.isEmpty()) return "";
-
-    	StringBuilder result = new StringBuilder();
-
-        boolean first = true;
-    	for(Resource r : parameter) {
-    	    String name = graph.getPossibleRelatedValue(r, L0.HasName, Bindings.STRING);
-            if(!first) result.append(parameter2);
-            else first = false;
-            result.append(name);
-    	}
-    	
-    	return result.toString();
-    	
-    }
-
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.db.common.request;
+
+import java.util.Set;
+
+import org.simantics.databoard.Bindings;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.ResourceSet;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.layer0.Layer0;
+
+public class TypeString extends BinaryRead<ResourceSet, String, String> {
+
+    final private Layer0 L0;
+    
+    public TypeString(Layer0 L0, Set<Resource> set) {
+        super((ResourceSet)set, " ");
+        this.L0 = L0;
+    }
+
+//    public TypeString(Layer0 L0, ResourceSet set, String separator) {
+//        super(set, separator);
+//        if (separator == null)
+//            throw new NullPointerException("null separator");
+//        this.L0 = L0;
+//    }
+
+    @Override
+    public String perform(ReadGraph graph) throws DatabaseException {
+
+    	if (parameter == null || parameter.isEmpty()) return "";
+
+    	StringBuilder result = new StringBuilder();
+
+        boolean first = true;
+    	for(Resource r : parameter) {
+    	    String name = graph.getPossibleRelatedValue(r, L0.HasName, Bindings.STRING);
+    	    if (name != null) {
+                if(!first) result.append(parameter2);
+                else first = false;
+                result.append(escapeToken(name));
+    	    }
+    	}
+    	
+    	return result.toString();
+    	
+    }
+    
+    public static String escapeToken(String token) {
+    	return token.replaceAll("( |\\\\)", "\\\\$0");
+	}
+
 }
\ No newline at end of file