From a492521a10dfa4b97bc537b78ae972b5d917cca7 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Sun, 7 Oct 2012 15:04:48 -0300
Subject: [PATCH] Remove xml prolog from generation.

---
 .../test/resources/data/freemind/basic.mmr    |  3 +-
 .../src/test/resources/data/freemind/bug.mmr  | 83 +++++++++--------
 .../test/resources/data/freemind/fonts.mmr    |  3 +-
 .../src/test/resources/data/freemind/i18n.mmr |  9 +-
 .../src/test/resources/data/freemind/i18n2.mm | 40 +++++++++
 .../test/resources/data/freemind/i18n2.mmr    |  7 ++
 .../test/resources/data/freemind/i18n2.wxml   | 16 ++++
 .../test/resources/data/freemind/icons.mmr    |  3 +-
 .../test/resources/data/freemind/links.mmr    |  3 +-
 .../resources/data/freemind/longnodes.mmr     |  9 +-
 .../resources/data/freemind/node-styles.mmr   | 19 ++--
 .../resources/data/freemind/node-styles.wxml  | 16 ++--
 .../resources/data/freemind/numerosity.mm     |  1 -
 .../resources/data/freemind/numerosity.mmr    | 59 ++++++------
 .../test/resources/data/freemind/process.mm   |  1 -
 .../test/resources/data/freemind/process.mmr  |  3 +-
 .../resources/data/freemind/richtextnode.mmr  | 90 +++++++++++--------
 .../resources/data/freemind/richtextnode.wxml | 38 ++++----
 18 files changed, 237 insertions(+), 166 deletions(-)
 create mode 100644 wise-webapp/src/test/resources/data/freemind/i18n2.mm
 create mode 100644 wise-webapp/src/test/resources/data/freemind/i18n2.mmr
 create mode 100644 wise-webapp/src/test/resources/data/freemind/i18n2.wxml

diff --git a/wise-webapp/src/test/resources/data/freemind/basic.mmr b/wise-webapp/src/test/resources/data/freemind/basic.mmr
index 6c4eaf65..43b954de 100644
--- a/wise-webapp/src/test/resources/data/freemind/basic.mmr
+++ b/wise-webapp/src/test/resources/data/freemind/basic.mmr
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <map version="0.9.0">
     <node TEXT="This is the root node" ID="ID_0">
         <node TEXT="Child Level 1 Right 1" POSITION="right" ID="ID_1"/>
@@ -12,4 +11,4 @@
             <node TEXT="Child Level 2 Left 22" POSITION="left" ID="ID_8"/>
         </node>
     </node>
-</map>
+</map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/resources/data/freemind/bug.mmr b/wise-webapp/src/test/resources/data/freemind/bug.mmr
index 30761da2..1d0562ad 100644
--- a/wise-webapp/src/test/resources/data/freemind/bug.mmr
+++ b/wise-webapp/src/test/resources/data/freemind/bug.mmr
@@ -1,64 +1,63 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <map version="0.9.0">
     <node TEXT="Baugruppe :: Systemanforderungen" ID="ID_0">
-        <node TEXT="[1] Motor …" POSITION="right" ID="ID_1">
-            <node TEXT="[27] Isolationssystem …" POSITION="right" ID="ID_2"/>
-            <node TEXT="8[2] …" POSITION="right" ID="ID_3"/>
-            <node TEXT="[170] Multiumrichterbetrieb …" POSITION="right" ID="ID_4"/>
-            <node TEXT="[22] Thermistor …" POSITION="right" ID="ID_5"/>
-            <node TEXT="[2] Stecker …" POSITION="right" ID="ID_6">
-                <node TEXT="[169] …" POSITION="right" ID="ID_7"/>
-                <node TEXT="[5] Kabel …" POSITION="right" ID="ID_8"/>
-                <node TEXT="8[31] Strombuchse …" POSITION="right" ID="ID_9">
-                    <node TEXT="8[2] Stecker …" POSITION="right" ID="ID_10"/>
-                    <node TEXT="8[173] Stecker …" POSITION="right" ID="ID_11"/>
+        <node TEXT="[1] Motor &#8230;" POSITION="right" ID="ID_1">
+            <node TEXT="[27] Isolationssystem &#8230;" POSITION="right" ID="ID_2"/>
+            <node TEXT="8[2] &#8230;" POSITION="right" ID="ID_3"/>
+            <node TEXT="[170] Multiumrichterbetrieb &#8230;" POSITION="right" ID="ID_4"/>
+            <node TEXT="[22] Thermistor &#8230;" POSITION="right" ID="ID_5"/>
+            <node TEXT="[2] Stecker &#8230;" POSITION="right" ID="ID_6">
+                <node TEXT="[169] &#8230;" POSITION="right" ID="ID_7"/>
+                <node TEXT="[5] Kabel &#8230;" POSITION="right" ID="ID_8"/>
+                <node TEXT="8[31] Strombuchse &#8230;" POSITION="right" ID="ID_9">
+                    <node TEXT="8[2] Stecker &#8230;" POSITION="right" ID="ID_10"/>
+                    <node TEXT="8[173] Stecker &#8230;" POSITION="right" ID="ID_11"/>
                 </node>
             </node>
-            <node TEXT="8[173] Stecker …" POSITION="right" ID="ID_12">
-                <node TEXT="8[2] Stecker …" POSITION="right" ID="ID_13"/>
+            <node TEXT="8[173] Stecker &#8230;" POSITION="right" ID="ID_12">
+                <node TEXT="8[2] Stecker &#8230;" POSITION="right" ID="ID_13"/>
             </node>
-            <node TEXT="8[1] …" POSITION="right" ID="ID_14"/>
-            <node TEXT="8[5] …" POSITION="right" ID="ID_15"/>
+            <node TEXT="8[1] &#8230;" POSITION="right" ID="ID_14"/>
+            <node TEXT="8[5] &#8230;" POSITION="right" ID="ID_15"/>
         </node>
-        <node TEXT="[185] Motor …" POSITION="right" ID="ID_16"/>
+        <node TEXT="[185] Motor &#8230;" POSITION="right" ID="ID_16"/>
         <node TEXT="3 Umrichter" POSITION="right" ID="ID_17">
-            <node TEXT="[31] Strombuchse …" POSITION="right" ID="ID_18"/>
-            <node TEXT="8[2] Stecker …" POSITION="right" ID="ID_19">
-                <node TEXT="8[31] Strombuchse …" POSITION="right" ID="ID_20"/>
-                <node TEXT="8[173] Stecker …" POSITION="right" ID="ID_21"/>
+            <node TEXT="[31] Strombuchse &#8230;" POSITION="right" ID="ID_18"/>
+            <node TEXT="8[2] Stecker &#8230;" POSITION="right" ID="ID_19">
+                <node TEXT="8[31] Strombuchse &#8230;" POSITION="right" ID="ID_20"/>
+                <node TEXT="8[173] Stecker &#8230;" POSITION="right" ID="ID_21"/>
             </node>
-            <node TEXT="8[173] Stecker …" POSITION="right" ID="ID_22">
-                <node TEXT="8[2] Stecker …" POSITION="right" ID="ID_23"/>
+            <node TEXT="8[173] Stecker &#8230;" POSITION="right" ID="ID_22">
+                <node TEXT="8[2] Stecker &#8230;" POSITION="right" ID="ID_23"/>
             </node>
-            <node TEXT="[4] max. Außenleiterspannung …" POSITION="right" ID="ID_24"/>
+            <node TEXT="[4] max. Au&#223;enleiterspannung &#8230;" POSITION="right" ID="ID_24"/>
             <node TEXT="[13]" POSITION="right" ID="ID_25">
                 <node TEXT="[14]" POSITION="right" ID="ID_26">
-                    <node TEXT="[15] …" POSITION="right" ID="ID_27"/>
-                    <node TEXT="[16] …" POSITION="right" ID="ID_28"/>
-                    <node TEXT="[17] …" POSITION="right" ID="ID_29"/>
+                    <node TEXT="[15] &#8230;" POSITION="right" ID="ID_27"/>
+                    <node TEXT="[16] &#8230;" POSITION="right" ID="ID_28"/>
+                    <node TEXT="[17] &#8230;" POSITION="right" ID="ID_29"/>
                 </node>
                 <node TEXT="[18]" POSITION="right" ID="ID_30">
-                    <node TEXT="[19] …" POSITION="right" ID="ID_31"/>
-                    <node TEXT="[20] …" POSITION="right" ID="ID_32"/>
-                    <node TEXT="[21] …" POSITION="right" ID="ID_33"/>
+                    <node TEXT="[19] &#8230;" POSITION="right" ID="ID_31"/>
+                    <node TEXT="[20] &#8230;" POSITION="right" ID="ID_32"/>
+                    <node TEXT="[21] &#8230;" POSITION="right" ID="ID_33"/>
                 </node>
             </node>
             <node TEXT="3.3 Steuerung" POSITION="right" ID="ID_34"/>
         </node>
         <node TEXT="4 Bremse" POSITION="right" ID="ID_35">
-            <node TEXT="[172] Bremsansteuerung …" POSITION="right" ID="ID_36"/>
-            <node TEXT="[173] Stecker …" POSITION="right" ID="ID_37">
-                <node TEXT="[175] Kabel …" POSITION="right" ID="ID_38"/>
-                <node TEXT="8[2] Stecker …" POSITION="right" ID="ID_39">
-                    <node TEXT="8[31] Strombuchse …" POSITION="right" ID="ID_40"/>
-                    <node TEXT="8[173] Stecker …" POSITION="right" ID="ID_41"/>
+            <node TEXT="[172] Bremsansteuerung &#8230;" POSITION="right" ID="ID_36"/>
+            <node TEXT="[173] Stecker &#8230;" POSITION="right" ID="ID_37">
+                <node TEXT="[175] Kabel &#8230;" POSITION="right" ID="ID_38"/>
+                <node TEXT="8[2] Stecker &#8230;" POSITION="right" ID="ID_39">
+                    <node TEXT="8[31] Strombuchse &#8230;" POSITION="right" ID="ID_40"/>
+                    <node TEXT="8[173] Stecker &#8230;" POSITION="right" ID="ID_41"/>
                 </node>
             </node>
-            <node TEXT="[178] Bremslufthebel …" POSITION="right" ID="ID_42"/>
-            <node TEXT="[179] Reaktionszeit …" POSITION="right" ID="ID_43"/>
-            <node TEXT="[180] Bremsmoment …" POSITION="right" ID="ID_44"/>
-            <node TEXT="[181] Notbetriebsart …" POSITION="right" ID="ID_45"/>
-            <node TEXT="[182] Bremsüberwachung …" POSITION="right" ID="ID_46"/>
+            <node TEXT="[178] Bremslufthebel &#8230;" POSITION="right" ID="ID_42"/>
+            <node TEXT="[179] Reaktionszeit &#8230;" POSITION="right" ID="ID_43"/>
+            <node TEXT="[180] Bremsmoment &#8230;" POSITION="right" ID="ID_44"/>
+            <node TEXT="[181] Notbetriebsart &#8230;" POSITION="right" ID="ID_45"/>
+            <node TEXT="[182] Brems&#252;berwachung &#8230;" POSITION="right" ID="ID_46"/>
         </node>
     </node>
-</map>
+</map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/resources/data/freemind/fonts.mmr b/wise-webapp/src/test/resources/data/freemind/fonts.mmr
index 8e4014e7..06a92597 100644
--- a/wise-webapp/src/test/resources/data/freemind/fonts.mmr
+++ b/wise-webapp/src/test/resources/data/freemind/fonts.mmr
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <map version="0.9.0">
     <node TEXT="Fonts" ID="ID_0">
         <node TEXT="Styles" POSITION="right" ID="ID_1">
@@ -37,4 +36,4 @@
             </node>
         </node>
     </node>
-</map>
+</map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/resources/data/freemind/i18n.mmr b/wise-webapp/src/test/resources/data/freemind/i18n.mmr
index afe4b1c5..90ba63af 100644
--- a/wise-webapp/src/test/resources/data/freemind/i18n.mmr
+++ b/wise-webapp/src/test/resources/data/freemind/i18n.mmr
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <map version="0.9.0">
     <node TEXT="i18n" ID="ID_0">
-        <node TEXT="Este es un é con acento" POSITION="right" ID="ID_1"/>
-        <node TEXT="Este es una ñ" POSITION="left" ID="ID_2"/>
-        <node TEXT="這是一個樣本 Japanise。" POSITION="right" ID="ID_3"/>
+        <node TEXT="Este es un &#233; con acento" POSITION="right" ID="ID_1"/>
+        <node TEXT="Este es una &#241;" POSITION="left" ID="ID_2"/>
+        <node TEXT="&#36889;&#26159;&#19968;&#20491;&#27171;&#26412; Japanise&#12290;" POSITION="right" ID="ID_3"/>
     </node>
-</map>
+</map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/resources/data/freemind/i18n2.mm b/wise-webapp/src/test/resources/data/freemind/i18n2.mm
new file mode 100644
index 00000000..280f7ebe
--- /dev/null
+++ b/wise-webapp/src/test/resources/data/freemind/i18n2.mm
@@ -0,0 +1,40 @@
+<map version="0.9.0">
+<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->
+<node CREATED="1349539156068" ID="ID_630231307" MODIFIED="1349540030403" TEXT="&#x623;&#x64e;&#x628;&#x652;&#x62c;&#x64e;&#x62f;&#x650;&#x64a;&#x64e;&#x651;&#x629; &#x639;&#x64e;&#x631;&#x64e;&#x628;&#x650;&#x64a;&#x64e;&#x651;&#x629;">
+    <node CREATED="1349539980932" ID="ID_210518412" MODIFIED="1349540027204" POSITION="right"
+          TEXT="&#x623;&#x64e;&#x628;&#x652;&#x62c;&#x64e;&#x62f;&#x650;&#x64a;&#x64e;&#x651;&#x629; &#x639;&#x64e;&#x631;&#x64e;&#x628;&#x650;">
+        <richcontent TYPE="NOTE"><html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      This is a not in languange
+    </p>
+    <ul>
+      <li>
+        &#1571;&#1614;&#1576;&#1618;&#1580;&#1614;&#1583;&#1616;&#1610;&#1614;&#1617;&#1577; &#1593;&#1614;&#1585;&#1614;&#1576;&#1616;
+      </li>
+    </ul>
+  </body>
+</html>
+</richcontent>
+</node>
+<node CREATED="1349540036130" ID="ID_1773957572" MODIFIED="1349540062116" POSITION="left">
+<richcontent TYPE="NODE"><html>
+  <head>
+    
+  </head>
+  <body>
+    <p>
+      Long text node:
+    </p>
+    <p>
+      &#1571;&#1614;&#1576;&#1618;&#1580;&#1614;&#1583;&#1616;&#1610;&#1614;&#1617;&#1577; &#1593;&#1614;&#1585;&#1614;&#1576;
+    </p>
+  </body>
+</html>
+</richcontent>
+</node>
+</node>
+</map>
diff --git a/wise-webapp/src/test/resources/data/freemind/i18n2.mmr b/wise-webapp/src/test/resources/data/freemind/i18n2.mmr
new file mode 100644
index 00000000..9f33cf32
--- /dev/null
+++ b/wise-webapp/src/test/resources/data/freemind/i18n2.mmr
@@ -0,0 +1,7 @@
+<map version="0.9.0">
+    <node TEXT="&#1571;&#1614;&#1576;&#1618;&#1580;&#1614;&#1583;&#1616;&#1610;&#1614;&#1617;&#1577; &#1593;&#1614;&#1585;&#1614;&#1576;&#1616;&#1610;&#1614;&#1617;&#1577;" ID="ID_0">
+        <node TEXT="&#1571;&#1614;&#1576;&#1618;&#1580;&#1614;&#1583;&#1616;&#1610;&#1614;&#1617;&#1577; &#1593;&#1614;&#1585;&#1614;&#1576;&#1616;" POSITION="right" ID="ID_1"/>
+        <node TEXT="Long text node: 
+ &#1571;&#1614;&#1576;&#1618;&#1580;&#1614;&#1583;&#1616;&#1610;&#1614;&#1617;&#1577; &#1593;&#1614;&#1585;&#1614;&#1576;" POSITION="left" ID="ID_2"/>
+    </node>
+</map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/resources/data/freemind/i18n2.wxml b/wise-webapp/src/test/resources/data/freemind/i18n2.wxml
new file mode 100644
index 00000000..67ee1297
--- /dev/null
+++ b/wise-webapp/src/test/resources/data/freemind/i18n2.wxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="tango" name="basic">
+    <topic id="0" central="true" position="0,0" shape="rounded rectagle">
+        <text><![CDATA[أَبْجَدِيَّة عَرَبِيَّة]]></text>
+        <topic id="1" position="200,0" order="0" shape="line">
+            <text><![CDATA[أَبْجَدِيَّة عَرَبِ]]></text>
+            <note>
+                <text><![CDATA[This is a not in languange أَبْجَدِيَّة عَرَبِ]]></text>
+            </note>
+        </topic>
+        <topic id="2" position="-200,0" order="0" shape="line">
+            <text><![CDATA[Long text node: 
+ أَبْجَدِيَّة عَرَب]]></text>
+        </topic>
+    </topic>
+</map>
diff --git a/wise-webapp/src/test/resources/data/freemind/icons.mmr b/wise-webapp/src/test/resources/data/freemind/icons.mmr
index e4a7193f..e9192715 100644
--- a/wise-webapp/src/test/resources/data/freemind/icons.mmr
+++ b/wise-webapp/src/test/resources/data/freemind/icons.mmr
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <map version="0.9.0">
     <node TEXT="This is the root node" ID="ID_0">
         <node TEXT="Simbols" POSITION="right" ID="ID_1">
@@ -195,4 +194,4 @@
             </node>
         </node>
     </node>
-</map>
+</map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/resources/data/freemind/links.mmr b/wise-webapp/src/test/resources/data/freemind/links.mmr
index 9a4fcf1c..e2d61564 100644
--- a/wise-webapp/src/test/resources/data/freemind/links.mmr
+++ b/wise-webapp/src/test/resources/data/freemind/links.mmr
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <map version="0.9.0">
     <node TEXT="Node Links" LINK="http://www.google.com" ID="ID_0">
         <icon BUILTIN="closed"/>
@@ -9,4 +8,4 @@
             </node>
         </node>
     </node>
-</map>
+</map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/resources/data/freemind/longnodes.mmr b/wise-webapp/src/test/resources/data/freemind/longnodes.mmr
index 593fce3e..bb150cb6 100644
--- a/wise-webapp/src/test/resources/data/freemind/longnodes.mmr
+++ b/wise-webapp/src/test/resources/data/freemind/longnodes.mmr
@@ -1,6 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <map version="0.9.0">
     <node TEXT="I have HTML In Nodes" ID="ID_0">
-        <node TEXT="Here is somefonts  &#xA; &#xA; Add color changes ... &#xA; Add some bullets: Different Bullets &#xA; And all aligned !!!!s" POSITION="right" ID="ID_1"/>
+        <node TEXT="Here is somefonts&#160; 
+ 
+ Add color changes ... 
+ Add some bullets: Different Bullets 
+ And all aligned !!!!s" POSITION="right" ID="ID_1"/>
     </node>
-</map>
+</map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/resources/data/freemind/node-styles.mmr b/wise-webapp/src/test/resources/data/freemind/node-styles.mmr
index 41a1f3ce..a643efe8 100644
--- a/wise-webapp/src/test/resources/data/freemind/node-styles.mmr
+++ b/wise-webapp/src/test/resources/data/freemind/node-styles.mmr
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <map version="0.9.0">
     <node TEXT="Shapes" ID="ID_0">
         <node TEXT="Node Styles" POSITION="right" ID="ID_1">
@@ -15,33 +14,33 @@
                 <edge COLOR="#808080"/>
             </node>
         </node>
-        <node TEXT="Node Background Color" POSITION="left" ID="ID_6" BACKGROUND_COLOR="#f20707">
-            <node TEXT="Fork" POSITION="left" ID="ID_7" BACKGROUND_COLOR="#0000cc">
+        <node TEXT="Node Background Color" STYLE="rectagle" POSITION="left" ID="ID_6" BACKGROUND_COLOR="#f20707">
+            <node TEXT="Fork" STYLE="rectagle" POSITION="left" ID="ID_7" BACKGROUND_COLOR="#0000cc">
                 <edge COLOR="#808080"/>
             </node>
             <node TEXT="Bubble" STYLE="bubble" POSITION="left" ID="ID_8" BACKGROUND_COLOR="#ccffcc">
                 <edge COLOR="#808080"/>
             </node>
-            <node TEXT="As parent" POSITION="left" ID="ID_9" BACKGROUND_COLOR="#00ffff">
+            <node TEXT="As parent" STYLE="rectagle" POSITION="left" ID="ID_9" BACKGROUND_COLOR="#00ffff">
                 <edge COLOR="#808080"/>
             </node>
-            <node TEXT="Combined" POSITION="left" ID="ID_10" BACKGROUND_COLOR="#990099">
+            <node TEXT="Combined" STYLE="rectagle" POSITION="left" ID="ID_10" BACKGROUND_COLOR="#990099">
                 <edge COLOR="#808080"/>
             </node>
         </node>
-        <node TEXT="Node Text Color" POSITION="left" ID="ID_11" BACKGROUND_COLOR="#f20707">
-            <node TEXT="Fork" POSITION="left" ID="ID_12" COLOR="#ffff00" BACKGROUND_COLOR="#0000cc">
+        <node TEXT="Node Text Color" STYLE="rectagle" POSITION="left" ID="ID_11" BACKGROUND_COLOR="#f20707">
+            <node TEXT="Fork" STYLE="rectagle" POSITION="left" ID="ID_12" COLOR="#ffff00" BACKGROUND_COLOR="#0000cc">
                 <edge COLOR="#808080"/>
             </node>
             <node TEXT="Bubble" STYLE="bubble" POSITION="left" ID="ID_13" COLOR="#ff6666" BACKGROUND_COLOR="#ccffcc">
                 <edge COLOR="#808080"/>
             </node>
-            <node TEXT="As parent" POSITION="left" ID="ID_14" COLOR="#009999" BACKGROUND_COLOR="#00ffff">
+            <node TEXT="As parent" STYLE="rectagle" POSITION="left" ID="ID_14" COLOR="#009999" BACKGROUND_COLOR="#00ffff">
                 <edge COLOR="#808080"/>
             </node>
-            <node TEXT="Combined" POSITION="left" ID="ID_15" COLOR="#009999" BACKGROUND_COLOR="#990099">
+            <node TEXT="Combined" STYLE="rectagle" POSITION="left" ID="ID_15" COLOR="#009999" BACKGROUND_COLOR="#990099">
                 <edge COLOR="#808080"/>
             </node>
         </node>
     </node>
-</map>
+</map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/resources/data/freemind/node-styles.wxml b/wise-webapp/src/test/resources/data/freemind/node-styles.wxml
index aa881c56..9f37ab87 100644
--- a/wise-webapp/src/test/resources/data/freemind/node-styles.wxml
+++ b/wise-webapp/src/test/resources/data/freemind/node-styles.wxml
@@ -17,10 +17,10 @@
                 <text><![CDATA[Combined]]></text>
             </topic>
         </topic>
-        <topic id="6" position="-200,0" order="0" bgColor="#f20707" shape="line">
+        <topic id="6" position="-200,0" order="0" bgColor="#f20707" shape="rectagle">
             <text><![CDATA[Node Background Color]]></text>
             <topic id="7" position="-290,-50" order="0"
-                brColor="#808080" bgColor="#0000cc" shape="line">
+                brColor="#808080" bgColor="#0000cc" shape="rectagle">
                 <text><![CDATA[Fork]]></text>
             </topic>
             <topic id="8" position="-290,-25" order="1"
@@ -28,19 +28,19 @@
                 <text><![CDATA[Bubble]]></text>
             </topic>
             <topic id="9" position="-290,0" order="2" brColor="#808080"
-                bgColor="#00ffff" shape="line">
+                bgColor="#00ffff" shape="rectagle">
                 <text><![CDATA[As parent]]></text>
             </topic>
             <topic id="10" position="-290,25" order="3"
-                brColor="#808080" bgColor="#990099" shape="line">
+                brColor="#808080" bgColor="#990099" shape="rectagle">
                 <text><![CDATA[Combined]]></text>
             </topic>
         </topic>
-        <topic id="11" position="-200,100" order="4" bgColor="#f20707" shape="line">
+        <topic id="11" position="-200,100" order="4" bgColor="#f20707" shape="rectagle">
             <text><![CDATA[Node Text Color]]></text>
             <topic id="12" position="-290,50" order="0"
                 brColor="#808080" bgColor="#0000cc"
-                fontStyle=";;#ffff00;;;" shape="line">
+                fontStyle=";;#ffff00;;;" shape="rectagle">
                 <text><![CDATA[Fork]]></text>
             </topic>
             <topic id="13" position="-290,75" order="1"
@@ -50,12 +50,12 @@
             </topic>
             <topic id="14" position="-290,100" order="2"
                 brColor="#808080" bgColor="#00ffff"
-                fontStyle=";;#009999;;;" shape="line">
+                fontStyle=";;#009999;;;" shape="rectagle">
                 <text><![CDATA[As parent]]></text>
             </topic>
             <topic id="15" position="-290,125" order="3"
                 brColor="#808080" bgColor="#990099"
-                fontStyle=";;#009999;;;" shape="line">
+                fontStyle=";;#009999;;;" shape="rectagle">
                 <text><![CDATA[Combined]]></text>
             </topic>
         </topic>
diff --git a/wise-webapp/src/test/resources/data/freemind/numerosity.mm b/wise-webapp/src/test/resources/data/freemind/numerosity.mm
index d01160d8..e5247894 100644
--- a/wise-webapp/src/test/resources/data/freemind/numerosity.mm
+++ b/wise-webapp/src/test/resources/data/freemind/numerosity.mm
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <map version="0.9.0">
     <node TEXT="Numerosity" ID="ID_1">
         <node TEXT="Approximate Representations" POSITION="left" ID="ID_47">
diff --git a/wise-webapp/src/test/resources/data/freemind/numerosity.mmr b/wise-webapp/src/test/resources/data/freemind/numerosity.mmr
index 9b4a83a8..2f0aa2b5 100644
--- a/wise-webapp/src/test/resources/data/freemind/numerosity.mmr
+++ b/wise-webapp/src/test/resources/data/freemind/numerosity.mmr
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <map version="0.9.0">
     <node TEXT="Numerosity" ID="ID_0">
         <node TEXT="Approximate Representations" POSITION="left" ID="ID_1">
@@ -7,40 +6,40 @@
                     <node TEXT="Posterior Parietal Cortex (PPC)" POSITION="left" ID="ID_4">
                         <node TEXT="Intraparietal Sulcus (IPS)" POSITION="left" ID="ID_5">
                             <node TEXT="Neurons code for numerosity" POSITION="left" ID="ID_6">
-<node TEXT="Concept of Mental Number Line" POSITION="left" ID="ID_7">
-    <node TEXT="Logarithmic Compression" POSITION="left" ID="ID_8">
-        <node TEXT="Dehaine &amp; Changeux, 1993" POSITION="left" ID="ID_9"/>
-        <node TEXT="Nieder &amp; Miller, 2003" POSITION="left" ID="ID_10"/>
-    </node>
-    <node TEXT="Linear Scale with proportional increasing Std. Dev of Noise" POSITION="left" ID="ID_11">
-        <node TEXT="aallistel &amp; Gelman, 2000" POSITION="left" ID="ID_12"/>
-    </node>
-</node>
-<node TEXT="Nieder et al 2002" POSITION="left" ID="ID_13"/>
-<node TEXT="Sawamura et al, 2002" POSITION="left" ID="ID_14"/>
-<node TEXT="Nieder &amp; Miller, 2003" POSITION="left" ID="ID_15">
-    <arrowlink ENDARROW="Default" DESTINATION="ID_32"/>
-</node>
+                                <node TEXT="Concept of Mental Number Line" POSITION="left" ID="ID_7">
+                                    <node TEXT="Logarithmic Compression" POSITION="left" ID="ID_8">
+                                        <node TEXT="Dehaine &amp; Changeux, 1993" POSITION="left" ID="ID_9"/>
+                                        <node TEXT="Nieder &amp; Miller, 2003" POSITION="left" ID="ID_10"/>
+                                    </node>
+                                    <node TEXT="Linear Scale with proportional increasing Std. Dev of Noise" POSITION="left" ID="ID_11">
+                                        <node TEXT="aallistel &amp; Gelman, 2000" POSITION="left" ID="ID_12"/>
+                                    </node>
+                                </node>
+                                <node TEXT="Nieder et al 2002" POSITION="left" ID="ID_13"/>
+                                <node TEXT="Sawamura et al, 2002" POSITION="left" ID="ID_14"/>
+                                <node TEXT="Nieder &amp; Miller, 2003" POSITION="left" ID="ID_15">
+                                    <arrowlink ENDARROW="Default" DESTINATION="ID_32"/>
+                                </node>
                             </node>
                             <node TEXT="lateral Intraparietal (LIP)" POSITION="left" ID="ID_16">
-<node TEXT="LIP neurons code for number with an accumulator-like coding scheme" POSITION="left" ID="ID_17">
-    <node TEXT="Roitman et al, 2007" POSITION="left" ID="ID_18"/>
-</node>
+                                <node TEXT="LIP neurons code for number with an accumulator-like coding scheme" POSITION="left" ID="ID_17">
+                                    <node TEXT="Roitman et al, 2007" POSITION="left" ID="ID_18"/>
+                                </node>
                             </node>
                             <node TEXT="Ventral Intraparietal (VIP)" POSITION="left" ID="ID_19">
-<node TEXT="Tudusciuc &amp; Nieder, 2007" POSITION="left" ID="ID_20"/>
-<node TEXT="Abstract and likely to encode for auditory and visual numerosity" POSITION="left" ID="ID_21"/>
-<node TEXT="Likely fed by LIP numerosity accumulator codes" POSITION="left" ID="ID_22"/>
+                                <node TEXT="Tudusciuc &amp; Nieder, 2007" POSITION="left" ID="ID_20"/>
+                                <node TEXT="Abstract and likely to encode for auditory and visual numerosity" POSITION="left" ID="ID_21"/>
+                                <node TEXT="Likely fed by LIP numerosity accumulator codes" POSITION="left" ID="ID_22"/>
                             </node>
                             <node TEXT="Horizontal Segment of the Intraparietal Sulcus (hIPS)" POSITION="left" ID="ID_23">
-<node TEXT="Core system for representing numerical quantity" POSITION="left" ID="ID_24">
-    <node TEXT="Dahaene et all, 2003" POSITION="left" ID="ID_25"/>
-    <node TEXT="Piazza et al, 2004" POSITION="left" ID="ID_26"/>
-    <node TEXT="Piazza et al, 2006" POSITION="left" ID="ID_27"/>
-    <node TEXT="Cantlon et al, 2006" POSITION="left" ID="ID_28"/>
-    <node TEXT="Cappelletti et al, 2007" POSITION="left" ID="ID_29"/>
-    <node TEXT="Dormal et al, 2008" POSITION="left" ID="ID_30"/>
-</node>
+                                <node TEXT="Core system for representing numerical quantity" POSITION="left" ID="ID_24">
+                                    <node TEXT="Dahaene et all, 2003" POSITION="left" ID="ID_25"/>
+                                    <node TEXT="Piazza et al, 2004" POSITION="left" ID="ID_26"/>
+                                    <node TEXT="Piazza et al, 2006" POSITION="left" ID="ID_27"/>
+                                    <node TEXT="Cantlon et al, 2006" POSITION="left" ID="ID_28"/>
+                                    <node TEXT="Cappelletti et al, 2007" POSITION="left" ID="ID_29"/>
+                                    <node TEXT="Dormal et al, 2008" POSITION="left" ID="ID_30"/>
+                                </node>
                             </node>
                         </node>
                     </node>
@@ -85,4 +84,4 @@
             </node>
         </node>
     </node>
-</map>
+</map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/resources/data/freemind/process.mm b/wise-webapp/src/test/resources/data/freemind/process.mm
index a1863efd..ca283dfb 100644
--- a/wise-webapp/src/test/resources/data/freemind/process.mm
+++ b/wise-webapp/src/test/resources/data/freemind/process.mm
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <map version="0.9.0">
     <node TEXT="California" ID="ID_1">
         <node TEXT="Northern California" POSITION="left" ID="ID_24">
diff --git a/wise-webapp/src/test/resources/data/freemind/process.mmr b/wise-webapp/src/test/resources/data/freemind/process.mmr
index 99025379..9a27b79d 100644
--- a/wise-webapp/src/test/resources/data/freemind/process.mmr
+++ b/wise-webapp/src/test/resources/data/freemind/process.mmr
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <map version="0.9.0">
     <node TEXT="California" ID="ID_0">
         <node TEXT="Northern California" POSITION="left" ID="ID_1">
@@ -98,4 +97,4 @@
             </node>
         </node>
     </node>
-</map>
+</map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/resources/data/freemind/richtextnode.mmr b/wise-webapp/src/test/resources/data/freemind/richtextnode.mmr
index b88c81da..11933aac 100644
--- a/wise-webapp/src/test/resources/data/freemind/richtextnode.mmr
+++ b/wise-webapp/src/test/resources/data/freemind/richtextnode.mmr
@@ -1,102 +1,118 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <map version="0.9.0">
     <node TEXT="120924 Programme" ID="ID_0" COLOR="#ff3300" BACKGROUND_COLOR="#99ffff">
         <font SIZE="10" NAME="Arial" BOLD="true"/>
-        <hook NAME="accessories/plugins/NodeNote.properties">
-            <text></text>
-        </hook>
-        <node TEXT="bilan mi-parcours&#xA;du plan d'actions" STYLE="bubble" POSITION="right" ID="ID_1" COLOR="#0000cc" BACKGROUND_COLOR="#ffff33">
+        <node TEXT="bilan mi-parcours
+du plan d'actions" STYLE="bubble" POSITION="right" ID="ID_1" COLOR="#0000cc" BACKGROUND_COLOR="#ffff33">
             <font SIZE="8" NAME="Arial" BOLD="true"/>
             <edge COLOR="#808080"/>
-            <node TEXT="modalités" POSITION="right" ID="ID_2" COLOR="#006600">
+            <node TEXT="modalit&#233;s" POSITION="right" ID="ID_2" COLOR="#006600">
                 <font SIZE="8" NAME="Arial" BOLD="true"/>
                 <node TEXT="cf. mi-parcours 201109" POSITION="right" ID="ID_3"/>
-                <node TEXT="à partir des plans d'actions" POSITION="right" ID="ID_4">
+                <node TEXT="&#224; partir des plans d'actions" POSITION="right" ID="ID_4">
                     <font SIZE="8" NAME="Arial"/>
                 </node>
-                <node TEXT="donner la parole aux référents prévus, en demandant des exemples" POSITION="right" ID="ID_5">
+                <node TEXT="donner la parole aux r&#233;f&#233;rents pr&#233;vus, en demandant des exemples" POSITION="right" ID="ID_5">
                     <font SIZE="8" NAME="Arial"/>
                 </node>
-                <node TEXT="faire compléter par les autres participants" POSITION="right" ID="ID_6">
+                <node TEXT="faire compl&#233;ter par les autres participants" POSITION="right" ID="ID_6">
                     <font SIZE="8" NAME="Arial"/>
                 </node>
             </node>
-            <node TEXT="1) Adapter et améliorer &#xA; notre offre de services &#xA; selon l'évolution des besoins" STYLE="bubble" POSITION="right" ID="ID_7" COLOR="#0000cc" BACKGROUND_COLOR="#99ffff">
+            <node TEXT="1) Adapter et am&#233;liorer 
+ notre offre de services 
+ selon l'&#233;volution des besoins" STYLE="bubble" POSITION="right" ID="ID_7" COLOR="#0000cc" BACKGROUND_COLOR="#99ffff">
                 <font SIZE="8" NAME="Arial" BOLD="true"/>
                 <edge COLOR="#808080"/>
-                <node TEXT="couleurs = état d'avancement en septembre 2011, &#xA;à mettre à jour selon avancement 2012" POSITION="right" ID="ID_8" BACKGROUND_COLOR="#99ffff">
-                    <node TEXT="Bleu 0%" POSITION="right" ID="ID_9" BACKGROUND_COLOR="#0099ff"/>
-                    <node TEXT="Rouge 25%" POSITION="right" ID="ID_10" BACKGROUND_COLOR="#ff9999"/>
-                    <node TEXT="Orange 50%" POSITION="right" ID="ID_11" BACKGROUND_COLOR="#ffcc00"/>
-                    <node TEXT="Jaune 75%" POSITION="right" ID="ID_12" BACKGROUND_COLOR="#ffff00"/>
-                    <node TEXT="Vert" POSITION="right" ID="ID_13" BACKGROUND_COLOR="#66ff00">
+                <node TEXT="couleurs = &#233;tat d'avancement en septembre 2011, 
+&#224; mettre &#224; jour selon avancement 2012" STYLE="rectagle" POSITION="right" ID="ID_8" BACKGROUND_COLOR="#99ffff">
+                    <node TEXT="Bleu 0%" STYLE="rectagle" POSITION="right" ID="ID_9" BACKGROUND_COLOR="#0099ff"/>
+                    <node TEXT="Rouge 25%" STYLE="rectagle" POSITION="right" ID="ID_10" BACKGROUND_COLOR="#ff9999"/>
+                    <node TEXT="Orange 50%" STYLE="rectagle" POSITION="right" ID="ID_11" BACKGROUND_COLOR="#ffcc00"/>
+                    <node TEXT="Jaune 75%" STYLE="rectagle" POSITION="right" ID="ID_12" BACKGROUND_COLOR="#ffff00"/>
+                    <node TEXT="Vert" STYLE="rectagle" POSITION="right" ID="ID_13" BACKGROUND_COLOR="#66ff00">
                         <node TEXT="100 %" POSITION="right" ID="ID_14"/>
                     </node>
                 </node>
-                <node TEXT="1.1. .Renforcer et structurer &#xA; le service &quot;accueil et orientation&quot;" POSITION="right" ID="ID_15" FOLDED="true" COLOR="#006600" BACKGROUND_COLOR="#66ff00">
+                <node TEXT="1.1. .Renforcer et structurer 
+ le service &quot;accueil et orientation&quot;" STYLE="rectagle" POSITION="right" ID="ID_15" FOLDED="true" COLOR="#006600" BACKGROUND_COLOR="#66ff00">
                     <font SIZE="8" NAME="Arial" BOLD="true"/>
                     <node TEXT="Sophie" POSITION="right" ID="ID_16"/>
                 </node>
-                <node TEXT="1.2. Adapter l'offre Halte-Garderie &#xA; aux besoins des familles" POSITION="right" ID="ID_17" COLOR="#006600" BACKGROUND_COLOR="#ffff00">
+                <node TEXT="1.2. Adapter l'offre Halte-Garderie 
+ aux besoins des familles" STYLE="rectagle" POSITION="right" ID="ID_17" COLOR="#006600" BACKGROUND_COLOR="#ffff00">
                     <font SIZE="8" NAME="Arial" BOLD="true"/>
                     <node TEXT="Martine D et Christine" POSITION="right" ID="ID_18"/>
                 </node>
-                <node TEXT="1.3. Renforcer et structurer les services &#xA; de soutien à la parentalité" POSITION="right" ID="ID_19" COLOR="#006600" BACKGROUND_COLOR="#66ff00">
+                <node TEXT="1.3. Renforcer et structurer les services 
+ de soutien &#224; la parentalit&#233;" STYLE="rectagle" POSITION="right" ID="ID_19" COLOR="#006600" BACKGROUND_COLOR="#66ff00">
                     <font SIZE="8" NAME="Arial" BOLD="true"/>
                     <node TEXT="Nathalie" POSITION="right" ID="ID_20"/>
                 </node>
-                <node TEXT="1.4 Améliorer la qualité des &#xA; projets pédagogiques des ALSH" POSITION="right" ID="ID_21" COLOR="#006600" BACKGROUND_COLOR="#ffff00">
+                <node TEXT="1.4 Am&#233;liorer la qualit&#233; des 
+ projets p&#233;dagogiques des ALSH" STYLE="rectagle" POSITION="right" ID="ID_21" COLOR="#006600" BACKGROUND_COLOR="#ffff00">
                     <font SIZE="8" NAME="Arial" BOLD="true"/>
                     <node TEXT="Josiane" POSITION="right" ID="ID_22"/>
                 </node>
-                <node TEXT="1.5 Renforcer et améliorer les &#xA; activités de loisirs existantes" POSITION="right" ID="ID_23" COLOR="#006600" BACKGROUND_COLOR="#ffcc00">
+                <node TEXT="1.5 Renforcer et am&#233;liorer les 
+ activit&#233;s de loisirs existantes" STYLE="rectagle" POSITION="right" ID="ID_23" COLOR="#006600" BACKGROUND_COLOR="#ffcc00">
                     <font SIZE="8" NAME="Arial" BOLD="true"/>
-                    <node TEXT="Agnès" POSITION="right" ID="ID_24"/>
+                    <node TEXT="Agn&#232;s" POSITION="right" ID="ID_24"/>
                 </node>
-                <node TEXT="1.6 Renforcer et améliorer les ateliers   &#xA; visant à  rompre l'isolement lié à la langue, &#xA; la pauvreté, la pression de la consommation" POSITION="right" ID="ID_25" COLOR="#006600" BACKGROUND_COLOR="#66ff00">
+                <node TEXT="1.6 Renforcer et am&#233;liorer les ateliers&#160;&#160; 
+ visant &#224;&#160;&#160;rompre l'isolement li&#233; &#224; la langue, 
+ la pauvret&#233;, la pression de la consommation" STYLE="rectagle" POSITION="right" ID="ID_25" COLOR="#006600" BACKGROUND_COLOR="#66ff00">
                     <font SIZE="8" NAME="Arial" BOLD="true"/>
                     <node TEXT="Nathalie" POSITION="right" ID="ID_26"/>
                 </node>
             </node>
-            <node TEXT="2) Consolider nos moyens d'action : &#xA; locaux, organisation, communication interne" STYLE="bubble" POSITION="right" ID="ID_27" COLOR="#0000cc" BACKGROUND_COLOR="#99ffff">
+            <node TEXT="2) Consolider nos moyens d'action : 
+ locaux, organisation, communication interne" STYLE="bubble" POSITION="right" ID="ID_27" COLOR="#0000cc" BACKGROUND_COLOR="#99ffff">
                 <font SIZE="8" NAME="Arial" BOLD="true"/>
                 <edge COLOR="#808080"/>
-                <node TEXT="2.1 Formaliser notre offre de services &#xA; et les modèles économiques correspondants" POSITION="right" ID="ID_28" COLOR="#006600" BACKGROUND_COLOR="#ffff00">
+                <node TEXT="2.1 Formaliser notre offre de services 
+ et les mod&#232;les &#233;conomiques correspondants" STYLE="rectagle" POSITION="right" ID="ID_28" COLOR="#006600" BACKGROUND_COLOR="#ffff00">
                     <font SIZE="8" NAME="Arial" BOLD="true"/>
-                    <node TEXT="Agnès" POSITION="right" ID="ID_29"/>
+                    <node TEXT="Agn&#232;s" POSITION="right" ID="ID_29"/>
                 </node>
-                <node TEXT="2.2 Formaliser le &quot;qui fait quoi&quot; &#xA; en lien avec notre offre de service" POSITION="right" ID="ID_30" COLOR="#006600" BACKGROUND_COLOR="#ffcc00">
+                <node TEXT="2.2 Formaliser le &quot;qui fait quoi&quot; 
+ en lien avec notre offre de service" STYLE="rectagle" POSITION="right" ID="ID_30" COLOR="#006600" BACKGROUND_COLOR="#ffcc00">
                     <font SIZE="8" NAME="Arial" BOLD="true"/>
                     <node TEXT="Martine G" POSITION="right" ID="ID_31"/>
                 </node>
-                <node TEXT="2.3. Elaborer un projet immobilier de proximité &#xA; réalisable au  centre ville" POSITION="right" ID="ID_32" COLOR="#006600" BACKGROUND_COLOR="#66ff00">
+                <node TEXT="2.3. Elaborer un projet immobilier de proximit&#233; 
+ r&#233;alisable au&#160;&#160;centre ville" STYLE="rectagle" POSITION="right" ID="ID_32" COLOR="#006600" BACKGROUND_COLOR="#66ff00">
                     <font SIZE="8" NAME="Arial" BOLD="true"/>
                     <node TEXT="JMDW" POSITION="right" ID="ID_33"/>
                 </node>
             </node>
-            <node TEXT="3) Renforcer nos &#xA; partenariats et &#xA; notre notoriété" STYLE="bubble" POSITION="right" ID="ID_34" COLOR="#0000cc" BACKGROUND_COLOR="#99ffff">
+            <node TEXT="3) Renforcer nos 
+ partenariats et 
+ notre notori&#233;t&#233;" STYLE="bubble" POSITION="right" ID="ID_34" COLOR="#0000cc" BACKGROUND_COLOR="#99ffff">
                 <font SIZE="8" NAME="Arial" BOLD="true"/>
                 <edge COLOR="#808080"/>
-                <node TEXT="3.1 Organiser pour chaque segment de notre offre &#xA; l'identification et la rencontre des partenaires concernés" POSITION="right" ID="ID_35" COLOR="#006600" BACKGROUND_COLOR="#ffff00">
+                <node TEXT="3.1 Organiser pour chaque segment de notre offre 
+ l'identification et la rencontre des partenaires concern&#233;s" STYLE="rectagle" POSITION="right" ID="ID_35" COLOR="#006600" BACKGROUND_COLOR="#ffff00">
                     <font SIZE="8" NAME="Arial" BOLD="true"/>
                     <edge COLOR="#808080"/>
                     <node TEXT="Martine P" POSITION="right" ID="ID_36"/>
                 </node>
-                <node TEXT="3.2 Formaliser et contractualiser les partenariats &#xA; émergeants autour d'actions communes" POSITION="right" ID="ID_37" COLOR="#006600" BACKGROUND_COLOR="#ffcc00">
+                <node TEXT="3.2 Formaliser et contractualiser les partenariats 
+ &#233;mergeants autour d'actions communes" STYLE="rectagle" POSITION="right" ID="ID_37" COLOR="#006600" BACKGROUND_COLOR="#ffcc00">
                     <font SIZE="8" NAME="Arial" BOLD="true"/>
                     <edge COLOR="#808080"/>
-                    <node TEXT="Pdt + Agnès" POSITION="right" ID="ID_38"/>
+                    <node TEXT="Pdt + Agn&#232;s" POSITION="right" ID="ID_38"/>
                 </node>
-                <node TEXT="3.3 développer la vie associative" POSITION="right" ID="ID_39" COLOR="#006600" BACKGROUND_COLOR="#ff6666">
+                <node TEXT="3.3 d&#233;velopper la vie associative" STYLE="rectagle" POSITION="right" ID="ID_39" COLOR="#006600" BACKGROUND_COLOR="#ff6666">
                     <font SIZE="8" NAME="Arial" BOLD="true"/>
-                    <node TEXT="Pdt + Agnès" POSITION="right" ID="ID_40"/>
+                    <node TEXT="Pdt + Agn&#232;s" POSITION="right" ID="ID_40"/>
                 </node>
-                <node TEXT="3.4 définir et faire vivre un plan de communication &#xA; à partir de notre segmentation de l'offre" POSITION="right" ID="ID_41" COLOR="#006600" BACKGROUND_COLOR="#ff6666">
+                <node TEXT="3.4 d&#233;finir et faire vivre un plan de communication 
+ &#224; partir de notre segmentation de l'offre" STYLE="rectagle" POSITION="right" ID="ID_41" COLOR="#006600" BACKGROUND_COLOR="#ff6666">
                     <font SIZE="8" NAME="Arial" BOLD="true"/>
                     <edge COLOR="#808080"/>
-                    <node TEXT="Pdt + Agnès" POSITION="right" ID="ID_42"/>
+                    <node TEXT="Pdt + Agn&#232;s" POSITION="right" ID="ID_42"/>
                 </node>
             </node>
         </node>
     </node>
-</map>
+</map>
\ No newline at end of file
diff --git a/wise-webapp/src/test/resources/data/freemind/richtextnode.wxml b/wise-webapp/src/test/resources/data/freemind/richtextnode.wxml
index e353d432..39974fe0 100644
--- a/wise-webapp/src/test/resources/data/freemind/richtextnode.wxml
+++ b/wise-webapp/src/test/resources/data/freemind/richtextnode.wxml
@@ -35,27 +35,27 @@ du plan d'actions]]></text>
  notre offre de services 
  selon l'évolution des besoins]]></text>
                 <topic id="8" position="380,-175" order="0"
-                    bgColor="#99ffff" shape="line">
+                    bgColor="#99ffff" shape="rectagle">
                     <text><![CDATA[couleurs = état d'avancement en septembre 2011, 
 à mettre à jour selon avancement 2012]]></text>
                     <topic id="9" position="470,-225" order="0"
-                        bgColor="#0099ff" shape="line">
+                        bgColor="#0099ff" shape="rectagle">
                         <text><![CDATA[Bleu 0%]]></text>
                     </topic>
                     <topic id="10" position="470,-200" order="1"
-                        bgColor="#ff9999" shape="line">
+                        bgColor="#ff9999" shape="rectagle">
                         <text><![CDATA[Rouge 25%]]></text>
                     </topic>
                     <topic id="11" position="470,-175" order="2"
-                        bgColor="#ffcc00" shape="line">
+                        bgColor="#ffcc00" shape="rectagle">
                         <text><![CDATA[Orange 50%]]></text>
                     </topic>
                     <topic id="12" position="470,-150" order="3"
-                        bgColor="#ffff00" shape="line">
+                        bgColor="#ffff00" shape="rectagle">
                         <text><![CDATA[Jaune 75%]]></text>
                     </topic>
                     <topic id="13" position="470,-125" order="4"
-                        bgColor="#66ff00" shape="line">
+                        bgColor="#66ff00" shape="rectagle">
                         <text><![CDATA[Vert]]></text>
                         <topic id="14" position="560,-125" order="0" shape="line">
                             <text><![CDATA[100 %]]></text>
@@ -64,7 +64,7 @@ du plan d'actions]]></text>
                 </topic>
                 <topic shrink="true" id="15" position="380,-150"
                     order="1" bgColor="#66ff00"
-                    fontStyle="Arial;8;#006600;bold;;" shape="line">
+                    fontStyle="Arial;8;#006600;bold;;" shape="rectagle">
                     <text><![CDATA[1.1. .Renforcer et structurer 
  le service "accueil et orientation"]]></text>
                     <topic id="16" position="470,-175" order="0" shape="line">
@@ -72,7 +72,7 @@ du plan d'actions]]></text>
                     </topic>
                 </topic>
                 <topic id="17" position="380,-125" order="2"
-                    bgColor="#ffff00" fontStyle="Arial;8;#006600;bold;;" shape="line">
+                    bgColor="#ffff00" fontStyle="Arial;8;#006600;bold;;" shape="rectagle">
                     <text><![CDATA[1.2. Adapter l'offre Halte-Garderie 
  aux besoins des familles]]></text>
                     <topic id="18" position="470,-150" order="0" shape="line">
@@ -80,7 +80,7 @@ du plan d'actions]]></text>
                     </topic>
                 </topic>
                 <topic id="19" position="380,-100" order="3"
-                    bgColor="#66ff00" fontStyle="Arial;8;#006600;bold;;" shape="line">
+                    bgColor="#66ff00" fontStyle="Arial;8;#006600;bold;;" shape="rectagle">
                     <text><![CDATA[1.3. Renforcer et structurer les services 
  de soutien à la parentalité]]></text>
                     <topic id="20" position="470,-125" order="0" shape="line">
@@ -88,7 +88,7 @@ du plan d'actions]]></text>
                     </topic>
                 </topic>
                 <topic id="21" position="380,-75" order="4"
-                    bgColor="#ffff00" fontStyle="Arial;8;#006600;bold;;" shape="line">
+                    bgColor="#ffff00" fontStyle="Arial;8;#006600;bold;;" shape="rectagle">
                     <text><![CDATA[1.4 Améliorer la qualité des 
  projets pédagogiques des ALSH]]></text>
                     <topic id="22" position="470,-100" order="0" shape="line">
@@ -96,7 +96,7 @@ du plan d'actions]]></text>
                     </topic>
                 </topic>
                 <topic id="23" position="380,-50" order="5"
-                    bgColor="#ffcc00" fontStyle="Arial;8;#006600;bold;;" shape="line">
+                    bgColor="#ffcc00" fontStyle="Arial;8;#006600;bold;;" shape="rectagle">
                     <text><![CDATA[1.5 Renforcer et améliorer les 
  activités de loisirs existantes]]></text>
                     <topic id="24" position="470,-75" order="0" shape="line">
@@ -104,7 +104,7 @@ du plan d'actions]]></text>
                     </topic>
                 </topic>
                 <topic id="25" position="380,-25" order="6"
-                    bgColor="#66ff00" fontStyle="Arial;8;#006600;bold;;" shape="line">
+                    bgColor="#66ff00" fontStyle="Arial;8;#006600;bold;;" shape="rectagle">
                     <text><![CDATA[1.6 Renforcer et améliorer les ateliers   
  visant à  rompre l'isolement lié à la langue, 
  la pauvreté, la pression de la consommation]]></text>
@@ -119,7 +119,7 @@ du plan d'actions]]></text>
                 <text><![CDATA[2) Consolider nos moyens d'action : 
  locaux, organisation, communication interne]]></text>
                 <topic id="28" position="380,-100" order="0"
-                    bgColor="#ffff00" fontStyle="Arial;8;#006600;bold;;" shape="line">
+                    bgColor="#ffff00" fontStyle="Arial;8;#006600;bold;;" shape="rectagle">
                     <text><![CDATA[2.1 Formaliser notre offre de services 
  et les modèles économiques correspondants]]></text>
                     <topic id="29" position="470,-150" order="0" shape="line">
@@ -127,7 +127,7 @@ du plan d'actions]]></text>
                     </topic>
                 </topic>
                 <topic id="30" position="380,-75" order="1"
-                    bgColor="#ffcc00" fontStyle="Arial;8;#006600;bold;;" shape="line">
+                    bgColor="#ffcc00" fontStyle="Arial;8;#006600;bold;;" shape="rectagle">
                     <text><![CDATA[2.2 Formaliser le "qui fait quoi" 
  en lien avec notre offre de service]]></text>
                     <topic id="31" position="470,-125" order="0" shape="line">
@@ -135,7 +135,7 @@ du plan d'actions]]></text>
                     </topic>
                 </topic>
                 <topic id="32" position="380,-50" order="2"
-                    bgColor="#66ff00" fontStyle="Arial;8;#006600;bold;;" shape="line">
+                    bgColor="#66ff00" fontStyle="Arial;8;#006600;bold;;" shape="rectagle">
                     <text><![CDATA[2.3. Elaborer un projet immobilier de proximité 
  réalisable au  centre ville]]></text>
                     <topic id="33" position="470,-100" order="0" shape="line">
@@ -150,7 +150,7 @@ du plan d'actions]]></text>
  notre notoriété]]></text>
                 <topic id="35" position="380,-75" order="0"
                     brColor="#808080" bgColor="#ffff00"
-                    fontStyle="Arial;8;#006600;bold;;" shape="line">
+                    fontStyle="Arial;8;#006600;bold;;" shape="rectagle">
                     <text><![CDATA[3.1 Organiser pour chaque segment de notre offre 
  l'identification et la rencontre des partenaires concernés]]></text>
                     <topic id="36" position="470,-125" order="0" shape="line">
@@ -159,7 +159,7 @@ du plan d'actions]]></text>
                 </topic>
                 <topic id="37" position="380,-50" order="1"
                     brColor="#808080" bgColor="#ffcc00"
-                    fontStyle="Arial;8;#006600;bold;;" shape="line">
+                    fontStyle="Arial;8;#006600;bold;;" shape="rectagle">
                     <text><![CDATA[3.2 Formaliser et contractualiser les partenariats 
  émergeants autour d'actions communes]]></text>
                     <topic id="38" position="470,-100" order="0" shape="line">
@@ -167,7 +167,7 @@ du plan d'actions]]></text>
                     </topic>
                 </topic>
                 <topic id="39" position="380,-25" order="2"
-                    bgColor="#ff6666" fontStyle="Arial;8;#006600;bold;;" shape="line">
+                    bgColor="#ff6666" fontStyle="Arial;8;#006600;bold;;" shape="rectagle">
                     <text><![CDATA[3.3 développer la vie associative]]></text>
                     <topic id="40" position="470,-50" order="0" shape="line">
                         <text><![CDATA[Pdt + Agnès]]></text>
@@ -175,7 +175,7 @@ du plan d'actions]]></text>
                 </topic>
                 <topic id="41" position="380,0" order="3"
                     brColor="#808080" bgColor="#ff6666"
-                    fontStyle="Arial;8;#006600;bold;;" shape="line">
+                    fontStyle="Arial;8;#006600;bold;;" shape="rectagle">
                     <text><![CDATA[3.4 définir et faire vivre un plan de communication 
  à partir de notre segmentation de l'offre]]></text>
                     <topic id="42" position="470,-50" order="0" shape="line">