From 128c223d9809c27bffb52d1cd499bf3a86772a28 Mon Sep 17 00:00:00 2001
From: miettinen <miettinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 26 Sep 2013 10:16:38 +0000
Subject: [PATCH] Fixed: Charts work with Sysdyn variables which have spaces in
 their names (refs #4422).

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@27891 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 .../src/org/simantics/sysdyn/adapter/IndexVariable.java       | 4 ++--
 .../simantics/sysdyn/expressionParser/ExpressionParser.java   | 1 -
 .../org/simantics/sysdyn/expressionParser/ExpressionParser.jj | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java
index f73c313c..3afc87f7 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/IndexVariable.java
@@ -220,8 +220,8 @@ public abstract class IndexVariable<T> extends AbstractPropertyVariable {
         for(String k : rvis.keySet()) {
         	if(k.matches(test)) {
         		String value = rvis.get(k);
-        		result.first.add(k.substring(1).replace("/", "."));
-        		result.second.add(value.substring(1).replace("/", "."));
+        		result.first.add(k.substring(1).replace("/", ".").replace("%20", "_"));
+        		result.second.add(value.substring(1).replace("/", ".").replace("%20", " "));
         	}
         }
         
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
index 0c38a0e9..b7bb6f4a 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
@@ -493,7 +493,6 @@ public class ExpressionParser implements ExpressionParserConstants {
     tempToken.endLine = token.endLine;
     tempToken.endColumn = token.endColumn;
         concatToken = tempToken;
-        System.out.println(concatToken.image);
       break;
     default:
       jj_la1[21] = jj_gen;
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
index 7c79449e..eab29f8c 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
@@ -231,7 +231,6 @@ Token ident() : {
     tempToken.endLine = token.endLine;
     tempToken.endColumn = token.endColumn;
 	concatToken = tempToken;
-	System.out.println(concatToken.image);
   }
   )?
   {
    return concatToken;
-- 
2.47.1