diff options
| author | Ansgar Radermacher | 2017-07-27 12:17:13 +0000 |
|---|---|---|
| committer | Ansgar Radermacher | 2017-08-15 07:35:29 +0000 |
| commit | 70b9982a746b386c76351a81b2f263bb87fecd88 (patch) | |
| tree | 35636bd3854256b946d81dfdd31a4f515f6d24ad | |
| parent | 248f8ea294f5c709274ea49d461673fab82467d0 (diff) | |
| download | org.eclipse.papyrus-70b9982a746b386c76351a81b2f263bb87fecd88.tar.gz org.eclipse.papyrus-70b9982a746b386c76351a81b2f263bb87fecd88.tar.xz org.eclipse.papyrus-70b9982a746b386c76351a81b2f263bb87fecd88.zip | |
Bug 401542 - [All Diagrams] Removed labels remain as invisible elements in diagram and lead to confusing selections
- No specific handling for edges, i.e. always reset text and images in case of invisible views (for both nodes and edges)
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
Change-Id: I74709e4383c8bf7c646d77ab6dfaa946b230599c
(cherry picked from commit 513568e3a1b37fe85a53acea6ac74f744bfd52f2)
| -rw-r--r-- | plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend index eec54b495ce..6dc08068748 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend @@ -570,10 +570,6 @@ override refreshLabel(GenCommonBase it , GenDiagram diagram )''' maskLabelPolicy = getEditPolicy(org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.IndirectMaskLabelEditPolicy.INDRIRECT_MASK_MANAGED_LABEL); } if (maskLabelPolicy == null) { - «IF it.oclIsKindOf(typeof(GenLinkLabel)) || it.oclIsKindOf(typeof(GenExternalNodeLabel))» - setLabelTextHelper(getFigure(), getLabelText()); - setLabelIconHelper(getFigure(), getLabelIcon()); - «ELSE» org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View)getModel(); if(view.isVisible()) { setLabelTextHelper(getFigure(), getLabelText()); @@ -583,7 +579,6 @@ override refreshLabel(GenCommonBase it , GenDiagram diagram )''' setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$ setLabelIconHelper(getFigure(), null); } - «ENDIF» } Object pdEditPolicy = getEditPolicy(org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE); if (pdEditPolicy instanceof «diagram.getTextSelectionEditPolicyQualifiedClassName()») { |