diff options
| author | Kenn Hussey | 2016-04-13 14:37:35 +0000 |
|---|---|---|
| committer | Kenn Hussey | 2016-04-13 14:37:35 +0000 |
| commit | 6b0ef83c93efc436161a839d198134a6e1960365 (patch) | |
| tree | 2aa4546d628b40e4d90c8b10fea31f1613bec1f5 | |
| parent | c61a9e95cd73a120a076ddcc94984e470b17e54d (diff) | |
| download | org.eclipse.uml2-6b0ef83c93efc436161a839d198134a6e1960365.tar.gz org.eclipse.uml2-6b0ef83c93efc436161a839d198134a6e1960365.tar.xz org.eclipse.uml2-6b0ef83c93efc436161a839d198134a6e1960365.zip | |
[491587] Making spurious ternary association binary.
| -rw-r--r-- | plugins/org.eclipse.uml2.uml.resources/metamodels/UML.metamodel.uml | 4 | ||||
| -rw-r--r-- | plugins/org.eclipse.uml2.uml/model/UML.merged.uml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.uml2.uml.resources/metamodels/UML.metamodel.uml b/plugins/org.eclipse.uml2.uml.resources/metamodels/UML.metamodel.uml index 94d52e8b3..9842a9240 100644 --- a/plugins/org.eclipse.uml2.uml.resources/metamodels/UML.metamodel.uml +++ b/plugins/org.eclipse.uml2.uml.resources/metamodels/UML.metamodel.uml @@ -2886,7 +2886,7 @@ _'context'.conformsTo(structuralFeature.oclAsType(Property).opposite.type.oclAsT <generalization xmi:id="StructuredActivityNode-_generalization.0" general="Namespace"/> <generalization xmi:id="StructuredActivityNode-_generalization.1" general="ActivityGroup"/> <generalization xmi:id="StructuredActivityNode-_generalization.2" general="Action"/> - <ownedAttribute xmi:id="StructuredActivityNode-activity" name="activity" visibility="protected" type="Activity" isDerived="true" redefinedProperty="ActivityGroup-inActivity ActivityNode-activity" association="A_structuredNode_activity"> + <ownedAttribute xmi:id="StructuredActivityNode-activity" name="activity" visibility="protected" type="Activity" isDerived="true" redefinedProperty="ActivityGroup-inActivity ActivityNode-activity"> <ownedComment xmi:id="StructuredActivityNode-activity-_ownedComment.0" annotatedElement="StructuredActivityNode-activity"> <body>The Activity immediately containing the StructuredActivityNode, if it is not contained in another StructuredActivityNode.</body> </ownedComment> @@ -4969,7 +4969,7 @@ endif)</body> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="A_guard_activityEdge-activityEdge-_lowerValue"/> </ownedEnd> </packagedElement> - <packagedElement xmi:type="uml:Association" xmi:id="A_structuredNode_activity" name="A_structuredNode_activity" visibility="private" memberEnd="Activity-structuredNode StructuredActivityNode-activity A_structuredNode_activity-activity"> + <packagedElement xmi:type="uml:Association" xmi:id="A_structuredNode_activity" name="A_structuredNode_activity" visibility="private" memberEnd="Activity-structuredNode A_structuredNode_activity-activity"> <ownedEnd xmi:id="A_structuredNode_activity-activity" name="activity" visibility="private" type="Activity" association="A_structuredNode_activity"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="A_structuredNode_activity-activity-_lowerValue"/> </ownedEnd> diff --git a/plugins/org.eclipse.uml2.uml/model/UML.merged.uml b/plugins/org.eclipse.uml2.uml/model/UML.merged.uml index 7e975fde8..c27829eeb 100644 --- a/plugins/org.eclipse.uml2.uml/model/UML.merged.uml +++ b/plugins/org.eclipse.uml2.uml/model/UML.merged.uml @@ -2886,7 +2886,7 @@ _'context'.conformsTo(structuralFeature.oclAsType(Property).opposite.type.oclAsT <generalization xmi:id="_MKrOdokxEeOMQ5AKLd10lA" general="_ZiwkoGwLEdq7X4sGURiZYA"/> <generalization xmi:id="_MKrOd4kxEeOMQ5AKLd10lA" general="_aZICgAs-EeGcpbeCPJfCmw"/> <generalization xmi:id="_MKr1gIkxEeOMQ5AKLd10lA" general="_6WKakLLQEeCsYvaJqFFivQ"/> - <ownedAttribute xmi:id="_gnnw0AtZEeGV4NAcunjVqQ" name="activity" visibility="protected" type="_eGtFwLLREeCsYvaJqFFivQ" isDerived="true" redefinedProperty="_5V2SAAtBEeGcpbeCPJfCmw _X0ZfIAtCEeGcpbeCPJfCmw" association="_w4820AtEEeGcpbeCPJfCmw"> + <ownedAttribute xmi:id="_gnnw0AtZEeGV4NAcunjVqQ" name="activity" visibility="protected" type="_eGtFwLLREeCsYvaJqFFivQ" isDerived="true" redefinedProperty="_5V2SAAtBEeGcpbeCPJfCmw _X0ZfIAtCEeGcpbeCPJfCmw"> <ownedComment xmi:id="_MKr1gYkxEeOMQ5AKLd10lA" annotatedElement="_gnnw0AtZEeGV4NAcunjVqQ"> <body>The Activity immediately containing the StructuredActivityNode, if it is not contained in another StructuredActivityNode.</body> </ownedComment> @@ -4969,7 +4969,7 @@ endif)</body> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ML1FAokxEeOMQ5AKLd10lA"/> </ownedEnd> </packagedElement> - <packagedElement xmi:type="uml:Association" xmi:id="_w4820AtEEeGcpbeCPJfCmw" name="A_structuredNode_activity" memberEnd="_EOSYAAs-EeGcpbeCPJfCmw _gnnw0AtZEeGV4NAcunjVqQ _bQeSgAtEEeGcpbeCPJfCmw"> + <packagedElement xmi:type="uml:Association" xmi:id="_w4820AtEEeGcpbeCPJfCmw" name="A_structuredNode_activity" memberEnd="_EOSYAAs-EeGcpbeCPJfCmw _bQeSgAtEEeGcpbeCPJfCmw"> <ownedEnd xmi:id="_bQeSgAtEEeGcpbeCPJfCmw" name="activity" visibility="private" type="_eGtFwLLREeCsYvaJqFFivQ" association="_w4820AtEEeGcpbeCPJfCmw"> <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cva8wAtEEeGcpbeCPJfCmw"/> </ownedEnd> |