#116 Keep line feed characters when displaying ReqIF text in diagrams.

Fixes #116 Change-Id: I8ebdda2567ae538bf7a8b7c096f861a8d1395a8e Signed-off-by: Tu Ton <minhtutonthat@gmail.com>
eclipse-capella · Jan 22, 2021 · 09a14e5 · 09a14e5
1 parent cd1d122
commit 09a14e5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/...g/polarsys/capella/vp/requirements/design/service/CapellaRequirementsOpenJavaService.java b/...g/polarsys/capella/vp/requirements/design/service/CapellaRequirementsOpenJavaService.java
@@ -387,7 +387,7 @@ protected String evaluateExpression(Session session, Requirement requirement, St
             resultBuilder.append(value);
           }
           String evaluationResult = resultBuilder.toString();
-          String sanytizedResult = LabelHelper.transformHTMLToText(evaluationResult);
+          String sanytizedResult = LabelHelper.transformHTMLToTextWithLineFeed(evaluationResult);
 
           return reduceString(sanytizedResult, maxLength);
         }

diff --git a/...larsys.capella.vp.requirements.doc/images/requirements_configuration_wizard.png b/...larsys.capella.vp.requirements.doc/images/requirements_configuration_wizard.png
diff --git a/...ts.model.helpers/src/org/polarsys/kitalpha/vp/requirements/model/helpers/LabelHelper.java b/...ts.model.helpers/src/org/polarsys/kitalpha/vp/requirements/model/helpers/LabelHelper.java
@@ -20,7 +20,11 @@ private LabelHelper() {
     // Private constructor
   }
   public static String transformHTMLToText(String content) {
-    content = content.replaceAll("<[^>]*>", "").replaceAll("\r\n", " ").replaceAll("\n", " ").trim();
+    return transformHTMLToTextWithLineFeed(content).replace("\r\n", " ").replace("\n", " ").trim();
+  }
+
+  public static String transformHTMLToTextWithLineFeed(String content) {
+    content = content.replaceAll("<[^>]*>", "").trim();
     // Decode special characters
     content = URI.decode(content);
     // Unescape HTML special character entities