diff options
| author | ashatilov | 2015-10-23 20:40:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2015-10-27 10:20:41 +0000 |
| commit | c6a97b0eaa860838c79a8c832a12cd2eec97b364 (patch) | |
| tree | d05223b13a8aabb6654ecb0b0106d179f57374d8 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java | |
| parent | 41a86cf7a796ba6d71c68cd295e84ec642ce0f0f (diff) | |
| download | org.eclipse.papyrus-c6a97b0eaa860838c79a8c832a12cd2eec97b364.tar.gz org.eclipse.papyrus-c6a97b0eaa860838c79a8c832a12cd2eec97b364.tar.xz org.eclipse.papyrus-c6a97b0eaa860838c79a8c832a12cd2eec97b364.zip | |
Bug 479627 - [All diagrams] Manage <Connector> Labels dialog should be
as well used for external node labels
- squash commit for abandoned verified gerrits (+2 from Remi):
Change-Id: I14831fdc65207912ac16a65dfc50e930d5e3aa58
Change-Id: Iffe443ab5189d81d93804f0d4201d8c04bef8e79
Change-Id: Ic94e78dfceeb8d2eaf2b3515c2122b173668b939
Change-Id: I685836ccf34e6b5682630cf50431fa1053c3388a
Change-Id: Ia97e4a9ee47f086efe27dd4d9a110abe0af5660b
Change-Id: I8cbdc2e60e03956ec091495f0855d84d432ed5e5
Change-Id: Ie6ec55db5e50a66ce840450e24fc402585d6e592
Change-Id: I6b7c7d70b301a4a65abbdeb817dd10e662840a9f
Change-Id: Ic9edd422fe3331fe5d6e92c198bce8432c82c0c9
Signed-off-by: ashatilov <shatilov@montages.com>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java')
| -rw-r--r-- | plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java index a38a1946549..697124ac5a1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/edit/parts/ProtocolStateMachineCompositeFloatingLabelEditPartCN.java @@ -542,14 +542,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati maskLabelPolicy = getEditPolicy(IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL);
}
if (maskLabelPolicy == null) {
- View view = (View) getModel();
- if (view.isVisible()) {
- setLabelTextHelper(getFigure(), getLabelText());
- setLabelIconHelper(getFigure(), getLabelIcon());
- } else {
- setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$
- setLabelIconHelper(getFigure(), null);
- }
+ setLabelTextHelper(getFigure(), getLabelText());
+ setLabelIconHelper(getFigure(), getLabelIcon());
}
Object pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);
if (pdEditPolicy instanceof UMLTextSelectionEditPolicy) {
@@ -599,7 +593,8 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati if (style != null) {
FontData fontData = new FontData(
style.getFontName(), style.getFontHeight(),
- (style.isBold() ? SWT.BOLD : SWT.NORMAL) | (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
+ (style.isBold() ? SWT.BOLD : SWT.NORMAL) |
+ (style.isItalic() ? SWT.ITALIC : SWT.NORMAL));
setFont(fontData);
}
}
@@ -780,8 +775,10 @@ public class ProtocolStateMachineCompositeFloatingLabelEditPartCN extends Floati refreshUnderline();
} else if (NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
refreshStrikeThrough();
- } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) || NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature)
- || NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
+ } else if (NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
+ NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
+ NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
+ NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
refreshFont();
} else {
if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
|