ST6RI-854 Regenerated Java classes for metamodel (no impl changes).

Author: seidewitz

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/ConstructorExpression.java

@@ -22,7 +22,7 @@
  *             intersection(f2.ownedRedefinition.redefinedFeature)->
  *             intersection(features)->isEmpty()))
  * let features : OrderedSet(Feature) = instantiatedType.feature->
- *     select(visibility = VisibilityKind::public) in
+ *     select(owningMembership.visibility = VisibilityKind::public) in
  * result.ownedFeature->forAll(f | 
  *     f.ownedRedefinition.redefinedFeature->
  *         intersection(features)->size() = 1)

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/Feature.java

@@ -101,19 +101,24 @@
  *             redefinesFromLibrary('Transfers::Transfer::source::targetInput'))
  *                  
  * owningType <> null and
+ * not owningFeatureMembership.
+ *     oclIsKindOf(ReturnParameterMembership) and
  * (owningType.oclIsKindOf(Behavior) or
- *  owningType.oclIsKindOf(Step) and 
- *     not owningType.oclIsKindOf(InvocationExpression)) implies
- *     let i : Integer = 
+ *  owningType.oclIsKindOf(Step) and
+ *     (owningType.oclIsKindOf(InvocationExpression) implies
+ *       not ownedRedefinition->exists(not isImplied)) 
+ * implies
+ *     let i : Integer =
  *         owningType.ownedFeature->select(direction <> null)->
  *             reject(owningFeatureMembership.
- *                 oclIsKindOf(ReturnParameterMembership) in
+ *                 oclIsKindOf(ReturnParameterMembership))->
+ *             indexOf(self) in
  *     owningType.ownedSpecialization.general->
  *         forAll(supertype |
- *             let ownedParameters : Sequence(Feature) = 
+ *             let ownedParameters : Sequence(Feature) =
  *                 supertype.ownedFeature->select(direction <> null)->
  *                      reject(owningFeatureMembership.
- *                          oclIsKindOf(ReturnParameterMembership) in
+ *                          oclIsKindOf(ReturnParameterMembership)) in
  *             ownedParameters->size() >= i implies
  *                 redefines(ownedParameters->at(i))
  * ownedTyping.type->exists(selectByKind(Structure)) implies
@@ -221,15 +226,16 @@
  * The following features are supported:
  * </p>
  * <ul>
+ *   <li>{@link org.omg.sysml.lang.sysml.Feature#getOwningFeatureMembership <em>Owning Feature Membership</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#getOwningType <em>Owning Type</em>}</li>
+ *   <li>{@link org.omg.sysml.lang.sysml.Feature#getEndOwningType <em>End Owning Type</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#isUnique <em>Is Unique</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#isOrdered <em>Is Ordered</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#getType <em>Type</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#getOwnedRedefinition <em>Owned Redefinition</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#getOwnedSubsetting <em>Owned Subsetting</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#isComposite <em>Is Composite</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#isEnd <em>Is End</em>}</li>
- *   <li>{@link org.omg.sysml.lang.sysml.Feature#getEndOwningType <em>End Owning Type</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#getOwnedTyping <em>Owned Typing</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#getFeaturingType <em>Featuring Type</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#getOwnedTypeFeaturing <em>Owned Type Featuring</em>}</li>
@@ -245,7 +251,6 @@
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#getCrossFeature <em>Cross Feature</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#getDirection <em>Direction</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#getOwnedCrossSubsetting <em>Owned Cross Subsetting</em>}</li>
- *   <li>{@link org.omg.sysml.lang.sysml.Feature#getOwningFeatureMembership <em>Owning Feature Membership</em>}</li>
  *   <li>{@link org.omg.sysml.lang.sysml.Feature#isNonunique <em>Is Nonunique</em>}</li>
  * </ul>
  *

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/InstantiationExpression.java

@@ -91,7 +91,7 @@ public interface InstantiationExpression extends Expression {
 	 * <p>Return the <code>Type</code> to act as the <code>instantiatedType</code> for this <code>InstantiationExpression</code>. By default, this is the <code>memberElement</code> of the first <code>ownedMembership</code> that is not a <code>FeatureMembership</code>, which must be a <code>Type</code>.</p>
 	 * 
 	 * <p><b>Note.</b> This operation is overridden in the subclass <code>OperatorExpression</code>.</p>
-	 * let members : Sequence(Type) = ownedMembership->
+	 * let members : Sequence(Element) = ownedMembership->
 	 *     reject(oclIsKindOf(FeatureMembership)).memberElement in
 	 * if members->isEmpty() or not members->first().oclIsKindOf(Type) then null
 	 * else typeMembers->first().oclAsType(Type)

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/Redefinition.java

@@ -34,11 +34,19 @@
  * -- Including "Anything" accounts for implicit featuringType of Features
  * -- with no explicit featuringType.
  * let redefiningFeaturingTypes: Set(Type) =
- *     redefiningFeature.featuringTypes->asSet()->including(anythingType) in
+ *     if redefiningFeature.isVariable then Set{redefiningFeature.owningType}
+ *     else redefiningFeature.featuringTypes->asSet()->including(anythingType) 
+ *     endif in
  * let redefinedFeaturingTypes: Set(Type) =
- *     redefinedFeature.featuringTypes->asSet()->including(anythingType) in
+ *     if redefinedFeature.isVariable then Set{redefinedFeature.owningType}
+ *     else redefinedFeature.featuringTypes->asSet()->including(anythingType)
+ *     endif in
  * redefiningFeaturingTypes <> redefinedFeaturingType
- * featuringType->forAll(t |
+ * let featuringTypes : Sequence(Type) =
+ *     if redefiningFeature.isVariable then Sequence{redefiningFeature.owningType}
+ *     else redefiningFeature.featuringType
+ *     endif in
+ * featuringTypes->forAll(t |
  *     let direction : FeatureDirectionKind = t.directionOf(redefinedFeature) in
  *     ((direction = FeatureDirectionKind::_'in' or 
  *       direction = FeatureDirectionKind::out) implies

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/Subsetting.java

@@ -31,8 +31,9 @@
  * 
  * subsettingFeature.canAccess(subsettedFeature)
  * subsettedFeature.isUnique implies subsettingFeature.isUnique
- * subsettedFeature.isConstant implies subsettingFeature.isConstant
- * subsettedFeature.isPortion implies subsettingFeature.isPortion
+ * subsettedFeature.isConstant and subsettingFeature.isVariable implies 
+ *     subsettingFeature.isConstant
+ * 
  * <!-- end-model-doc -->
  *
  * <p>