Merge branch 'release/2019-11'

Author: ivan-gomes

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

@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Set;
 
-public interface ActionUsage extends Usage, Step, MofObject {
+public interface ActionUsage extends Step, Usage, MofObject {
     Collection<? extends Behavior> getActivity();
 
     Definition getActionOwningDefinition();

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

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

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

@@ -0,0 +1,11 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface ConditionalImport extends Import, MofObject {
+    ImportCondition getCondition();
+
+    Predicate getSelector();
+}

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

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

app/org/omg/sysml/metamodel/OrderedFeature.java renamed to app/org/omg/sysml/metamodel/EndPortMembership.java

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface OrderedFeature extends StructuredFeature, MofObject {
+public interface EndPortMembership extends EndFeatureMembership, PortMembership, MofObject {
 
 }

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

@@ -25,15 +25,13 @@ public interface Feature extends Type, MofObject {
 
     Boolean getIsComposite();
 
-    FeatureValue getValuation();
-
-    Multiplicity getMultiplicity();
-
     Collection<? extends FeatureTyping> getTyping();
 
     Boolean getIsEnd();
 
     Type getEndOwningType();
 
+    Multiplicity getMultiplicity();
+
     Boolean getIsNonunique();
 }

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

@@ -4,8 +4,10 @@
 import java.util.List;
 import java.util.Set;
 
-public interface FeatureValue extends Relationship, MofObject {
-    Expression getValue();
-
+public interface FeatureValue extends FeatureMembership, MofObject {
     Feature getFeatureWithValue();
+
+    BindingConnector getValueConnector();
+
+    Expression getValue();
 }

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

@@ -7,8 +7,6 @@
 public interface Import extends Relationship, MofObject {
     Package getImportedPackage();
 
-    Predicate getSelecter();
-
     Package getImportOwningPackage();
 
     VisibilityKind getVisibility();

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

@@ -0,0 +1,11 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface ImportCondition extends Relationship, MofObject {
+    ConditionalImport getConditionalImport();
+
+    Predicate getPredicate();
+}

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

@@ -4,10 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface Multiplicity extends Relationship, MofObject {
-    Expression getLower();
+public interface Multiplicity extends Feature, MofObject {
 
-    Expression getUpper();
-
-    Feature getFeatureWithMultiplicity();
 }