Bug 442712 - Manage Labels dialog: all hidden link labels are shown

wrong, default labels can't be restored

 - for ClassD only

Change-Id: I6a4b04885a168210657f4ed3fc9926e33f1c023f
Signed-off-by: ashatilov <montages.as@gmail.com>

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()») {