From 9fb72cf7b70f6455cbee27753ba48c63f4e03422 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Tue, 4 Jul 2017 17:04:16 +0200
Subject: [PATCH] Resolving TMLMapping to XML bugs
---
src/main/java/tmltranslator/TMLForLoop.java | 3 ++-
src/main/java/tmltranslator/TMLMapping.java | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/tmltranslator/TMLForLoop.java b/src/main/java/tmltranslator/TMLForLoop.java
index 83e1351338..ad71352cd7 100755
--- a/src/main/java/tmltranslator/TMLForLoop.java
+++ b/src/main/java/tmltranslator/TMLForLoop.java
@@ -41,6 +41,7 @@
package tmltranslator;
+import myutil.*;
/**
* Class TMLForLoop
@@ -77,7 +78,7 @@ public class TMLForLoop extends TMLActivityElement {
}
public String customExtraToXML() {
- return " init=\"" + init + "\" + condition=\"" + condition + "\" increment=\"" + increment + "\" isInfinite=\"" + isInfinite + "\" ";
+ return " init=\"" + Conversion.transformToXMLString(init) + "\" condition=\"" + Conversion.transformToXMLString(condition) + "\" increment=\"" + Conversion.transformToXMLString(increment) + "\" isInfinite=\"" + isInfinite + "\" ";
}
diff --git a/src/main/java/tmltranslator/TMLMapping.java b/src/main/java/tmltranslator/TMLMapping.java
index bc96d333eb..64e4396117 100755
--- a/src/main/java/tmltranslator/TMLMapping.java
+++ b/src/main/java/tmltranslator/TMLMapping.java
@@ -43,7 +43,7 @@
package tmltranslator;
-import myutil.TraceManager;
+import myutil.*;
import tmltranslator.toproverif.TML2ProVerif;
import ui.TMLArchiPanel;
import ui.TMLComponentDesignPanel;
@@ -1487,9 +1487,10 @@ public class TMLMapping<E> {
for(int i=0; i<onnodes.size(); i++) {
HwExecutionNode node = onnodes.get(i);
TMLTask task = mappedtasks.get(i);
- s += "<TASKMAP node=\"" + node.getName() + "\" task=\"" + task.getName() + " />\n";
+ s += "<TASKMAP node=\"" + node.getName() + "\" task=\"" + task.getName() + "\" />\n";
}
s += "</TMLMAPPING>\n";
+ //s = myutil.Conversion.transformToXMLString(s);
return s;
}
}
--
GitLab