Merge pull request #27 from ModelDriven/feature/ST5AS-67

ST5AS-67 Update to 2020-06 metamodel baseline

Author: ivan-gomes

app/org/omg/sysml/metamodel/Activity.java …mg/sysml/metamodel/ActionDefinition.javaapp/org/omg/sysml/metamodel/Activity.java renamed to app/org/omg/sysml/metamodel/ActionDefinition.java app/org/omg/sysml/metamodel/Activity.java renamed to app/org/omg/sysml/metamodel/ActionDefinition.java

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface Activity extends Behavior, Definition, MofObject {
+public interface ActionDefinition extends Behavior, Definition, MofObject {
     Collection<? extends ActionUsage> getAction();
 }

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

@@ -5,9 +5,5 @@
 import java.util.Set;
 
 public interface ActionUsage extends Step, Usage, MofObject {
-    Collection<? extends Behavior> getActivity();
-
-    Definition getActionOwningDefinition();
-
-    Usage getActionOwningUsage();
+    Collection<? extends Behavior> getActionDefinition();
 }

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

@@ -0,0 +1,11 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface AnalysisCaseDefinition extends CaseDefinition, MofObject {
+    Collection<? extends ActionUsage> getAnalysisAction();
+
+    Expression getResultExpression();
+}

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

@@ -0,0 +1,13 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface AnalysisCaseUsage extends CaseUsage, MofObject {
+    Collection<? extends ActionUsage> getAnalysisAction();
+
+    AnalysisCaseDefinition getAnalysisCaseDefinition();
+
+    Expression getResultExpression();
+}

…mg/sysml/metamodel/AssociationBlock.java …sysml/metamodel/AttributeDefinition.javaapp/org/omg/sysml/metamodel/AssociationBlock.java renamed to app/org/omg/sysml/metamodel/AttributeDefinition.java app/org/omg/sysml/metamodel/AssociationBlock.java renamed to app/org/omg/sysml/metamodel/AttributeDefinition.java

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface AssociationBlock extends Association, Block, MofObject {
+public interface AttributeDefinition extends DataType, Definition, MofObject {
 
 }

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

@@ -0,0 +1,9 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface AttributeUsage extends Usage, MofObject {
+    Collection<? extends DataType> getAttributeDefinition();
+}

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

@@ -0,0 +1,9 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface CalculationDefinition extends Function, ActionDefinition, MofObject {
+    Collection<? extends CalculationUsage> getCalculationUsage();
+}

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

@@ -0,0 +1,9 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface CalculationUsage extends Expression, ActionUsage, MofObject {
+    Function getCalculationDefinition();
+}

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

@@ -0,0 +1,11 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface CaseDefinition extends CalculationDefinition, MofObject {
+    RequirementUsage getObjectiveRequirement();
+
+    Parameter getSubjectParameter();
+}