Merge pull request #11 from ModelDriven/feature/ST5AS-31

ST5AS-31 Update to 2019-12 metamodel baseline

Author: ivan-gomes

app/org/omg/sysml/metamodel/ConjugatedEndPortMembership.java

@@ -0,0 +1,11 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface ConjugatedPortDefinition extends PortDefinition, MofObject {
+    PortDefinition getOriginalPortDefinition();
+
+    PortConjugation getOwnedPortConjugator();
+}

app/org/omg/sysml/metamodel/ConjugatedPortDefinition.java

@@ -0,0 +1,11 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface ConjugatedPortTyping extends FeatureTyping, MofObject {
+    PortDefinition getOriginalPortDefinition();
+
+    ConjugatedPortDefinition getConjugatedPortDefinition();
+}

app/org/omg/sysml/metamodel/ConjugatedPortTyping.java

@@ -0,0 +1,13 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface Conjugation extends Relationship, MofObject {
+    Type getOriginalType();
+
+    Type getConjugatedType();
+
+    Type getOwningType();
+}

app/org/omg/sysml/metamodel/Conjugation.java

@@ -16,4 +16,6 @@ public interface Definition extends Classifier, MofObject {
     Collection<? extends Property> getProperty();
 
     Collection<? extends ActionUsage> getOwnedAction();
+
+    Collection<? extends StateUsage> getOwnedState();
 }

app/org/omg/sysml/metamodel/Definition.java

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface EndPortMembership extends EndFeatureMembership, PortMembership, MofObject {
-
+public interface ExhibitStateUsage extends StateUsage, MofObject {
+    StateUsage getExhibitedState();
 }

…g/sysml/metamodel/EndPortMembership.java …g/sysml/metamodel/ExhibitStateUsage.javaapp/org/omg/sysml/metamodel/EndPortMembership.java renamed to app/org/omg/sysml/metamodel/ExhibitStateUsage.java app/org/omg/sysml/metamodel/EndPortMembership.java renamed to app/org/omg/sysml/metamodel/ExhibitStateUsage.java

@@ -0,0 +1,11 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface PortConjugation extends Conjugation, MofObject {
+    PortDefinition getOriginalPortDefinition();
+
+    ConjugatedPortDefinition getConjugatedPortDefinition();
+}

app/org/omg/sysml/metamodel/PortConjugation.java

@@ -5,5 +5,5 @@
 import java.util.Set;
 
 public interface PortDefinition extends Definition, MofObject {
-
+    ConjugatedPortDefinition getConjugatedPortDefinition();
 }

app/org/omg/sysml/metamodel/PortDefinition.java

@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Set;
 
-public interface PortUsage extends Usage, Feature, MofObject {
+public interface PortUsage extends Usage, MofObject {
     PortDefinition getPortDefinition();
 
     Definition getPortOwningDefinition();

app/org/omg/sysml/metamodel/PortUsage.java

@@ -0,0 +1,7 @@
+package org.omg.sysml.metamodel;
+
+public enum StateActionKind {
+    ENTRY,
+    DO,
+    EXIT
+}