* VStructure, VDefault: (caseSatisfyRequirementUsage): Refactored it

  by moving it from VDefault to VStructure.

Author: himi

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

@@ -61,6 +61,8 @@
 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.RequirementUsage;
+import org.omg.sysml.lang.sysml.SatisfyRequirementUsage;
 import org.omg.sysml.lang.sysml.Specialization;
 import org.omg.sysml.lang.sysml.SubjectMembership;
 import org.omg.sysml.lang.sysml.Subsetting;
@@ -339,7 +341,7 @@ private static boolean isEmpty(Feature f) {
     }
 
     // Shorthand notation
-    protected boolean addShorthandRelation(Usage u, String title) {
+    private boolean addShorthandRelation(Usage u, String title) {
         if (u.getDeclaredName() != null) return false;
         if (u.getDeclaredShortName() != null) return false;
         ReferenceSubsetting rs = u.getOwnedReferenceSubsetting();
@@ -398,6 +400,19 @@ public String caseAssertConstraintUsage(AssertConstraintUsage acu) {
         return null;
     }
 
+    @Override
+    public String caseSatisfyRequirementUsage(SatisfyRequirementUsage sru) {
+        RequirementUsage ru = sru.getSatisfiedRequirement();
+        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 "";
+        }
+        return null;
+    }
+
     @Override
     public String caseImport(Import imp) {
         VImport v = new VImport(this);

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

@@ -39,9 +39,7 @@
 import org.omg.sysml.lang.sysml.FeatureValue;
 import org.omg.sysml.lang.sysml.Membership;
 import org.omg.sysml.lang.sysml.Redefinition;
-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.StakeholderMembership;
 import org.omg.sysml.lang.sysml.Type;
 
@@ -309,19 +307,6 @@ public String casePackage(org.omg.sysml.lang.sysml.Package pkg) {
         return "";
     }
 
-    @Override
-    public String caseSatisfyRequirementUsage(SatisfyRequirementUsage sru) {
-        RequirementUsage ru = sru.getSatisfiedRequirement();
-        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 "";
-        }
-        return null;
-    }
-    
     @Override
     public String caseConjugatedPortDefinition(ConjugatedPortDefinition cpd) {
         // Do not show conjugated ports.