Bug 522305 - [Sequence Diagram] Arrows of Message are too little

https://bugs.eclipse.org/bugs/show_bug.cgi?id=522305
 
 - use CSS instead of hard code

Change-Id: Ib6dee53ced31bb83811f2e25340c3eb2a8be9811
Signed-off-by: Mickael ADAM <mickael.adam@all4tec.net>

15 files changed, 101 insertions, 301 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/theme/umlBase.css b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/theme/umlBase.css
index 6f47639e0cd..06817385acc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/theme/umlBase.css
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/theme/umlBase.css
@@ -572,3 +572,36 @@ SequenceDiagram ConsiderIgnoreFragment {
 SequenceDiagram ConsiderIgnoreFragment > Compartment {
 	displayBorder:false;
 }
+
+SequenceDiagram Message[messageSort="createMessage"] {
+	targetDecoration: open_arrow;
+	lineStyle: dash;
+}
+
+SequenceDiagram Message[messageSort="asynchCall"] {
+	targetDecoration: open_arrow;
+}
+
+/*Message Found */
+SequenceDiagram Message[messageSort="asynchCall"][sendEvent=""] {
+	targetDecoration: open_arrow;
+}
+
+/* Message Lost */
+SequenceDiagram Message[messageSort="asynchCall"][receiveEvent=""] {
+	targetDecoration: open_arrow;
+}
+
+SequenceDiagram Message[messageSort="synchCall"] {
+	targetDecoration: solid_arrow_filled;
+}
+
+SequenceDiagram Message[messageSort="reply"] {
+	targetDecoration: open_arrow;
+	lineStyle: dash;
+}
+
+SequenceDiagram Message[messageSort="deleteMessage"] {
+	targetDecoration: solid_arrow_filled;
+}
+
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageAsyncEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageAsyncEditPart.java
index 9c52b6cc3b4..3792226e926 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageAsyncEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageAsyncEditPart.java
@@ -10,14 +10,12 @@
  * Contributors:

  *   Soyatec - Initial API and implementation

  *   Patrick Tessier (CEA LIST) change names

- *

+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 522305

  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;

 

-import org.eclipse.draw2d.Connection;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.uml.diagram.sequence.figures.MessageAsync;

 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;

 import org.eclipse.uml2.uml.Message;

 import org.eclipse.uml2.uml.MessageSort;

@@ -54,13 +52,4 @@ public class CustomMessageAsyncEditPart extends MessageAsyncEditPart {
 		super.handleNotificationEvent(notification);

 	}

 

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageAsyncEditPart#createConnectionFigure()

-	 *

-	 * @return

-	 */

-	@Override

-	protected Connection createConnectionFigure() {

-		return new MessageAsync(getMapMode());

-	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageCreateEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageCreateEditPart.java
index 2cada898d61..746b100dcf1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageCreateEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageCreateEditPart.java
@@ -10,14 +10,12 @@
  * Contributors:
  *   Soyatec - Initial API and implementation
  *   Patrick Tessier (CEA LIST) rename classes
- *
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 522305
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
 
-import org.eclipse.draw2d.Connection;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.sequence.figures.MessageCreate;
 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
 import org.eclipse.uml2.uml.Message;
 import org.eclipse.uml2.uml.MessageSort;
@@ -54,13 +52,4 @@ public class CustomMessageCreateEditPart extends MessageCreateEditPart {
 		super.handleNotificationEvent(notification);
 	}
 
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageCreateEditPart#createConnectionFigure()
-	 *
-	 * @return
-	 */
-	@Override
-	protected Connection createConnectionFigure() {
-		return new MessageCreate(getMapMode());
-	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageDeleteEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageDeleteEditPart.java
index 0a47eac78e0..6b9711b6eea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageDeleteEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageDeleteEditPart.java
@@ -10,14 +10,12 @@
  * Contributors:
  *   Soyatec - Initial API and implementation
  *   Patrick Tessier (CEA LIST) - modification names
- *
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 522305
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
 
-import org.eclipse.draw2d.Connection;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.sequence.figures.MessageDelete;
 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
 import org.eclipse.uml2.uml.Message;
 import org.eclipse.uml2.uml.MessageSort;
@@ -53,14 +51,4 @@ public class CustomMessageDeleteEditPart extends MessageDeleteEditPart {
 		SequenceUtil.handleMessageSortChange(getEditingDomain(), notification, (Message) resolveSemanticElement(), MessageSort.DELETE_MESSAGE_LITERAL);
 		super.handleNotificationEvent(notification);
 	}
-
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageDeleteEditPart#createConnectionFigure()
-	 *
-	 * @return
-	 */
-	@Override
-	protected Connection createConnectionFigure() {
-		return new MessageDelete(getMapMode());
-	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageFoundEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageFoundEditPart.java
index d84740717b8..d2b0f451a4f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageFoundEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageFoundEditPart.java
@@ -9,14 +9,12 @@
  *
  * Contributors:
  *   Soyatec - Initial API and implementation
- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 521312
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 521312, 522305
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
 
-import org.eclipse.draw2d.Connection;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFound;
 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
 import org.eclipse.uml2.uml.Message;
 import org.eclipse.uml2.uml.MessageSort;
@@ -44,14 +42,4 @@ public class CustomMessageFoundEditPart extends MessageFoundEditPart {
 		SequenceUtil.handleMessageSortChange(getEditingDomain(), notification, (Message) resolveSemanticElement(), MessageSort.ASYNCH_SIGNAL_LITERAL);
 		super.handleNotificationEvent(notification);
 	}
-
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageFoundEditPart#createConnectionFigure()
-	 *
-	 * @return
-	 */
-	@Override
-	protected Connection createConnectionFigure() {
-		return new MessageFound(getMapMode());
-	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageLostEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageLostEditPart.java
index c33e4c2ba78..a56f18a60ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageLostEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageLostEditPart.java
@@ -9,14 +9,12 @@
  *
  * Contributors:
  *   Soyatec - Initial API and implementation
- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 521312
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 521312, 522305
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
 
-import org.eclipse.draw2d.Connection;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.sequence.figures.MessageLost;
 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
 import org.eclipse.uml2.uml.Message;
 import org.eclipse.uml2.uml.MessageSort;
@@ -44,14 +42,4 @@ public class CustomMessageLostEditPart extends MessageLostEditPart {
 		SequenceUtil.handleMessageSortChange(getEditingDomain(), notification, (Message) resolveSemanticElement(), MessageSort.ASYNCH_SIGNAL_LITERAL);
 		super.handleNotificationEvent(notification);
 	}
-
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageLostEditPart#createConnectionFigure()
-	 *
-	 * @return
-	 */
-	@Override
-	protected Connection createConnectionFigure() {
-		return new MessageLost(getMapMode());
-	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageReplyEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageReplyEditPart.java
index f015a533f96..83572ca4da8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageReplyEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageReplyEditPart.java
@@ -10,14 +10,12 @@
  * Contributors:
  *   Soyatec - Initial API and implementation
  *   Patrick Tessier (CEA LIST) rename classes
- *
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 522305
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
 
-import org.eclipse.draw2d.Connection;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.sequence.figures.MessageReply;
 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
 import org.eclipse.uml2.uml.Message;
 import org.eclipse.uml2.uml.MessageSort;
@@ -54,13 +52,4 @@ public class CustomMessageReplyEditPart extends MessageReplyEditPart {
 		super.handleNotificationEvent(notification);
 	}
 
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageReplyEditPart#createConnectionFigure()
-	 *
-	 * @return
-	 */
-	@Override
-	protected Connection createConnectionFigure() {
-		return new MessageReply(getMapMode());
-	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageSyncEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageSyncEditPart.java
index 50525659ce6..95cb9749538 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageSyncEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/parts/CustomMessageSyncEditPart.java
@@ -9,14 +9,12 @@
  *
  * Contributors:
  *   Soyatec - Initial API and implementation
- *
+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 522305
  *****************************************************************************/
 package org.eclipse.papyrus.uml.diagram.sequence.edit.parts;
 
-import org.eclipse.draw2d.Connection;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.uml.diagram.sequence.figures.MessageSync;
 import org.eclipse.papyrus.uml.diagram.sequence.util.SequenceUtil;
 import org.eclipse.uml2.uml.Message;
 import org.eclipse.uml2.uml.MessageSort;
@@ -53,13 +51,4 @@ public class CustomMessageSyncEditPart extends MessageSyncEditPart {
 		super.handleNotificationEvent(notification);
 	}
 
-	/**
-	 * @see org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageSyncEditPart#createConnectionFigure()
-	 *
-	 * @return
-	 */
-	@Override
-	protected Connection createConnectionFigure() {
-		return new MessageSync(getMapMode());
-	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageAsync.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageAsync.java
index 00bd5200662..9ab41a255a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageAsync.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageAsync.java
@@ -1,46 +1,42 @@
+/*****************************************************************************

+ * Copyright (c) 2010 - 2017 CEA LIST, ALL4TEC and others.

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ *

+ * Contributors:

+ *   Soyatec - Initial API and implementation

+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 522305

+ *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

-import org.eclipse.draw2d.PolylineDecoration;

 import org.eclipse.draw2d.RotatableDecoration;

-import org.eclipse.draw2d.geometry.PointList;

-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;

 

 public class MessageAsync extends MessageFigure {

 

 	/**

 	 * Constructor.

-	 *

 	 */

 	public MessageAsync() {

 		super();

 	}

 

 	/**

-	 * Constructor.

-	 *

-	 * @param mapMode

+	 * {@inheritDoc}

+	 * 

+	 * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration()

 	 */

-	public MessageAsync(IMapMode mapMode) {

-		super(mapMode);

-	}

-

 	@Override

 	protected RotatableDecoration createTargetDecoration() {

-		PolylineDecoration df = new PolylineDecoration();

-//		df.setForegroundColor(getForegroundColor());

-//		PointList pl = new PointList();

-//		pl.addPoint(getMapMode().DPtoLP(-2), getMapMode().DPtoLP(2));

-//		pl.addPoint(getMapMode().DPtoLP(0), getMapMode().DPtoLP(0));

-//		pl.addPoint(getMapMode().DPtoLP(-2), getMapMode().DPtoLP(-2));

-//		df.setTemplate(pl);

-//		df.setScale(getMapMode().DPtoLP(7), getMapMode().DPtoLP(3));

-		return df;

+		return null;

 	}

 

 	/**

+	 * {@inheritDoc}

+	 * 

 	 * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createSourceDecoration()

-	 *

-	 * @return

 	 */

 	@Override

 	protected RotatableDecoration createSourceDecoration() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageCreate.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageCreate.java
index de828d30faf..f9e66649d59 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageCreate.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageCreate.java
@@ -1,7 +1,6 @@
 /*****************************************************************************

- * Copyright (c) 2010 CEA

- *

- *

+ * Copyright (c) 2010 - 2017 CEA LIST, ALL4TEC and others.

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -9,17 +8,11 @@
  *

  * Contributors:

  *   Soyatec - Initial API and implementation

- *

+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 522305

  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

-import org.eclipse.draw2d.ColorConstants;

-import org.eclipse.draw2d.Graphics;

-import org.eclipse.draw2d.PolylineDecoration;

 import org.eclipse.draw2d.RotatableDecoration;

-import org.eclipse.draw2d.geometry.PointList;

-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;

-import org.eclipse.swt.SWT;

 

 /**

  * @author Jin Liu (jin.liu@soyatec.com)

@@ -28,68 +21,29 @@ public class MessageCreate extends MessageFigure {
 

 	/**

 	 * Constructor.

-	 *

 	 */

 	public MessageCreate() {

 		super();

-		setStyle();

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param mapMode

-	 */

-	public MessageCreate(IMapMode mapMode) {

-		super(mapMode);

-		setStyle();

-

-	}

-

-	protected void setStyle() {

-		this.setLineStyle(SWT.LINE_DASH);

-		this.setForegroundColor(ColorConstants.black);

 	}

 

 	/**

+	 * {@inheritDoc}

+	 * 

 	 * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration()

-	 *

-	 * @return

 	 */

 	@Override

 	protected RotatableDecoration createTargetDecoration() {

-		PolylineDecoration df = new PolylineDecoration();

-		df.setForegroundColor(getForegroundColor());

-		PointList pl = new PointList();

-		// pl.addPoint(getMapMode().DPtoLP(-2), getMapMode().DPtoLP(2));

-		// pl.addPoint(getMapMode().DPtoLP(0), getMapMode().DPtoLP(0));

-		// pl.addPoint(getMapMode().DPtoLP(-2), getMapMode().DPtoLP(-2));

-		// df.setTemplate(pl);

-		// df.setScale(getMapMode().DPtoLP(7), getMapMode().DPtoLP(3));

-		return df;

+		return null;

 	}

 

 	/**

+	 * {@inheritDoc}

+	 * 

 	 * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createSourceDecoration()

-	 *

-	 * @return

 	 */

 	@Override

 	protected RotatableDecoration createSourceDecoration() {

 		return null;

 	}

 

-	/**

-	 * @see org.eclipse.draw2d.Figure#paint(org.eclipse.draw2d.Graphics)

-	 *

-	 * @param graphics

-	 */

-	@Override

-	public void paint(Graphics graphics) {

-		super.paint(graphics);

-		graphics.pushState();

-		graphics.setLineStyle(SWT.LINE_DASH);

-		graphics.popState();

-

-	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageDelete.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageDelete.java
index 6736def82d4..4a8da755a95 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageDelete.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageDelete.java
@@ -1,7 +1,6 @@
 /*****************************************************************************

- * Copyright (c) 2010 CEA

- *

- *

+ * Copyright (c) 2010 - 2017 CEA LIST, ALL4TEC and others.

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -9,15 +8,11 @@
  *

  * Contributors:

  *   Soyatec - Initial API and implementation

- *

+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 522305

  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

-import org.eclipse.draw2d.ColorConstants;

-import org.eclipse.draw2d.PolygonDecoration;

 import org.eclipse.draw2d.RotatableDecoration;

-import org.eclipse.draw2d.geometry.PointList;

-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;

 

 /**

  * @author Jin Liu (jin.liu@soyatec.com)

@@ -32,33 +27,19 @@ public class MessageDelete extends MessageFigure {
 	}

 

 	/**

-	 * Constructor.

-	 *

-	 * @param mapMode

-	 */

-	public MessageDelete(IMapMode mapMode) {

-		super(mapMode);

-		this.setForegroundColor(ColorConstants.black);

-	}

-

-	/**

+	 * {@inheritDoc}

+	 * 

 	 * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration()

-	 *

-	 * @return

 	 */

 	@Override

 	protected RotatableDecoration createTargetDecoration() {

-		PolygonDecoration df = new PolygonDecoration();

-		df.setFill(true);

-		df.setForegroundColor(getForegroundColor());

-		df.setBackgroundColor(getForegroundColor());

-		return df;

+		return null;

 	}

 

 	/**

+	 * {@inheritDoc}

+	 * 

 	 * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createSourceDecoration()

-	 *

-	 * @return

 	 */

 	@Override

 	protected RotatableDecoration createSourceDecoration() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageFound.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageFound.java
index cc24d9a2a8f..40f10d15fbc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageFound.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageFound.java
@@ -1,7 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2010-2017 CEA

  *

- *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -9,15 +8,12 @@
  *

  * Contributors:

  *   Soyatec - Initial API and implementation

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 521312

+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 521312, 522305

  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

-import org.eclipse.draw2d.ColorConstants;

-import org.eclipse.draw2d.PolylineDecoration;

 import org.eclipse.draw2d.RotatableDecoration;

 import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;

 

 /**

  * @author Jin Liu (jin.liu@soyatec.com)

@@ -32,18 +28,9 @@ public class MessageFound extends MessageFigure {
 	}

 

 	/**

-	 * Constructor.

-	 *

-	 * @param mapMode

-	 */

-	public MessageFound(IMapMode mapMode) {

-		super(mapMode);

-		this.setForegroundColor(ColorConstants.black);

-		setSourceDecoration(createSourceDecoration());

-	}

-

-	/**

-	 * @since 3.0

+	 * {@inheritDoc}

+	 * 

+	 * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration()

 	 */

 	protected RotatableDecoration createSourceDecoration() {

 		EllipseDecoration df = new EllipseDecoration();

@@ -53,14 +40,14 @@ public class MessageFound extends MessageFigure {
 	}

 

 	/**

+	 * {@inheritDoc}

+	 * 

 	 * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration()

 	 *

 	 * @return

 	 */

 	@Override

 	protected RotatableDecoration createTargetDecoration() {

-		PolylineDecoration df = new PolylineDecoration();

-		df.setForegroundColor(getForegroundColor());

-		return df;

+		return null;

 	}

 }

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageLost.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageLost.java
index fd024c4a7d6..fba2e16fa67 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageLost.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageLost.java
@@ -1,7 +1,6 @@
 /*****************************************************************************

  * Copyright (c) 2010-2017 CEA

  *

- *

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -9,17 +8,14 @@
  *

  * Contributors:

  *   Soyatec - Initial API and implementation

- *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 521312

+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 521312, 522305

  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

 import org.eclipse.draw2d.ArrowLocator;

-import org.eclipse.draw2d.ColorConstants;

 import org.eclipse.draw2d.ConnectionLocator;

-import org.eclipse.draw2d.PolylineDecoration;

 import org.eclipse.draw2d.RotatableDecoration;

 import org.eclipse.draw2d.geometry.Dimension;

-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;

 

 /**

  * @author Jin Liu (jin.liu@soyatec.com)

@@ -28,22 +24,11 @@ public class MessageLost extends MessageFigure {
 

 	/**

 	 * Constructor.

-	 *

 	 */

 	public MessageLost() {

 	}

 

 	/**

-	 * Constructor.

-	 *

-	 * @param mapMode

-	 */

-	public MessageLost(IMapMode mapMode) {

-		super(mapMode);

-		this.setForegroundColor(ColorConstants.black);

-	}

-

-	/**

 	 * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration()

 	 *

 	 * @return

@@ -54,15 +39,7 @@ public class MessageLost extends MessageFigure {
 		df.setAlwaysFill(true);

 		df.setPreferredSize(new Dimension(10, 10));

 		add(df, new ArrowLocator(this, ConnectionLocator.TARGET)); // child figure

-		PolylineDecoration arrow = new PolylineDecoration();

-		arrow.setForegroundColor(getForegroundColor());

-		// PointList pl = new PointList();

-		// pl.addPoint(getMapMode().DPtoLP(-2), getMapMode().DPtoLP(2));

-		// pl.addPoint(getMapMode().DPtoLP(0), getMapMode().DPtoLP(0));

-		// pl.addPoint(getMapMode().DPtoLP(-2), getMapMode().DPtoLP(-2));

-		// arrow.setTemplate(pl);

-		// arrow.setScale(getMapMode().DPtoLP(7), getMapMode().DPtoLP(3));

-		return arrow;

+		return null;

 	}

 

 	/**

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageReply.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageReply.java
index 80770ce606b..8bb870e9d99 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageReply.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageReply.java
@@ -1,23 +1,18 @@
 /*****************************************************************************

- * Copyright (c) 2010 CEA

- *

- *

+ * Copyright (c) 2010, 2017 CEA LIST, ALL4TEC and others.

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *   Soyatec - Initial API and implementation

- *

+ *   CEA List - Initial API and implementation

+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 522305

  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

-import org.eclipse.draw2d.ColorConstants;

-import org.eclipse.draw2d.PolylineDecoration;

 import org.eclipse.draw2d.RotatableDecoration;

-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;

-import org.eclipse.swt.SWT;

 

 /**

  * @author Jin Liu (jin.liu@soyatec.com)

@@ -30,46 +25,22 @@ public class MessageReply extends MessageFigure {
 	 */

 	public MessageReply() {

 		super();

-		setStyle();

-	}

-

-	/**

-	 * Constructor.

-	 *

-	 * @param mapMode

-	 */

-	public MessageReply(IMapMode mapMode) {

-		super(mapMode);

-		setStyle();

-	}

-

-	protected void setStyle() {

-		this.setLineStyle(SWT.LINE_DASH);

-		this.setForegroundColor(ColorConstants.black);

 	}

 

 	/**

+	 * {@inheritDoc}

+	 * 

 	 * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration()

-	 *

-	 * @return

 	 */

 	@Override

 	protected RotatableDecoration createTargetDecoration() {

-		PolylineDecoration df = new PolylineDecoration();

-		df.setForegroundColor(getForegroundColor());

-		// PointList pl = new PointList();

-		// pl.addPoint(getMapMode().DPtoLP(-2), getMapMode().DPtoLP(2));

-		// pl.addPoint(getMapMode().DPtoLP(0), getMapMode().DPtoLP(0));

-		// pl.addPoint(getMapMode().DPtoLP(-2), getMapMode().DPtoLP(-2));

-		// df.setTemplate(pl);

-		// df.setScale(getMapMode().DPtoLP(7), getMapMode().DPtoLP(3));

-		return df;

+		return null;

 	}

 

 	/**

+	 * {@inheritDoc}

+	 * 

 	 * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createSourceDecoration()

-	 *

-	 * @return

 	 */

 	@Override

 	protected RotatableDecoration createSourceDecoration() {

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageSync.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageSync.java
index 12d62af7820..c7712f72e92 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageSync.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/figures/MessageSync.java
@@ -1,23 +1,18 @@
 /*****************************************************************************

- * Copyright (c) 2010 CEA

- *

- *

+ * Copyright (c) 2010, 2017 CEA LIST, ALL4TEC and others.

+ * 

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *   Soyatec - Initial API and implementation

- *

+ *   CEA List - Initial API and implementation

+ *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 522305

  *****************************************************************************/

 package org.eclipse.papyrus.uml.diagram.sequence.figures;

 

-import org.eclipse.draw2d.ColorConstants;

-import org.eclipse.draw2d.PolygonDecoration;

 import org.eclipse.draw2d.RotatableDecoration;

-import org.eclipse.draw2d.geometry.PointList;

-import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;

 

 /**

  * @author Jin Liu (jin.liu@soyatec.com)

@@ -32,33 +27,19 @@ public class MessageSync extends MessageFigure {
 	}

 

 	/**

-	 * Constructor.

-	 *

-	 * @param mapMode

-	 */

-	public MessageSync(IMapMode mapMode) {

-		super(mapMode);

-		this.setForegroundColor(ColorConstants.black);

-	}

-

-	/**

+	 * {@inheritDoc}

+	 * 

 	 * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createTargetDecoration()

-	 *

-	 * @return

 	 */

 	@Override

 	protected RotatableDecoration createTargetDecoration() {

-		PolygonDecoration df = new PolygonDecoration();

-		df.setFill(true);

-		df.setForegroundColor(getForegroundColor());

-		df.setBackgroundColor(ColorConstants.black);

-		return df;

+		return null;

 	}

 

 	/**

+	 * {@inheritDoc}

+	 * 

 	 * @see org.eclipse.papyrus.uml.diagram.sequence.figures.MessageFigure#createSourceDecoration()

-	 *

-	 * @return

 	 */

 	@Override

 	protected RotatableDecoration createSourceDecoration() {