* SysML2PlantUMLStyle (StyleStereotypeDefaultSwitch): Bug fix.

  caseSatisfyRequirementUsage() must return " satisfy>>" instead of "
  requirement>>"
* VCompartment (caseSatisfyRequirementUsage): Must process it because
  VStructure specially handle it.
* VStructure (caseSatisfyRequirementUsage): Also allow shorthand relation.

Author: himi

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

@@ -548,7 +548,7 @@ public String caseExhibitStateUsage(ExhibitStateUsage esu) {
 		@Override
 		public String caseSatisfyRequirementUsage(SatisfyRequirementUsage sru) {
             if (Visitor.getSpecialReference(sru) != null) {
-                return " requirement>> ";
+                return " satisfy>> ";
             } else {
                 return " satisfy requirement>> ";
             }

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

@@ -59,6 +59,7 @@
 import org.omg.sysml.lang.sysml.ReferenceUsage;
 import org.omg.sysml.lang.sysml.RequirementUsage;
 import org.omg.sysml.lang.sysml.ReturnParameterMembership;
+import org.omg.sysml.lang.sysml.SatisfyRequirementUsage;
 import org.omg.sysml.lang.sysml.StakeholderMembership;
 import org.omg.sysml.lang.sysml.StateDefinition;
 import org.omg.sysml.lang.sysml.StateUsage;
@@ -254,6 +255,11 @@ public String caseReferenceUsage(ReferenceUsage ru) {
     	return null;
     }
 
+    @Override
+    public String caseSatisfyRequirementUsage(SatisfyRequirementUsage sru) {
+        return recCurrent(sru, true);
+    }
+
     @Override
     public String caseRequirementUsage(RequirementUsage ru) {
         return recCurrent(ru, true);

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

@@ -338,7 +338,7 @@ private static boolean isEmpty(Feature f) {
     }
 
     // Shorthand notation
-    private boolean addShorthandRelation(Usage u, String title) {
+    protected boolean addShorthandRelation(Usage u, String title) {
         if (u.getDeclaredName() != null) return false;
         if (u.getDeclaredShortName() != null) return false;
         ReferenceSubsetting rs = u.getOwnedReferenceSubsetting();

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

@@ -315,8 +315,10 @@ public String caseSatisfyRequirementUsage(SatisfyRequirementUsage sru) {
         Feature target = sru.getSatisfyingFeature();
         if ((ru != null) && (target != null)) {
             addPRelation(target, ru, sru, "<<satisfy>>");
+            if (getSpecialReference(sru) != null) return "";
+        } else {
+            if (addShorthandRelation(sru, "<<satisfy>>")) return "";
         }
-        if (getSpecialReference(sru) != null) return "";
         return null;
     }