* Visitor (getSpecialReference): Added, which relaces

  hasRefSubsettingWithoutDeclaredName()
  (addNameWithId): If it's a special reference, use the reference
  name.
  (getNameWithNamespace): Allow enclosingNs to be null.
* VStructure (hasRefSubsettingWithoutDeclaredName): Removed.
(extractTitleName): Use getSpecialReference() instead of
hasRefSubsettingWithoutDeclaredName().
(caseSatisfyRequirementUsage): Ditto.
* SysML2PlantUMLStyle.StyleStereotypeDefaultSwitch: Ditto.

Author: himi

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

@@ -538,7 +538,7 @@ public String caseClass(Class object) {
 
 		@Override
 		public String caseExhibitStateUsage(ExhibitStateUsage esu) {
-            if (VStructure.hasRefSubsettingWithoutDeclaredName(esu)) {
+            if (Visitor.getSpecialReference(esu) != null) {
                 return " exhibit>> ";
             } else {
                 return " exhibit state>> ";
@@ -547,12 +547,12 @@ public String caseExhibitStateUsage(ExhibitStateUsage esu) {
 
 		@Override
 		public String caseSatisfyRequirementUsage(SatisfyRequirementUsage sru) {
-            return "<<requirement>> ";
+			return " requirement>> ";
 		}
 
         @Override
         public String caseIncludeUseCaseUsage(IncludeUseCaseUsage iucu) {
-            if (VStructure.hasRefSubsettingWithoutDeclaredName(iucu)) {
+            if (Visitor.getSpecialReference(iucu) != null) {
                 return " include>> ";
             } else {
                 return " include use case>> ";
@@ -561,7 +561,7 @@ public String caseIncludeUseCaseUsage(IncludeUseCaseUsage iucu) {
 
 		@Override
 		public String casePerformActionUsage(PerformActionUsage pau) {
-            if (VStructure.hasRefSubsettingWithoutDeclaredName(pau)) {
+            if (Visitor.getSpecialReference(pau) != null) {
                 return " perform>> ";
             } else {
                 return " perform action>> ";
@@ -600,7 +600,7 @@ public String caseVerificationCaseDefinition(VerificationCaseDefinition acd) {
 
 		@Override
 		public String caseEventOccurrenceUsage(EventOccurrenceUsage eou) {
-            if (VStructure.hasRefSubsettingWithoutDeclaredName(eou)) {
+            if (Visitor.getSpecialReference(eou) != null) {
                 return " event>> ";
             } else {
                 return " event occurrence>> ";

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

@@ -229,13 +229,6 @@ private void insertActorLikeStyle(StringBuilder sb, Type typ) {
         }
     }
 
-    public static boolean hasRefSubsettingWithoutDeclaredName(Feature f) {
-        if (f.getOwnedReferenceSubsetting() == null) return false;
-        if (f.getDeclaredName() != null) return false;
-        if (f.getDeclaredShortName() != null) return false;
-        return true;
-    }
-
     protected String extractTitleName(Element e) {
         String name = getNameAnyway(e);
         StringBuilder sb = new StringBuilder();
@@ -254,7 +247,7 @@ protected String extractTitleName(Element e) {
             }
             sb.append(' ');
             added = appendSubsettings(sb, f) || added;
-            if (!hasRefSubsettingWithoutDeclaredName(f)) {
+            if (Visitor.getSpecialReference(f) == null) {
                 sb.append(' ');
                 added = appendReferenceSubsetting(sb, f) || added;
             }
@@ -323,7 +316,7 @@ public String caseSatisfyRequirementUsage(SatisfyRequirementUsage sru) {
         if ((ru != null) && (target != null)) {
             addPRelation(target, ru, sru, "<<satisfy>>");
         }
-        if (hasRefSubsettingWithoutDeclaredName(sru)) return "";
+        if (getSpecialReference(sru) != null) return "";
         return null;
     }
 

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

@@ -34,17 +34,22 @@
 
 import org.eclipse.emf.ecore.EObject;
 import org.omg.sysml.lang.sysml.Element;
+import org.omg.sysml.lang.sysml.EventOccurrenceUsage;
+import org.omg.sysml.lang.sysml.ExhibitStateUsage;
 import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.FeatureChaining;
 import org.omg.sysml.lang.sysml.FeatureMembership;
 import org.omg.sysml.lang.sysml.FeatureTyping;
+import org.omg.sysml.lang.sysml.IncludeUseCaseUsage;
 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.Namespace;
+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.SatisfyRequirementUsage;
 import org.omg.sysml.lang.sysml.Subsetting;
 import org.omg.sysml.lang.sysml.Type;
 import org.omg.sysml.lang.sysml.util.SysMLSwitch;
@@ -336,7 +341,28 @@ protected void cQuote(String s) {
         }
     }
 
+    /* Check if the feature comes from a special notation of
+     * <<perform>>, <<exhibit>>, <<event>>, <<include>>, and <<satisfy>> */
+    public static Feature getSpecialReference(Element e) {
+        if (!(e instanceof PerformActionUsage
+              || e instanceof ExhibitStateUsage
+              || e instanceof EventOccurrenceUsage
+              || e instanceof IncludeUseCaseUsage
+              || e instanceof SatisfyRequirementUsage)) return null;
+        Feature f = (Feature) e;
+        if (f.getDeclaredName() != null) return null;
+        if (f.getDeclaredShortName() != null) return null;
+        ReferenceSubsetting rs = f.getOwnedReferenceSubsetting();
+        if (rs == null) return null;
+        return rs.getReferencedFeature();
+    }
+
     protected int addNameWithId(Element e, String name, boolean force) {
+        Feature ref = getSpecialReference(e);
+        if (ref != null) {
+            String refName = getRefName(ref, null);
+            if (refName != null) name = refName;
+        }
         quote(name);
         append(" as ");
         int id = addIdStr(e, force);
@@ -539,6 +565,7 @@ protected static String getFeatureChainName(Feature f) {
     private static String getNameWithNamespace(Feature f, org.omg.sysml.lang.sysml.Namespace enclosingNs) {
         String name = getFeatureName(f);
         if (name == null) return null;
+        if (enclosingNs == null) return name;
 
         org.omg.sysml.lang.sysml.Namespace pkg = f.getOwningNamespace();
         if ((pkg == null) || pkg.equals(enclosingNs)) return name;