Bug 489999: [Activity Diagram] Unable to align the labels of pins on CallBehaviorAction

Change-Id: I75237b44d5321be5833923c052f08ccb261fba97
Signed-off-by: Géry Deloge <gery.deloge@cea.fr>

1 files changed, 46 insertions, 33 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ExternalNodeLabelEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ExternalNodeLabelEditPart.xtend
index bd4ce81883b..604015ede6b 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ExternalNodeLabelEditPart.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/ExternalNodeLabelEditPart.xtend
@@ -10,45 +10,45 @@
  *    Dmitry Stadnik (Borland) - initial API and implementation
  *    Alexander Shatalin (Borland) - initial API and implementation
  *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- */

-package aspects.diagram.editparts

-

-import com.google.inject.Inject

-import com.google.inject.Singleton

-import org.eclipse.gmf.codegen.gmfgen.GenExternalNodeLabel

-import org.eclipse.papyrus.papyrusgmfgenextension.ExtendedGenView

-import org.eclipse.papyrus.papyrusgmfgenextension.LabelVisibilityPreference

-import xpt.Common

-

-@Singleton class ExternalNodeLabelEditPart extends diagram.editparts.ExternalNodeLabelEditPart {

-	@Inject extension Common;

-

-	override extendsList(GenExternalNodeLabel it) '''

+ */
+package aspects.diagram.editparts
+
+import com.google.inject.Inject
+import com.google.inject.Singleton
+import org.eclipse.gmf.codegen.gmfgen.GenExternalNodeLabel
+import org.eclipse.papyrus.papyrusgmfgenextension.ExtendedGenView
+import org.eclipse.papyrus.papyrusgmfgenextension.LabelVisibilityPreference
+import xpt.Common
+
+@Singleton class ExternalNodeLabelEditPart extends diagram.editparts.ExternalNodeLabelEditPart {
+	@Inject extension Common;
+
+	override extendsList(GenExternalNodeLabel it) '''
 		«««BEGIN: PapyrusGenCode
 	«««specify a java super class for external nodes
-	«IF it.eResource.allContents.filter(typeof (ExtendedGenView)).filter[v | v.genView.contains(it) && v.superOwnedEditPart != null].size != 0»

+	«IF it.eResource.allContents.filter(typeof (ExtendedGenView)).filter[v | v.genView.contains(it) && v.superOwnedEditPart != null].size != 0»
 			extends «FOR extendedObject : it.eResource.allContents.filter(typeof (ExtendedGenView)).filter[v|v.genView.contains(it) && v.superOwnedEditPart != null].toIterable»
 				«specifyInheritance(extendedObject as ExtendedGenView)»
-			«ENDFOR»

+			«ENDFOR»
 		«««END: PapyrusGenCode
-	«ELSE»

+	«ELSE»
 			extends org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart
-		«ENDIF»

-	'''

-

+		«ENDIF»
+	'''
+
 	//we add the interface ILabelRoleProvider
-	override implementsList(GenExternalNodeLabel it) '''

+	override implementsList(GenExternalNodeLabel it) '''
 	implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart, org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart
 	«««	BEGIN: PapyrusGenCode
-	«IF it.eResource.allContents.filter(typeof (LabelVisibilityPreference)).filter[v|v.externalNodeLabels.contains(it)].size != 0»

+	«IF it.eResource.allContents.filter(typeof (LabelVisibilityPreference)).filter[v|v.externalNodeLabels.contains(it)].size != 0»
 		, org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider
-	«ENDIF»

+	«ENDIF»
 	«««	END: PapyrusGenCode
-	'''

-

-	override additions(GenExternalNodeLabel it) '''

+	'''
+
+	override additions(GenExternalNodeLabel it) '''
 	«««	BEGIN: PapyrusGenCode
-	«IF it.eResource.allContents.filter(typeof (LabelVisibilityPreference)).filter[v|v.externalNodeLabels.contains(it)].size != 0»

+	«IF it.eResource.allContents.filter(typeof (LabelVisibilityPreference)).filter[v|v.externalNodeLabels.contains(it)].size != 0»
 		«generatedClassComment»
 		public String getLabelRole(){
 		return "«it.eResource.allContents.filter(typeof (LabelVisibilityPreference)).filter[v|v.externalNodeLabels.contains(it)].head.role»";//$NON-NLS-1$
@@ -58,13 +58,26 @@ import xpt.Common
 		public String getIconPathRole(){
 		return "«it.eResource.allContents.filter(typeof (LabelVisibilityPreference)).filter[v|v.externalNodeLabels.contains(it)].head.iconPathRole»";//$NON-NLS-1$
 		}
-	«ENDIF»

+	«ENDIF»
 	«««	END: PapyrusGenCode
-	'''

-

+	'''
+
+	def refreshBounds(GenExternalNodeLabel it) '''
+		«««	BEGIN: PapyrusGenCode
+		public void refreshBounds() {
+			int x = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLocation_X())).intValue();
+			int y = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLocation_Y())).intValue();
+			int width = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Width())).intValue();
+			int height = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Height())).intValue();
+			getBorderItemLocator().setConstraint(new org.eclipse.draw2d.geometry.Rectangle(x, y, width, height));
+			getBorderItemLocator().relocate(getFigure());
+		}
+    «««	END: PapyrusGenCode
+	'''
+
 	//BEGIN: PapyrusGenCode
 	//definition of the inheritance 
-	def specifyInheritance(ExtendedGenView it) '''«superOwnedEditPart»'''

-

+	def specifyInheritance(ExtendedGenView it) '''«superOwnedEditPart»'''
+
 //END: PapyrusGenCode
-}

+}