Merge branch 'release/2020-01'

Author: ivan-gomes

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

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

…sml/metamodel/ConditionalSuccession.java …g/sysml/metamodel/BooleanExpression.javaapp/org/omg/sysml/metamodel/ConditionalSuccession.java renamed to app/org/omg/sysml/metamodel/BooleanExpression.java app/org/omg/sysml/metamodel/ConditionalSuccession.java renamed to app/org/omg/sysml/metamodel/BooleanExpression.java

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface ConditionalSuccession extends Succession, MofObject {
-    Expression getGuard();
+public interface BooleanExpression extends Expression, MofObject {
+    Predicate getPredicate();
 }

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

@@ -5,7 +5,7 @@
 import java.util.Set;
 
 public interface ConjugatedPortTyping extends FeatureTyping, MofObject {
-    PortDefinition getOriginalPortDefinition();
+    PortDefinition getPortDefinition();
 
     ConjugatedPortDefinition getConjugatedPortDefinition();
 }

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

@@ -0,0 +1,9 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface ConstraintDefinition extends Definition, Predicate, MofObject {
+
+}

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

@@ -0,0 +1,13 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface ConstraintUsage extends Invariant, Usage, MofObject {
+    Predicate getConstraintDefinition();
+
+    Usage getConstraintOwningUsage();
+
+    Definition getConstraintOwningDefinition();
+}

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

@@ -18,4 +18,8 @@ public interface Definition extends Classifier, MofObject {
     Collection<? extends ActionUsage> getOwnedAction();
 
     Collection<? extends StateUsage> getOwnedState();
+
+    Collection<? extends ConstraintUsage> getOwnedConstraint();
+
+    Collection<? extends TransitionUsage> getOwnedTransition();
 }

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

@@ -31,7 +31,5 @@ public interface Feature extends Type, MofObject {
 
     Type getEndOwningType();
 
-    Multiplicity getMultiplicity();
-
     Boolean getIsNonunique();
 }

…/omg/sysml/metamodel/TransitionStep.java …p/org/omg/sysml/metamodel/Invariant.javaapp/org/omg/sysml/metamodel/TransitionStep.java renamed to app/org/omg/sysml/metamodel/Invariant.java app/org/omg/sysml/metamodel/TransitionStep.java renamed to app/org/omg/sysml/metamodel/Invariant.java

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface TransitionStep extends Step, MofObject {
+public interface Invariant extends BooleanExpression, MofObject {
 
 }

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

@@ -0,0 +1,9 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface TransitionUsage extends Step, Usage, MofObject {
+    Usage getTransitionOwningUsage();
+}

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

@@ -36,4 +36,6 @@ public interface Type extends Package, MofObject {
     List<? extends FeatureMembership> getFeatureMembership();
 
     Collection<? extends Feature> getInheritedFeature();
+
+    Multiplicity getMultiplicity();
 }