Merge pull request #760 from Systems-Modeling/ST6RI-934-1

ST6RI-934 Abstract syntax metamodel for KerML 1.1/SysML 2.1 Beta 1 (revised)

Author: seidewitz

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/AcceptActionUsage.java

@@ -11,7 +11,7 @@
  * <!-- begin-model-doc -->
  * <p>An <code>AcceptActionUsage</code> is an <code>ActionUsage</code> that specifies the acceptance of an <em><code>incomingTransfer</code></em> from the <code><em>Occurrence</em></code> given by the result of its <code>receiverArgument</code> Expression. (If no <code>receiverArgument</code> is provided, the default is the <em><code>this</code></em> context of the AcceptActionUsage.) The payload of the accepted <em><code>Transfer</em></code> is output on its <code>payloadParameter</code>. Which <em><code>Transfers</em></code> may be accepted is determined by conformance to the typing and (potentially) binding of the <code>payloadParameter</code>.</p>
  * 
- * inputParameters()->size() >= 2
+ * inputParameters()->notEmpty()
  * receiverArgument = argument(2)
  * payloadArgument = argument(1)
  * payloadParameter = 

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/AssertConstraintUsage.java

@@ -21,7 +21,7 @@
  * else
  *     specializesFromLibrary('Constraints::assertedConstraintChecks')
  * endif
- * referencedFeaureTarget() <> null implies
+ * referencedFeatureTarget() <> null implies
  *     referencedFeatureTarget().oclIsKindOf(ConstraintUsage)
  * <!-- end-model-doc -->
  *

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/AssignmentActionUsage.java

@@ -16,33 +16,35 @@
  * targetParameter <> null and
  * targetParameter.ownedFeature->notEmpty() and
  * targetParameter.ownedFeature->first().
- *     redefines('AssignmentAction::target::startingAt')
+ *     redefinesFromLibrary('AssignmentAction::target::startingAt')
  * valueExpression = argument(2)
  * targetArgument = argument(1)
  * isSubactionUsage() implies
  *     specializesFromLibrary('Actions::Action::assignments')
  * let targetParameter : Feature = inputParameter(1) in
  * targetParameter <> null and
  * targetParameter.ownedFeature->notEmpty() and
- * targetParameter->first().ownedFeature->notEmpty() and
- * targetParameter->first().ownedFeature->first().
- *     redefines('AssigmentAction::target::startingAt::accessedFeature')
+ * targetParameter.ownedFeature->first().ownedFeature->notEmpty() and
+ * targetParameter.ownedFeature->first().ownedFeature->first().
+ *     redefinesFromLibrary('AssigmentAction::target::startingAt::accessedFeature')
  * let targetParameter : Feature = inputParameter(1) in
  * targetParameter <> null and
  * targetParameter.ownedFeature->notEmpty() and
- * targetParameter->first().ownedFeature->notEmpty() and
- * targetParameter->first().ownedFeature->first().redefines(referent)
+ * targetParameter.ownedFeature->first().ownedFeature->notEmpty() and
+ * targetParameter.ownedFeature->first().ownedFeature->first().redefines(referent)
  * referent =
  *     let unownedFeatures : Sequence(Feature) = ownedMembership->
  *         reject(oclIsKindOf(FeatureMembership)).memberElement->
- *         selectByKind(Feature) in
+ *         select(oclIsKindOf(Feature) and 
+ *                not oclIsKindOf(MetadataFeature)) in
  *     if unownedFeatures->isEmpty() then null
  *     else unownedFeatures->first().oclAsType(Feature)
  *     endif
  * ownedMembership->exists(
  *     not oclIsKindOf(OwningMembership) and 
- *     memberElement.oclIsKindOf(Feature))
- * referent <> null implies referent.featureTarget.mayTimeVary
+ *     memberElement.oclIsKindOf(Feature) and
+ *     not memberElement.oclIsKindOf(MetadataFeature))
+ * referent <> null implies referent.featureTarget.isVariable
  * <!-- end-model-doc -->
  *
  * <p>

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/ConnectionDefinition.java

@@ -13,7 +13,7 @@
  * <p>A <code>ConnectionDefinition</code> is a <code>PartDefinition</code> that is also an <code>AssociationStructure</code>. The end <code>Features</code> of a <code>ConnectionDefinition</code> must be <code>Usages</code>.</p>
  * specializesFromLibrary('Connections::Connection')
  * ownedEndFeature->size() = 2 implies
- *     specializesFromLibrary('Connections::BinaryConnections')
+ *     specializesFromLibrary('Connections::BinaryConnection')
  * isSufficient
  * <!-- end-model-doc -->
  *

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/ConnectorAsUsage.java

@@ -9,7 +9,7 @@
  * <!-- end-user-doc -->
  *
  * <!-- begin-model-doc -->
- * <p>A <code>ConnectorAsUsage</code> is both a <code>Connector</code> and a <code>Usage</code>. <code>ConnectorAsUsage</code> cannot itself be instantiated in a SysML model, but it is a base class for the concrete classes <code>BindingConnectorAsUsage</code>, <code>SuccessionAsUsage</code>, <code>ConnectionUsage</code> and <code>FlowConnectionUsage</code>.</p>
+ * <p>A <code>ConnectorAsUsage</code> is both a <code>Connector</code> and a <code>Usage</code>. <code>ConnectorAsUsage</code> cannot itself be instantiated in a SysML model, but it is a base class for the concrete classes <code>BindingConnectorAsUsage</code>, <code>SuccessionAsUsage</code>, <code>ConnectionUsage</code> and <code>FlowUsage</code>.</p>
  * <!-- end-model-doc -->
  *
  *

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/ConstraintUsage.java

@@ -10,6 +10,7 @@
  *
  * <!-- begin-model-doc -->
  * <p>A <code>ConstraintUsage</code> is an <code>OccurrenceUsage</code> that is also a <code>BooleanExpression</code>, and, so, is typed by a <code>Predicate</code>. Nominally, if the type is a <code>ConstraintDefinition</code>, a <code>ConstraintUsage</code> is a <code>Usage</code> of that <code>ConstraintDefinition</code>. However, other kinds of kernel <code>Predicates</code> are also allowed, to permit use of <code>Predicates</code> from the Kernel Model Libraries.</p>
+ * isComposite and
  * owningFeatureMembership <> null and
  * owningFeatureMembership.oclIsKindOf(RequirementConstraintMembership) implies
  *     if owningFeatureMembership.oclAsType(RequirementConstraintMembership).kind = 

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/DecisionNode.java

@@ -18,7 +18,7 @@
  * specializesFromLibrary('Actions::Action::decisions')
  * sourceConnector->selectByKind(Succession)->
  *     forAll(subsetsChain(self, 
- *         resolveGlobal('ControlPerformances::MergePerformance::outgoingHBLink')))
+ *         resolveGlobal('ControlPerformances::DecisionPerformance::outgoingHBLink')))
  * <!-- end-model-doc -->
  *
  *

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/Definition.java

@@ -34,7 +34,7 @@
  * ownedPart = ownedUsage->selectByKind(PartUsage)
  * ownedPort = ownedUsage->selectByKind(PortUsage)
  * ownedConnection = ownedUsage->selectByKind(ConnectorAsUsage)
- * ownedFlow = ownedUsage->selectByKind(FlowConnectionUsage)
+ * ownedFlow = ownedUsage->selectByKind(FlowUsage)
  * ownedInterface = ownedUsage->selectByKind(ReferenceUsage)
  * ownedAllocation = ownedUsage->selectByKind(AllocationUsage)
  * ownedAction = ownedUsage->selectByKind(ActionUsage)
@@ -51,7 +51,7 @@
  * ownedView = ownedUsage->selectByKind(ViewUsage)
  * ownedViewpoint = ownedUsage->selectByKind(ViewpointUsage)
  * ownedRendering = ownedUsage->selectByKind(RenderingUsage)
- * ownedMetadata = ownedUsage->selectByKind(MetadataUsage)
+ * ownedMetadata = ownedMember->selectByKind(MetadataUsage)
  * isVariation implies isAbstract
  * <!-- end-model-doc -->
  *
@@ -834,7 +834,7 @@ public interface Definition extends Classifier {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * <p>The <code>MetadataUsages</code> that are <code>ownedUsages</code> of this <code>Definition</code>.</p>
+	 * <p>The <code>MetadataUsages</code> that are <code>ownedMembers</code> of this <code>Definition</code>.</p>
 	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Owned Metadata</em>' reference list.
 	 * @see org.omg.sysml.lang.sysml.SysMLPackage#getDefinition_OwnedMetadata()

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/Feature.java

@@ -78,31 +78,33 @@
  *         (i = 1 implies 
  *             redefinesFromLibrary('Transfers::Transfer::source::sourceOutput')) and
  *         (i = 2 implies
- *             redefinesFromLibrary('Transfers::Transfer::source::targetInput'))
+ *             redefinesFromLibrary('Transfers::Transfer::target::targetInput'))
  *                  
  * owningType <> null and
- * not owningFeatureMembership.
- *     oclIsKindOf(ReturnParameterMembership) and
  * (owningType.oclIsKindOf(Behavior) or
  *  owningType.oclIsKindOf(Step) and
  *     (owningType.oclIsKindOf(InvocationExpression) implies
- *       not ownedRedefinition->exists(not isImplied)) 
+ *         not ownedRedefinition->exists(not isImplied)))
  * implies
- *     let i : Integer =
+ *     let ownerParameters : Sequence(Feature) =
  *         owningType.ownedFeature->select(direction <> null)->
  *             reject(owningFeatureMembership.
- *                 oclIsKindOf(ReturnParameterMembership))->
- *             indexOf(self) in
- *     owningType.ownedSpecialization.general->
- *         forAll(supertype |
- *             let ownedParameters : Sequence(Feature) =
- *                 supertype.ownedFeature->select(direction <> null)->
- *                      reject(owningFeatureMembership.
- *                          oclIsKindOf(ReturnParameterMembership)) in
- *             ownedParameters->size() >= i implies
- *                 redefines(ownedParameters->at(i))
+ *                 oclIsKindOf(ReturnParameterMembership)) in
+ *     ownerParameters->includes(self) implies
+ *         let i : Integer = ownerParameters.indexof(self) in
+ *         owningType.ownedSpecialization.general->
+ *             forAll(supertype |
+ *                 supertype.oclIsKindOf(Behavior) or 
+ *                     supertype.oclIsKindOf(Step) 
+ *                 implies
+ *                     let ownedParameters : Sequence(Feature) =
+ *                         supertype.ownedFeature->select(direction <> null)->
+ *                             reject(owningFeatureMembership.
+ *                                 oclIsKindOf(ReturnParameterMembership)) in
+ *                     ownedParameters->size() >= i implies
+ *                         redefines(ownedParameters->at(i)))
  * ownedTyping.type->exists(selectByKind(Structure)) implies
- *     specializesFromLibary('Objects::objects')
+ *     specializesFromLibrary('Objects::objects')
  * owningType <> null and
  * (owningType.oclIsKindOf(Function) and
  *     self = owningType.oclAsType(Function).result or
@@ -121,7 +123,7 @@
  *     select(fi | fi.featureInverted = self)
  * featuringType =
  *     let featuringTypes : OrderedSet(Type) = 
- *         featuring.type->asOrderedSet() in
+ *         typeFeaturing.type->asOrderedSet() in
  *     if chainingFeature->isEmpty() then featuringTypes
  *     else
  *         featuringTypes->

org.omg.sysml.model/src/main/java/org/omg/sysml/lang/sysml/FeatureChainExpression.java

@@ -10,10 +10,10 @@
  *
  * <!-- begin-model-doc -->
  * <p>A <code>FeatureChainExpression</code> is an <code>OperatorExpression</code> whose operator is <code>"."</code>, which resolves to the <code>Function</code> <em><code>ControlFunctions::'.'</code></em> from the Kernel Functions Library. It evaluates to the result of chaining the <code>result</code> <code>Feature</code> of its single <code>argument</code> <code>Expression</code> with its <code>targetFeature</code>.</p>
- * let sourceParameter : Feature = sourceTargetFeature() in
+ * let sourceTargetFeature : Feature = sourceTargetFeature() in
  * sourceTargetFeature <> null and
  * sourceTargetFeature.redefinesFromLibrary('ControlFunctions::\'.\'::source::target')
- * let sourceParameter : Feature = sourceTargetFeature() in
+ * let sourceTargetFeature : Feature = sourceTargetFeature() in
  * sourceTargetFeature <> null and
  * sourceTargetFeature.redefines(targetFeature)
  * targetFeature =