* VDefault (isEmptySubject): Moved from VCompartment.

(isEmptyObjective, isEmpty): Added
(addShorthandRelation): Use isEmpty().
* VCompartment (caseObjectiveMembership): Do not render empty objectives.
* VTree (caseObjectiveMembership): Likewise

Author: himi

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

@@ -67,7 +67,6 @@
 import org.omg.sysml.lang.sysml.SuccessionFlow;
 import org.omg.sysml.lang.sysml.TransitionUsage;
 import org.omg.sysml.lang.sysml.Type;
-import org.omg.sysml.lang.sysml.Usage;
 import org.omg.sysml.lang.sysml.VariantMembership;
 import org.omg.sysml.util.ConnectorUtil;
 import org.omg.sysml.util.TypeUtil;
@@ -312,7 +311,7 @@ public String caseVariantMembership(VariantMembership vm) {
 
     @Override
     public String caseObjectiveMembership(ObjectiveMembership om) {
-        //rec(om, om, true);
+        if (isEmptyObjective(om)) return "";
         recOrAddOwningMembership(om);
         return "";
     }
@@ -329,12 +328,6 @@ public String caseStakeholderMembership(StakeholderMembership sm) {
         return "";
     }
 
-    private boolean isEmptySubject(SubjectMembership sm) {
-        Usage u = sm.getOwnedSubjectParameter();
-        if (!"subj".equals(u.getName())) return false;
-        return u.getOwnedRelationship().isEmpty();
-    }
-
     @Override
     public String caseSubjectMembership(SubjectMembership sm) {
         if (isEmptySubject(sm)) return "";

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

@@ -54,12 +54,14 @@
 import org.omg.sysml.lang.sysml.Membership;
 import org.omg.sysml.lang.sysml.MetadataFeature;
 import org.omg.sysml.lang.sysml.Namespace;
+import org.omg.sysml.lang.sysml.ObjectiveMembership;
 import org.omg.sysml.lang.sysml.OwningMembership;
 import org.omg.sysml.lang.sysml.PerformActionUsage;
 import org.omg.sysml.lang.sysml.Redefinition;
 import org.omg.sysml.lang.sysml.ReferenceSubsetting;
 import org.omg.sysml.lang.sysml.Relationship;
 import org.omg.sysml.lang.sysml.Specialization;
+import org.omg.sysml.lang.sysml.SubjectMembership;
 import org.omg.sysml.lang.sysml.Subsetting;
 import org.omg.sysml.lang.sysml.Type;
 import org.omg.sysml.lang.sysml.Usage;
@@ -300,15 +302,42 @@ protected Relationship findBindingLikeRel(Feature f) {
         return ret;
     }
 
+    protected static boolean isEmptySubject(SubjectMembership sm) {
+        Usage u = sm.getOwnedSubjectParameter();
+        if (!"subj".equals(u.getName())) return false;
+        return u.getOwnedRelationship().isEmpty();
+    }
+
+    protected static boolean isEmptyObjective(ObjectiveMembership om) {
+        Usage u = om.getOwnedObjectiveRequirement();
+        if (!"obj".equals(u.getName())) return false;
+        return isEmpty(u);
+    }
+
+    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;
+                return false;
+            }
+            if (ms instanceof ObjectiveMembership) {
+                if (isEmptyObjective((ObjectiveMembership) ms)) continue;
+                return false;
+            }
+            return false;
+        }
+        return true;
+    }
+
     // Shorthand notation
     private boolean addShorthandRelation(Usage u, String title) {
         if (u.getDeclaredName() != null) return false;
         if (u.getDeclaredShortName() != null) return false;
         ReferenceSubsetting rs = u.getOwnedReferenceSubsetting();
         if (rs == null) return false;
 
-        List<Membership> mss = u.getOwnedMembership();
-        if (!mss.isEmpty()) return false;
+        if (!isEmpty(u)) return false;
 
         if (isReferred(u)) return false;
 

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

@@ -131,6 +131,7 @@ public String caseVariantMembership(VariantMembership vm) {
 
     @Override
     public String caseObjectiveMembership(ObjectiveMembership om) {
+        if (isEmptyObjective(om)) return "";
         RequirementUsage ru = om.getOwnedObjectiveRequirement();
         addRel(ru, om, "<<objective>>");
         addReq("comp usage ", ru);