* SysML2PlantUMLText, Visitor (toBeRendered): Added

* VDefault (isEmpty): Check Specialization except for
  ReferenceSubsetting
  (addShorthandRelation): Use toBeRendered() to check if the target is rendered.

Author: himi

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

@@ -474,6 +474,17 @@ private void addStyleHeader(StringBuilder sb) {
         sb.append('\n');
     }
 
+    private List<Element> topElements;
+
+    /* package */ boolean toBeRendered(EObject eObj) {
+        while (eObj != null) {
+            if (!(eObj instanceof Element)) return false;
+            if (topElements.contains((Element) eObj)) return true;
+            eObj = eObj.eContainer();
+        }
+        return false;
+    }
+
     public String sysML2PUML(List<? extends EObject> eObjs) {
         initStyle();
         this.vpath = new VPath();
@@ -487,9 +498,11 @@ public String sysML2PUML(List<? extends EObject> eObjs) {
         init();
 
         numVisits = 0;
+        this.topElements = new ArrayList<>(eObjs.size());
         for (EObject eObj : eObjs) {
             if (eObj instanceof Element) {
                 Element e = (Element) eObj;
+                topElements.add(e);
                 vpath.visit(e);
             }
         }

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

@@ -65,6 +65,7 @@
 import org.omg.sysml.lang.sysml.Subsetting;
 import org.omg.sysml.lang.sysml.Type;
 import org.omg.sysml.lang.sysml.Usage;
+import org.omg.sysml.util.FeatureUtil;
 
 public class VDefault extends VTraverser {
     protected void addConnector(Element rel, Connector c, String desc) {
@@ -317,14 +318,18 @@ protected static boolean isEmptyObjective(ObjectiveMembership om) {
     }
 
     private static boolean isEmpty(Feature f) {
-        for (Membership ms: toOwnedMembershipArray(f)) {
-            if (!(ms instanceof OwningMembership)) continue;
-            if (ms instanceof SubjectMembership) {
-                if (isEmptySubject((SubjectMembership) ms)) continue;
+        for (Relationship rel: toOwnedRelationshipArray(f)) {
+        	if (rel instanceof Specialization) {
+        		if (rel instanceof ReferenceSubsetting) continue;
+        		return false;
+        	}
+            if (!(rel instanceof OwningMembership)) continue;
+            if (rel instanceof SubjectMembership) {
+                if (isEmptySubject((SubjectMembership) rel)) continue;
                 return false;
             }
-            if (ms instanceof ObjectiveMembership) {
-                if (isEmptyObjective((ObjectiveMembership) ms)) continue;
+            if (rel instanceof ObjectiveMembership) {
+                if (isEmptyObjective((ObjectiveMembership) rel)) continue;
                 return false;
             }
             return false;
@@ -338,8 +343,10 @@ private boolean addShorthandRelation(Usage u, String title) {
         if (u.getDeclaredShortName() != null) return false;
         ReferenceSubsetting rs = u.getOwnedReferenceSubsetting();
         if (rs == null) return false;
-        Feature tgt = rs.getReferencedFeature();
-        if (!checkId(tgt)) return false; // If the target does not exist, we render a distinct node.
+        Feature ref = rs.getReferencedFeature();
+        Feature tgt = FeatureUtil.getFirstChainingFeatureOf(ref);
+        if (tgt == null) tgt = ref;
+        if (!toBeRendered(tgt)) return false; // If the target is not rendered, we render a distinct node.
 
         if (!isEmpty(u)) return false;
 
@@ -349,7 +356,7 @@ private boolean addShorthandRelation(Usage u, String title) {
         if (!(owner instanceof Type)) return false;
         if (!checkId(owner)) return false;
 
-        addPRelation(owner, tgt, u, title);
+        addPRelation(owner, ref, u, title);
 
         return true;
     }

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

@@ -627,6 +627,10 @@ private boolean exists(Element e) {
         return checkId(e);
     }
 
+    protected boolean toBeRendered(Element e) {
+        return s2p.toBeRendered(e);
+    }
+
     private void renderImportedPackage(org.omg.sysml.lang.sysml.Package pkg, Collection<Element> nonPkgs) {
         String name = pkg.getQualifiedName();
         if (name == null) return;