Merge pull request #41 from Systems-Modeling/feature/ST5AS-110

ST5AS-110 Update to 2021-01 metamodel baseline

Author: ivan-gomes

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

@@ -25,12 +25,12 @@
 import java.util.List;
 import java.util.Set;
 
-public interface Association extends Class, Relationship, MofObject {
+public interface Association extends Classifier, Relationship, MofObject {
     List<? extends Type> getRelatedType();
 
-    Collection<? extends Feature> getAssociationEnd();
-
     Type getSourceType();
 
     Collection<? extends Type> getTargetType();
+
+    Collection<? extends Feature> getAssociationEnd();
 }

…tamodel/MetadataReferenceExpression.java …ysml/metamodel/AssociationStructure.javaapp/org/omg/sysml/metamodel/MetadataReferenceExpression.java renamed to app/org/omg/sysml/metamodel/AssociationStructure.java app/org/omg/sysml/metamodel/MetadataReferenceExpression.java renamed to app/org/omg/sysml/metamodel/AssociationStructure.java

@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface MetadataReferenceExpression extends FeatureReferenceExpression, MetadataExpression, MofObject {
+public interface AssociationStructure extends Structure, Association, MofObject {
 
 }

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

@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Set;
 
-public interface Behavior extends Classifier, MofObject {
+public interface Behavior extends Class, MofObject {
     Collection<? extends Step> getStep();
 
     Collection<? extends Feature> getParameter();

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

@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface ConnectionDefinition extends Association, PartDefinition, MofObject {
+public interface ConnectionDefinition extends AssociationStructure, PartDefinition, MofObject {
     Collection<? extends Usage> getConnectionEnd();
 }

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

@@ -26,5 +26,5 @@
 import java.util.Set;
 
 public interface ConnectionUsage extends Connector, PartUsage, MofObject {
-    Collection<? extends Association> getConnectionDefinition();
+    Collection<? extends AssociationStructure> getConnectionDefinition();
 }

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

@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface MetadataCondition extends MetadataExpression, MofObject {
-    Feature getAnnotationParameter();
+public interface ElementFilterMembership extends Membership, MofObject {
+    Expression getCondition();
 }

…g/sysml/metamodel/MetadataCondition.java …l/metamodel/ElementFilterMembership.javaapp/org/omg/sysml/metamodel/MetadataCondition.java renamed to app/org/omg/sysml/metamodel/ElementFilterMembership.java app/org/omg/sysml/metamodel/MetadataCondition.java renamed to app/org/omg/sysml/metamodel/ElementFilterMembership.java

@@ -29,4 +29,6 @@ public interface Expression extends Step, MofObject {
     Function getFunction();
 
     Feature getResult();
+
+    Boolean getIsModelLevelEvaluable();
 }

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

@@ -25,6 +25,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface ItemDefinition extends Class, Definition, MofObject {
+public interface ItemDefinition extends Structure, Definition, MofObject {
 
 }

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

@@ -26,5 +26,5 @@
 import java.util.Set;
 
 public interface ItemUsage extends Usage, MofObject {
-    Collection<? extends Class> getItemDefinition();
+    Collection<? extends Structure> getItemDefinition();
 }