Merge pull request #450 from Systems-Modeling/ST6RI-639

ST6RI-639 Incorrect rendering if no separator before a feature value (PlantUML)

Author: seidewitz

org.omg.sysml.plantuml/src/org/omg/sysml/plantuml/VStructure.java

@@ -27,6 +27,8 @@
 package org.omg.sysml.plantuml;
 
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.omg.sysml.expressions.util.EvaluationUtil;
 import org.omg.sysml.lang.sysml.ActorMembership;
@@ -111,6 +113,8 @@ protected boolean addEvaluatedResults(Element elem) {
         return true;
     }
 
+    private static Pattern patEqFeatureValue = Pattern.compile("^\\s*=");
+
     protected boolean appendFeatureValue(FeatureValue fv) {
         Expression ex = fv.getValue();
         String text = getText(fv);
@@ -121,6 +125,12 @@ protected boolean appendFeatureValue(FeatureValue fv) {
                 if (pos >= 0) {
                     text = text.substring(pos + "default".length()); // 
                 }
+            } else {
+                append(' '); // appendText() trims the text.
+                Matcher m = patEqFeatureValue.matcher(text);
+                if (!m.lookingAt()) {
+                    text = "= " + text;
+                }
             }
             boolean flag = appendText(text, true);
             return addEvaluatedResults(ex) || flag;