diff options
author | Kenn Hussey | 2012-10-10 20:44:01 +0000 |
---|---|---|
committer | Kenn Hussey | 2012-10-10 20:44:01 +0000 |
commit | 31be07dbb7cc7a62125f06818db0644ef807ec8e (patch) | |
tree | 9ea69989fb669f71df93044a6ac85857bc6ab6bd /plugins/org.eclipse.uml2.uml/model | |
parent | d8cf80e74520baea16cc2258ce01db12e40e9acb (diff) | |
download | org.eclipse.uml2-31be07dbb7cc7a62125f06818db0644ef807ec8e.tar.gz org.eclipse.uml2-31be07dbb7cc7a62125f06818db0644ef807ec8e.tar.xz org.eclipse.uml2-31be07dbb7cc7a62125f06818db0644ef807ec8e.zip |
[383550] Correcting derivation of Behavior::context.
Diffstat (limited to 'plugins/org.eclipse.uml2.uml/model')
-rw-r--r-- | plugins/org.eclipse.uml2.uml/model/UML.ecore | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.uml2.uml/model/UML.merged.uml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.uml2.uml/model/UML.ecore b/plugins/org.eclipse.uml2.uml/model/UML.ecore index 08d9fc5c6..51a1cadc6 100644 --- a/plugins/org.eclipse.uml2.uml/model/UML.ecore +++ b/plugins/org.eclipse.uml2.uml/model/UML.ecore @@ -4436,7 +4436,7 @@ eType="#//BehavioredClassifier" changeable="false" volatile="true" transient="true" derived="true"> <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel"> - <details key="documentation" value="The classifier that is the context for the execution of the behavior. If the behavior is owned by a BehavioredClassifier, that classifier is the context. Otherwise, the context is the first BehavioredClassifier reached by following the chain of owner relationships. For example, following this algorithm, the context of an entry action in a state machine is the classifier that owns the state machine. The features of the context classifier as well as the elements visible to the context classifier are visible to the behavior."/> + <details key="documentation" value="The classifier that is the context for the execution of the behavior. A Behavior that is directly owned as a nestedClassifier does not have a context. Otherwise, to determine the context of a Behavior, find the first BehavioredClassifier reached by following the chain of owner relationships from the Behavior, if any. If there is such a BehavioredClassifier, then it is the context, unless it is itself a Behavior with a non-empty context, in which case that is also the context for the original Behavior. For example, following this algorithm, the context of an entry action in a state machine is the classifier that owns the state machine. The features of the context classifier as well as the elements visible to the context classifier are visible to the behavior."/> </eAnnotations> <eAnnotations source="subsets" references="#//RedefinableElement/redefinitionContext"/> </eStructuralFeatures> diff --git a/plugins/org.eclipse.uml2.uml/model/UML.merged.uml b/plugins/org.eclipse.uml2.uml/model/UML.merged.uml index 9bfb811f9..5e0122597 100644 --- a/plugins/org.eclipse.uml2.uml/model/UML.merged.uml +++ b/plugins/org.eclipse.uml2.uml/model/UML.merged.uml @@ -3070,7 +3070,7 @@ endif <generalization xmi:id="_VWAJZhE9EeGOffqMW1YiZA" general="_00owUGvdEdq4DLWZOhbdEA"/> <ownedAttribute xmi:id="_VWAwcBE9EeGOffqMW1YiZA" name="context" visibility="public" type="_iY7sMGvsEdqG6fBIPwe-mw" isReadOnly="true" isDerived="true" subsettedProperty="_zYrE4La-EeCRxrN1JUGuxA" association="_VTIblBE9EeGOffqMW1YiZA"> <ownedComment xmi:id="_VWAwcRE9EeGOffqMW1YiZA" annotatedElement="_VWAwcBE9EeGOffqMW1YiZA"> - <body>The classifier that is the context for the execution of the behavior. If the behavior is owned by a BehavioredClassifier, that classifier is the context. Otherwise, the context is the first BehavioredClassifier reached by following the chain of owner relationships. For example, following this algorithm, the context of an entry action in a state machine is the classifier that owns the state machine. The features of the context classifier as well as the elements visible to the context classifier are visible to the behavior.</body> + <body>The classifier that is the context for the execution of the behavior. A Behavior that is directly owned as a nestedClassifier does not have a context. Otherwise, to determine the context of a Behavior, find the first BehavioredClassifier reached by following the chain of owner relationships from the Behavior, if any. If there is such a BehavioredClassifier, then it is the context, unless it is itself a Behavior with a non-empty context, in which case that is also the context for the original Behavior. For example, following this algorithm, the context of an entry action in a state machine is the classifier that owns the state machine. The features of the context classifier as well as the elements visible to the context classifier are visible to the behavior.</body> </ownedComment> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_VWAwchE9EeGOffqMW1YiZA"/> </ownedAttribute> |