Merge pull request #286 from Systems-Modeling/ST6RI-446

ST6RI-446: Visualize subsetted features.

Author: seidewitz

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

@@ -47,10 +47,6 @@
 import org.omg.sysml.lang.sysml.Usage;
 
 public class VDefault extends VTraverser {
-    protected static String getFeatureName(Feature f) {
-        return f.getEffectiveName();
-    }
-
     protected static String getName(Element e) {
         if (e instanceof Feature) {
             return getFeatureName((Feature) e);

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

@@ -42,6 +42,7 @@
 import org.omg.sysml.lang.sysml.RequirementUsage;
 import org.omg.sysml.lang.sysml.ResultExpressionMembership;
 import org.omg.sysml.lang.sysml.SatisfyRequirementUsage;
+import org.omg.sysml.lang.sysml.Subsetting;
 import org.omg.sysml.lang.sysml.Type;
 
 public abstract class VStructure extends VDefault {
@@ -103,15 +104,7 @@ private Feature getRedefinedFeature(Feature f) {
     private String redefinedFeatureText(Feature f) {
         Feature rf = getRedefinedFeature(f);
         if (rf == null) return null;
-        String name = getFeatureName(rf);
-        if (name == null) return null;
-
-        org.omg.sysml.lang.sysml.Namespace pkg = rf.getOwningNamespace();
-        if (pkg == null) {
-            return name;
-        } else {
-            return pkg.getName() + "::" + name;
-        }
+        return getNameWithNamespace(rf);
     }
 
     private boolean addRedefinedFeatureText(Feature f) {
@@ -129,7 +122,7 @@ private void addFeatureTextInternal(Feature f, String name, boolean isInherited)
             append('^');
         }
         append(name);
-        addFeatureTypeText(": ", f);
+        addFeatureTypeAndSubsettedText(f);
         addFeatureMembershipText(f);
     }
 
@@ -160,32 +153,20 @@ protected boolean addFeatureText(Feature f) {
     }
 
     protected void addAnonymouseFeatureText(Feature f) {
-        addFeatureTypeText(": ", f);
+        addFeatureTypeAndSubsettedText(f);
         addFeatureMembershipText(f);
     }
 
-
     protected String extractTitleName(Element e) {
         String name = getNameAnyway(e, true);
         if (!(e instanceof Feature)) return name;
 
         Feature f = (Feature) e;
-        List<FeatureTyping> tt = f.getOwnedTyping();
-        if (tt.isEmpty()) return name;
         StringBuilder sb = new StringBuilder();
-        for (FeatureTyping ft: tt) {
-            if (sb.length() > 0) {
-                sb.append(", ");
-            }
-            if (ft == null) continue;
-            Type typ = ft.getType();
-            if (typ == null) continue;
-            String typeName = typ.getName();
-            if (typeName == null) continue;
-            sb.append(typeName);
-        }
-        if (sb.length() == 0) return name;
-        sb.insert(0, ": ");
+        boolean added = appendFeatureType(sb, ": ", f);
+        sb.append(' ');
+        added = appendSubsettingFeature(sb, ":> ", f) || added;
+        if (!added) return name;
         sb.insert(0, name);
         /*
         if (f instanceof Usage) {

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

@@ -34,6 +34,7 @@
 import org.omg.sysml.lang.sysml.Membership;
 import org.omg.sysml.lang.sysml.Multiplicity;
 import org.omg.sysml.lang.sysml.MultiplicityRange;
+import org.omg.sysml.lang.sysml.Redefinition;
 import org.omg.sysml.lang.sysml.Subsetting;
 import org.omg.sysml.lang.sysml.Type;
 import org.omg.sysml.lang.sysml.util.SysMLSwitch;
@@ -320,23 +321,71 @@ private void addMultiplicityString(StringBuilder ss, Element e) {
         }
     }
 
-    protected void addFeatureTypeText(String prefix, Feature f) {
-        List<FeatureTyping> ts = f.getOwnedTyping();
-        if (ts.isEmpty()) return;
+    protected static String getFeatureName(Feature f) {
+        return f.getEffectiveName();
+    }
+
+    protected static String getNameWithNamespace(Feature f) {
+        String name = getFeatureName(f);
+        if (name == null) return null;
+        org.omg.sysml.lang.sysml.Namespace pkg = f.getOwningNamespace();
+        if (pkg == null) {
+            return name;
+        } else {
+            return pkg.getName() + "::" + name;
+        }
+    }
+
+    protected static boolean appendSubsettingFeature(StringBuilder sb, String prefix, Feature f) {
+        List<Subsetting> ss = f.getOwnedSubsetting();
+        if (ss.isEmpty()) return false;
         boolean added = false;
-        for (FeatureTyping ft: ts) {
-            Type typ = ft.getType();
-            if (typ == null) continue;
-            String name = typ.getName();
+        for (Subsetting s: ss) {
+            if (s == null) continue;
+            if (s instanceof Redefinition) continue;
+            Feature sf = s.getSubsettedFeature();
+            if (sf == null) continue;
+            String name = getNameWithNamespace(sf);
             if (name == null) continue;
-            if (!added) {
-                append(prefix);
+            if (added) {
+                sb.append(", ");
+            } else {
+                sb.append(prefix);
                 added = true;
+            }
+            sb.append(name);
+        }
+        return added;
+    }
+
+    protected static boolean appendFeatureType(StringBuilder sb, String prefix, Feature f) {
+        List<FeatureTyping> tt = f.getOwnedTyping();
+        if (tt.isEmpty()) return false;
+        boolean added = false;
+        for (FeatureTyping ft: tt) {
+            if (ft == null) continue;
+            Type typ = ft.getType();
+            if (typ == null) continue;
+            String typeName = typ.getName();
+            if (typeName == null) continue;
+            if (added) {
+                sb.append(", ");
             } else {
-                append(", ");
+                sb.append(prefix);
+                added = true;
             }
-            append(name);
+            sb.append(typeName);
         }
+        return added;
+    }
+
+    protected void addFeatureTypeText(String prefix, Feature f) {
+        appendFeatureType(sb, prefix, f);
+    }
+
+    protected void addFeatureTypeAndSubsettedText(Feature f) {
+        appendFeatureType(sb, ": ", f);
+        appendSubsettingFeature(sb, ":> ", f);
     }
 
     private boolean outputPRelation(StringBuilder ss, PRelation pr) {