diff options
| author | Nicolas FAUVERGUE | 2018-11-07 10:29:26 +0000 |
|---|---|---|
| committer | Patrick Tessier | 2018-11-09 17:11:07 +0000 |
| commit | 2d38e814846af71469560d5081d66876c4db5cc9 (patch) | |
| tree | fe88cb1675f7485bb5a6290c0fca2446dc8eb491 /plugins/uml | |
| parent | 0a3c8fb55a04bc05c50f68d1262b2328b7b11651 (diff) | |
| download | org.eclipse.papyrus-2d38e814846af71469560d5081d66876c4db5cc9.tar.gz org.eclipse.papyrus-2d38e814846af71469560d5081d66876c4db5cc9.tar.xz org.eclipse.papyrus-2d38e814846af71469560d5081d66876c4db5cc9.zip | |
Bug 515967: [Label Customization] Available label custo not always
coherent with selected element
Rollback of the previous fix. This one works for properties and
operations but not for all the other mask labels (example: Floating
labels of association)
Change-Id: I61c8c5fd3a955761a41b9b350b1624795ca47214
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>
Diffstat (limited to 'plugins/uml')
| -rw-r--r-- | plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UMLNotation/UMLNotation.ctx | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UMLNotation/UMLNotation.ctx b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UMLNotation/UMLNotation.ctx index 15b87d47901..6eb7bdf95ca 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UMLNotation/UMLNotation.ctx +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UMLNotation/UMLNotation.ctx @@ -14,28 +14,10 @@ <widget href="ui/NamedElementDisplay.xwt#/"/> </sections> </tabs> - <views xmi:id="_rOLJVpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Property Label" sections="_rOLJUpLDEeWbp4A9_-WIrQ"> - <constraints xsi:type="constraints:CompositeConstraint" xmi:id="_bja80Ll2Eee_KeKGi--b8w" name="isLabelAndInstanceOfProperty"> - <constraints xmi:id="_rOLJV5LDEeWbp4A9_-WIrQ" name="isLabel"> - <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.1"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_rOLJWJLDEeWbp4A9_-WIrQ" name="editPolicy" value="MaskManagedLabelPolicy"/> - </constraints> - <constraints xmi:id="_cNB6gLl2Eee_KeKGi--b8w" name="isInstanceOfProperty"> - <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_pNKwALl2Eee_KeKGi--b8w" name="umlClassName" value="Property"/> - </constraints> - </constraints> - </views> - <views xmi:id="_ZMJjcLl2Eee_KeKGi--b8w" elementMultiplicity="-1" name="Operation Label" sections="_rOLJUpLDEeWbp4A9_-WIrQ"> - <constraints xsi:type="constraints:CompositeConstraint" xmi:id="_a5i5YLl2Eee_KeKGi--b8w" name="isLabelAndInstanceOfOperation"> - <constraints xmi:id="_ZMJjcbl2Eee_KeKGi--b8w" name="isLabel"> - <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.1"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_ZMJjcrl2Eee_KeKGi--b8w" name="editPolicy" value="MaskManagedLabelPolicy"/> - </constraints> - <constraints xmi:id="_gE_DgLl2Eee_KeKGi--b8w" name="isInstanceOfOperation"> - <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.0"/> - <properties xsi:type="constraints:ValueProperty" xmi:id="_nmAk8Ll2Eee_KeKGi--b8w" name="umlClassName" value="Operation"/> - </constraints> + <views xmi:id="_rOLJVpLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="Label" sections="_rOLJUpLDEeWbp4A9_-WIrQ"> + <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_rOLJV5LDEeWbp4A9_-WIrQ" name="isLabel"> + <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.gmfdiag.properties/model/Environment.xmi#//@constraintTypes.1"/> + <properties xsi:type="constraints:ValueProperty" xmi:id="_rOLJWJLDEeWbp4A9_-WIrQ" name="editPolicy" value="MaskManagedLabelPolicy"/> </constraints> </views> <views xmi:id="_rOLJWZLDEeWbp4A9_-WIrQ" elementMultiplicity="-1" name="StereotypeDisplay" sections="_rOLJU5LDEeWbp4A9_-WIrQ"> |