diff options
| author | Remi Schnekenburger | 2014-12-08 07:45:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2014-12-08 07:45:55 +0000 |
| commit | a86fc5f729ea042f3986ba291d13f2289b060305 (patch) | |
| tree | 56ee043e298433537d46e003ce52ed826bfcbcb9 /plugins/developer/org.eclipse.papyrus.def | |
| parent | 4a1f1144b284a04431a1a6dc61c6879e1646aafa (diff) | |
| parent | 7b55cc377ec8ae9d178d646d176d5d945fc65070 (diff) | |
| download | org.eclipse.papyrus-a86fc5f729ea042f3986ba291d13f2289b060305.tar.gz org.eclipse.papyrus-a86fc5f729ea042f3986ba291d13f2289b060305.tar.xz org.eclipse.papyrus-a86fc5f729ea042f3986ba291d13f2289b060305.zip | |
Merge "Bug 442712 - Manage Labels dialog: all hidden link labels are shown wrong, default labels can't be restored"
Diffstat (limited to 'plugins/developer/org.eclipse.papyrus.def')
| -rw-r--r-- | plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend | 16 |
1 files changed, 12 insertions, 4 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 753a66250a3..b522c53a9ad 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 @@ -24,6 +24,8 @@ import org.eclipse.gmf.codegen.gmfgen.Viewmap import parsers.ParserProvider import xpt.Common import xpt.diagram.ViewmapAttributesUtils_qvto +import xpt.Common_qvto +import org.eclipse.gmf.codegen.gmfgen.GenLinkLabel //DOCUMENTATION: PapyrusGencode //This template has been modified to take in account the possibility to have extended direct editors @@ -35,7 +37,9 @@ import xpt.diagram.ViewmapAttributesUtils_qvto @Inject extension ParserProvider - + @Inject extension Common_qvto + + @Inject TextAware testVar override fields(GenCommonBase it)''' «generatedMemberComment» private org.eclipse.gef.tools.DirectEditManager manager; @@ -58,8 +62,7 @@ import xpt.diagram.ViewmapAttributesUtils_qvto protected org.eclipse.papyrus.extensionpoints.editors.configuration.IDirectEditorConfiguration configuration; ««« END: BEGIN: PapyrusGenCode -''' - +''' override methods(GenCommonBase it, boolean needsRefreshBounds, boolean readOnly, boolean useElementIcon, Viewmap viewmap, LabelModelFacet modelFacet, GenCommonBase host, GenDiagram diagram) ''' @@ -570,6 +573,10 @@ 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))» + 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()); @@ -578,7 +585,8 @@ override refreshLabel(GenCommonBase it , GenDiagram diagram )''' else { setLabelTextHelper(getFigure(), ""); //$NON-NLS-1$ setLabelIconHelper(getFigure(), null); - } + } + «ENDIF» } Object pdEditPolicy = getEditPolicy(org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE); if (pdEditPolicy instanceof «diagram.getTextSelectionEditPolicyQualifiedClassName()») { |