* Visitor, SysML2PlantUMLStyle (isReferred): Added.

* VDefault (casePerformActionUsage, caseExhibitStateUsage,
  caseExhibitStateUsage, caseIncludeUseCaseUsage): Use shorthand
  notation if possible
* VStructure (caseSatisfyRequirementUsage): if
  hasRefSubsettingWithoutDeclaredName(), render a node for the
  SatisfyRequirementUsage.
* SysML2PlantUMLStyle (StyleRelDefaultSwitch): Added arrow styles for
  shorthand notations.

Author: himi

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

@@ -52,11 +52,11 @@
 import org.omg.sysml.lang.sysml.FeatureMembership;
 import org.omg.sysml.lang.sysml.FeatureTyping;
 import org.omg.sysml.lang.sysml.FeatureValue;
+import org.omg.sysml.lang.sysml.Flow;
 import org.omg.sysml.lang.sysml.FlowUsage;
 import org.omg.sysml.lang.sysml.Import;
 import org.omg.sysml.lang.sysml.IncludeUseCaseUsage;
 import org.omg.sysml.lang.sysml.ItemDefinition;
-import org.omg.sysml.lang.sysml.Flow;
 import org.omg.sysml.lang.sysml.ItemUsage;
 import org.omg.sysml.lang.sysml.Membership;
 import org.omg.sysml.lang.sysml.MetadataFeature;
@@ -506,6 +506,27 @@ public String caseObjectiveMembership(ObjectiveMembership vm) {
 		public String caseImport(Import imp) {
             return " ..> ";
 		}
+
+        @Override
+		public String casePerformActionUsage(PerformActionUsage pau) {
+            return " --> ";
+		}
+
+        @Override
+		public String caseExhibitStateUsage(ExhibitStateUsage esu) {
+            return " --> ";
+		}
+
+        @Override
+		public String caseEventOccurrenceUsage(EventOccurrenceUsage eou) {
+            return " --> ";
+		}
+
+        @Override
+		public String caseIncludeUseCaseUsage(IncludeUseCaseUsage iuc) {
+            return " --> ";
+		}
+
     }
 
     public static class StyleStereotypeDefaultSwitch extends StyleStereotypeSwitch {

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

@@ -27,8 +27,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -595,14 +597,31 @@ void popIdMap(boolean keep) {
         idMap = idMap.pop(keep);
     }
 
+    private Set<Element> assigned = new HashSet<Element>();
+
     Integer newId(Element e) {
-        return idMap.newId(e);
+        if (assigned.contains(e)) {
+            assigned.remove(e);
+            return idMap.getId(e);
+        } else {
+            return idMap.newId(e);
+        }
     }
 
     Integer getId(Element e) {
         return idMap.getId(e);
     }
 
+    private Integer assignId(Element e) {
+        assigned.add(e);
+        return idMap.getId(e);
+    }
+
+    boolean isReferred(Element e) {
+        int pid = assignId(e);
+        return null != vpath.getPaths(pid);
+    }
+
     private boolean inherited;
     void setInherited(boolean flag) {
         this.inherited = flag;

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

@@ -38,21 +38,26 @@
 import org.omg.sysml.lang.sysml.Connector;
 import org.omg.sysml.lang.sysml.Dependency;
 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.Expression;
 import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.FeatureChainExpression;
 import org.omg.sysml.lang.sysml.FeatureMembership;
 import org.omg.sysml.lang.sysml.FeatureReferenceExpression;
 import org.omg.sysml.lang.sysml.FeatureTyping;
 import org.omg.sysml.lang.sysml.FeatureValue;
+import org.omg.sysml.lang.sysml.Flow;
 import org.omg.sysml.lang.sysml.FlowUsage;
 import org.omg.sysml.lang.sysml.Import;
-import org.omg.sysml.lang.sysml.Flow;
+import org.omg.sysml.lang.sysml.IncludeUseCaseUsage;
 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.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.Subsetting;
@@ -295,6 +300,51 @@ protected Relationship findBindingLikeRel(Feature f) {
         return ret;
     }
 
+    // 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 (isReferred(u)) return false;
+
+        Element owner = u.getOwner();
+        if (!(owner instanceof Type)) return false;
+        if (!checkId(owner)) return false;
+
+        addPRelation(owner, rs.getReferencedFeature(), u, title);
+
+        return true;
+    }
+
+    @Override
+    public String casePerformActionUsage(PerformActionUsage pau) {
+        if (addShorthandRelation(pau, "<<perform>>")) return "";
+        return null;
+    }
+
+    @Override
+    public String caseExhibitStateUsage(ExhibitStateUsage esu) {
+        if (addShorthandRelation(esu, "<<exhibit>>")) return "";
+        return null;
+    }
+
+    @Override
+    public String caseEventOccurrenceUsage(EventOccurrenceUsage eou) {
+        if (addShorthandRelation(eou, "<<event>>")) return "";
+        return null;
+    }
+
+    @Override
+    public String caseIncludeUseCaseUsage(IncludeUseCaseUsage iuc) {
+        if (addShorthandRelation(iuc, "<<include>>")) 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

@@ -323,7 +323,8 @@ public String caseSatisfyRequirementUsage(SatisfyRequirementUsage sru) {
         if ((ru != null) && (target != null)) {
             addPRelation(target, ru, sru, "<<satisfy>>");
         }
-        return "";
+        if (hasRefSubsettingWithoutDeclaredName(sru)) return "";
+        return null;
     }
 
     @Override

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

@@ -199,6 +199,10 @@ protected boolean checkId(Element e) {
         return s2p.checkId(e);
     }
 
+    protected boolean isReferred(Element e) {
+        return s2p.isReferred(e);
+    }
+
     protected void pushIdMap() {
         s2p.pushIdMap();
     }