Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorashatilov2015-10-16 19:51:52 +0000
committerGerrit Code Review @ Eclipse.org2015-10-23 09:36:33 +0000
commit8a007af778628eb286cd1f1a6d9d5de9014638fc (patch)
tree8b6620ccf98a6a1dd235fb01aba3ad817b4a1c7a /plugins/developer
parentbc92ef9c1fe360c968cd223fd5ce72bb4b05a4ff (diff)
downloadorg.eclipse.papyrus-8a007af778628eb286cd1f1a6d9d5de9014638fc.tar.gz
org.eclipse.papyrus-8a007af778628eb286cd1f1a6d9d5de9014638fc.tar.xz
org.eclipse.papyrus-8a007af778628eb286cd1f1a6d9d5de9014638fc.zip
Bug 479627 - [All diagrams] Manage <Connector> Labels dialog should be
as well used for external node labels - template fix Change-Id: I77eedb1c6a098143f4745337e9c43b1369640bfd Signed-off-by: ashatilov <shatilov@montages.com>
Diffstat (limited to 'plugins/developer')
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend9
1 files changed, 5 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 7ecada9d96a..d965bf390b7 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
@@ -18,15 +18,16 @@ import com.google.inject.Singleton
import org.eclipse.gmf.codegen.gmfgen.DesignLabelModelFacet
import org.eclipse.gmf.codegen.gmfgen.GenCommonBase
import org.eclipse.gmf.codegen.gmfgen.GenDiagram
+import org.eclipse.gmf.codegen.gmfgen.GenExternalNodeLabel
+import org.eclipse.gmf.codegen.gmfgen.GenLinkLabel
import org.eclipse.gmf.codegen.gmfgen.LabelModelFacet
import org.eclipse.gmf.codegen.gmfgen.ParentAssignedViewmap
import org.eclipse.gmf.codegen.gmfgen.Viewmap
import parsers.ParserProvider
+import xpt.CodeStyle
import xpt.Common
-import xpt.diagram.ViewmapAttributesUtils_qvto
import xpt.Common_qvto
-import org.eclipse.gmf.codegen.gmfgen.GenLinkLabel
-import xpt.CodeStyle
+import xpt.diagram.ViewmapAttributesUtils_qvto
//DOCUMENTATION: PapyrusGencode
//This template has been modified to take in account the possibility to have extended direct editors
@@ -579,7 +580,7 @@ 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))ģ
+ ĢIF it.oclIsKindOf(typeof(GenLinkLabel)) || it.oclIsKindOf(typeof(GenExternalNodeLabel))ģ
setLabelTextHelper(getFigure(), getLabelText());
setLabelIconHelper(getFigure(), getLabelIcon());
ĢELSEģ

Back to the top