Bug 521829 - [Sequence Diagram] Preference should exist to move other

messages

https://bugs.eclipse.org/bugs/show_bug.cgi?id=521829

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

9 files changed, 120 insertions, 45 deletions

diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF
index 53d13481704..47511f3787e 100755
--- a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF
+++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0
  org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.3.0,2.0.0)",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
index 51b8c91a2f0..d5cd4f15c2a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF
@@ -65,7 +65,7 @@ Require-Bundle: org.eclipse.ui.navigator;visibility:=reexport;bundle-version="[3
  org.eclipse.draw2d;visibility:=reexport,

  org.eclipse.gmf.runtime.notation;visibility:=reexport

 Bundle-Vendor: %providerName

-Bundle-Version: 4.1.0.qualifier

+Bundle-Version: 5.0.0.qualifier

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.sequence; singleton:=true

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceEditPolicy.java
index 4a22e299f62..d2dd5ad901e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/UpdateWeakReferenceEditPolicy.java
@@ -29,8 +29,12 @@ import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
 import org.eclipse.gef.requests.ChangeBoundsRequest;

 import org.eclipse.gef.requests.ReconnectRequest;

 import org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx;

+import org.eclipse.jface.util.IPropertyChangeListener;

+import org.eclipse.jface.util.PropertyChangeEvent;

 import org.eclipse.papyrus.uml.diagram.sequence.keyboardlistener.IKeyPressState;

 import org.eclipse.papyrus.uml.diagram.sequence.keyboardlistener.KeyboardListener;

+import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;

+import org.eclipse.papyrus.uml.diagram.sequence.preferences.CustomDiagramGeneralPreferencePage;

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

 import org.eclipse.swt.SWT;

 import org.eclipse.ui.PlatformUI;

@@ -48,6 +52,16 @@ public abstract class UpdateWeakReferenceEditPolicy extends GraphicalEditPolicy
 	protected boolean mustMove = true;

 

 	/**

+	 * The instance of listener of move message preference property change.

+	 */

+	private final MoveMessagePropertyChangeListener moveMessageListener = new MoveMessagePropertyChangeListener();

+

+	/**

+	 * The must move preference boolean. Set to true if messages above the current message must move down at the same time.

+	 */

+	private boolean mustMovePreference;

+

+	/**

 	 * Constructor.

 	 *

 	 */

@@ -61,12 +75,15 @@ public abstract class UpdateWeakReferenceEditPolicy extends GraphicalEditPolicy
 		// activate listeners

 		PlatformUI.getWorkbench().getDisplay().addFilter(SWT.KeyDown, SHIFTDown);

 		PlatformUI.getWorkbench().getDisplay().addFilter(SWT.KeyUp, SHIFTUp);

+		mustMove = mustMovePreference = UMLDiagramEditorPlugin.getInstance().getPreferenceStore().getBoolean(CustomDiagramGeneralPreferencePage.PREF_MOVE_ABOVE_MESSAGE);

+		UMLDiagramEditorPlugin.getInstance().getPreferenceStore().addPropertyChangeListener(moveMessageListener);

 	}

 

 	@Override

 	public void deactivate() {

 		PlatformUI.getWorkbench().getDisplay().removeFilter(SWT.KeyDown, SHIFTDown);

 		PlatformUI.getWorkbench().getDisplay().removeFilter(SWT.KeyUp, SHIFTUp);

+		UMLDiagramEditorPlugin.getInstance().getPreferenceStore().removePropertyChangeListener(moveMessageListener);

 		super.deactivate();

 	}

 

@@ -101,10 +118,14 @@ public abstract class UpdateWeakReferenceEditPolicy extends GraphicalEditPolicy
 		return reconnectRequest;

 	}

 

+	/**

+	 * {@inheritDoc}

+	 * 

+	 * @see org.eclipse.papyrus.uml.diagram.sequence.keyboardlistener.IKeyPressState#setKeyPressState(java.lang.Boolean)

+	 */

 	@Override

 	public void setKeyPressState(Boolean isPressed) {

-		mustMove = !isPressed;

-

+		mustMove = mustMovePreference && !isPressed;

 	}

 

 	/**

@@ -162,4 +183,23 @@ public abstract class UpdateWeakReferenceEditPolicy extends GraphicalEditPolicy
 		compoundCommand.add(connectionEditPart.getSource().getCommand(reconnectSourceRequest));

 	}

 

+	/**

+	 * Listener of move message preference property change.

+	 * 

+	 * @author Mickael ADAM

+	 */

+	private final class MoveMessagePropertyChangeListener implements IPropertyChangeListener {

+		/**

+		 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)

+		 */

+		@Override

+		public void propertyChange(PropertyChangeEvent event) {

+			if (CustomDiagramGeneralPreferencePage.PREF_MOVE_ABOVE_MESSAGE.equals(event.getProperty())) {

+				if (mustMovePreference != (boolean) event.getNewValue()) {

+					mustMove = mustMovePreference = (boolean) event.getNewValue();

+				}

+			}

+		}

+	}

+

 }
\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/messages/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/messages/Messages.java
index ceb992fc543..7d926fbbb17 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/messages/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/messages/Messages.java
@@ -18,7 +18,7 @@ import org.eclipse.osgi.util.NLS;
 /**
  * @since 3.0
  */
-public class Messages {
+public class Messages extends NLS {
 
 	static {
 		NLS.initializeMessages("org.eclipse.papyrus.uml.diagram.sequence.messages.messages", Messages.class); //$NON-NLS-1$
@@ -28,19 +28,19 @@ public class Messages {
 	}
 
 	/*************************************************************************
-	 *   Preference messages    
+	 * Preference messages
 	 ************************************************************************/
-	
+
 	/**
 	 * label for the part of the preference page involved with automatic creations of elements when creating a message
 	 */
 	public static String DiagramsPreferencePage_notificationGroup_label;
-	
+
 	/**
 	 * label to ask which behavior should be triggered when creating a synchronous message
 	 */
 	public static String DiagramsPreferencePage_executionSpecificationWithSyncMsg_label;
-	
+
 	/**
 	 * label to ask which behavior should be triggered when creating an asynchronous message
 	 */
@@ -60,24 +60,34 @@ public class Messages {
 	 * label specifying that an action execution specification and a message reply should be created
 	 */
 	public static String DiagramsPreferencePage_createActionExecutionSpecificationAndReply;
-	
+
 	/**
 	 * label specifying that an action execution specification should be created at message target
 	 */
 	public static String DiagramsPreferencePage_createActionExecutionSpecification;
-	
+
 	/**
 	 * label specifying that only the message should be created
 	 */
 	public static String DiagramsPreferencePage_createNoExecutionSpecification;
-	
+
 	/*************************************************************************
-	 *   Command labels    
+	 * Command labels
 	 ************************************************************************/
-	
+
 	public static String Commands_CreateExecutionSpecification_Label;
-	
+
 	public static String Commands_DropDestructionOccurenceSpecification_Label;
-	
+
+	/**
+	 * @since 5.0
+	 */
+	public static String CustomDiagramGeneralPreferencePage_MoveMessageAboveDescription;
+
+	/**
+	 * @since 5.0
+	 */
+	public static String CustomDiagramGeneralPreferencePage_othersGroupLabel;
+
 }
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/messages/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/messages/messages.properties
index 0f4b02254d1..ea44a6758f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/messages/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/messages/messages.properties
@@ -10,3 +10,5 @@ Commands_DropDestructionOccurenceSpecification_Label=Drop Destruction Occurrence
 Commands_CreateExecutionSpecification_Label=Execution Specification Automatic Creation with Message
 Commands_DropDestructionOccurenceSpecification_Label=Drop Destruction Occurrence Specification
 Commands_CreateExecutionSpecification_Label=Execution Specification Automatic Creation with Message
+CustomDiagramGeneralPreferencePage_MoveMessageAboveDescription=When moving down a message, everything after that message is also moved down
+CustomDiagramGeneralPreferencePage_othersGroupLabel=others
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomDiagramGeneralPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomDiagramGeneralPreferencePage.java
index 46d5e4a834d..1e4e86b115c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomDiagramGeneralPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/custom-src/org/eclipse/papyrus/uml/diagram/sequence/preferences/CustomDiagramGeneralPreferencePage.java
@@ -7,15 +7,17 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
-  *  CEA LIST - Initial API and implementation
+ *  CEA LIST - Initial API and implementation
+ *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 521829
  */
 package org.eclipse.papyrus.uml.diagram.sequence.preferences;
 
+import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.RadioGroupFieldEditor;
 import org.eclipse.papyrus.infra.gmfdiag.preferences.pages.DiagramPreferencePage;
-import org.eclipse.papyrus.uml.diagram.sequence.messages.Messages;
 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.SequenceDiagramEditPart;
+import org.eclipse.papyrus.uml.diagram.sequence.messages.Messages;
 import org.eclipse.papyrus.uml.diagram.sequence.part.UMLDiagramEditorPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
@@ -25,7 +27,7 @@ import org.eclipse.swt.widgets.Group;
 
 
 public class CustomDiagramGeneralPreferencePage extends DiagramPreferencePage {
-	
+
 	/**
 	 * preference page editor control for choosing if and which execution specifications should be automatically created with synchronous messages
 	 */
@@ -39,29 +41,36 @@ public class CustomDiagramGeneralPreferencePage extends DiagramPreferencePage {
 	/**
 	 * preference key for asynchronous messages
 	 */
-	public static String PREF_EXECUTION_SPECIFICATION_ASYNC_MSG = "PREF_EXECUTION_SPECIFICATION_ASYNC_MSG";  //$NON-NLS-1$	
+	public static String PREF_EXECUTION_SPECIFICATION_ASYNC_MSG = "PREF_EXECUTION_SPECIFICATION_ASYNC_MSG"; //$NON-NLS-1$
 
 	/**
 	 * preference key for synchronous messages
 	 */
-	public static String PREF_EXECUTION_SPECIFICATION_SYNC_MSG = "PREF_EXECUTION_SPECIFICATION_SYNC_MSG";  //$NON-NLS-1$
-	
+	public static String PREF_EXECUTION_SPECIFICATION_SYNC_MSG = "PREF_EXECUTION_SPECIFICATION_SYNC_MSG"; //$NON-NLS-1$
+
+	/**
+	 * preference key to move messages in the same time.
+	 * 
+	 * @since 5.0
+	 */
+	public static final String PREF_MOVE_ABOVE_MESSAGE = "PREF_MOVE_ABOVE_MESSAGE"; //$NON-NLS-1$
+
 	/**
 	 * possible preference values
 	 */
-	public static final String CHOICE_BEHAVIOR_AND_REPLY= "CHOICE_BEHAVIOR_AND_REPLY"; //$NON-NLS-1$
-	public static final String CHOICE_ACTION_AND_REPLY= "CHOICE_ACTION_AND_REPLY"; //$NON-NLS-1$
-	public static final String CHOICE_BEHAVIOR= "CHOICE_BEHAVIOR"; //$NON-NLS-1$
-	public static final String CHOICE_ACTION= "CHOICE_ACTION"; //$NON-NLS-1$
-	public static final String CHOICE_NONE= "CHOICE_NONE"; //$NON-NLS-1$
-	
+	public static final String CHOICE_BEHAVIOR_AND_REPLY = "CHOICE_BEHAVIOR_AND_REPLY"; //$NON-NLS-1$
+	public static final String CHOICE_ACTION_AND_REPLY = "CHOICE_ACTION_AND_REPLY"; //$NON-NLS-1$
+	public static final String CHOICE_BEHAVIOR = "CHOICE_BEHAVIOR"; //$NON-NLS-1$
+	public static final String CHOICE_ACTION = "CHOICE_ACTION"; //$NON-NLS-1$
+	public static final String CHOICE_NONE = "CHOICE_NONE"; //$NON-NLS-1$
+
 	public CustomDiagramGeneralPreferencePage() {
 		setPreferenceStore(UMLDiagramEditorPlugin.getInstance().getPreferenceStore());
 		setPreferenceKey(SequenceDiagramEditPart.MODEL_ID);
 	}
-	
+
 	/**
-	 * Create new composite to contain the field editors 
+	 * Create new composite to contain the field editors
 	 *
 	 * @param parent
 	 *            the parent Composite that the field editors will be added to
@@ -81,6 +90,18 @@ public class CustomDiagramGeneralPreferencePage extends DiagramPreferencePage {
 		createFieldEditors(composite);
 		addField(executionSpecificationWithSyncMsg);
 		addField(executionSpecificationWithAsyncMsg);
+
+		Group otherGroup = new Group(parent, SWT.NONE);
+		otherGroup.setLayout(new GridLayout(2, false));
+		GridData otherGroupGridData = new GridData(GridData.FILL_HORIZONTAL);
+		otherGroupGridData.grabExcessHorizontalSpace = true;
+		otherGroupGridData.horizontalSpan = 2;
+		otherGroup.setLayoutData(otherGroupGridData);
+		otherGroup.setText(Messages.CustomDiagramGeneralPreferencePage_othersGroupLabel);
+
+		BooleanFieldEditor booleanFieldEditor = new BooleanFieldEditor(PREF_MOVE_ABOVE_MESSAGE, Messages.CustomDiagramGeneralPreferencePage_MoveMessageAboveDescription, otherGroup);
+		addField(booleanFieldEditor);
+
 	}
 
 	/**
@@ -90,27 +111,27 @@ public class CustomDiagramGeneralPreferencePage extends DiagramPreferencePage {
 	protected void createFieldEditors(Composite composite) {
 		// preference for choosing if and which execution specifications should be automatically created with synchronous message
 		// choice between behavior execution specification, action execution specification or nothing
-		executionSpecificationWithSyncMsg = new RadioGroupFieldEditor(PREF_EXECUTION_SPECIFICATION_SYNC_MSG, 
+		executionSpecificationWithSyncMsg = new RadioGroupFieldEditor(PREF_EXECUTION_SPECIFICATION_SYNC_MSG,
 				Messages.DiagramsPreferencePage_executionSpecificationWithSyncMsg_label, 1,
 				new String[][] {
 						{ Messages.DiagramsPreferencePage_createBehaviorExecutionSpecificationAndReply, CHOICE_BEHAVIOR_AND_REPLY },
-						{ Messages.DiagramsPreferencePage_createActionExecutionSpecificationAndReply, CHOICE_ACTION_AND_REPLY }, 
-						{ Messages.DiagramsPreferencePage_createBehaviorExecutionSpecification, CHOICE_BEHAVIOR }, 
-						{ Messages.DiagramsPreferencePage_createActionExecutionSpecification, CHOICE_ACTION }, 
+						{ Messages.DiagramsPreferencePage_createActionExecutionSpecificationAndReply, CHOICE_ACTION_AND_REPLY },
+						{ Messages.DiagramsPreferencePage_createBehaviorExecutionSpecification, CHOICE_BEHAVIOR },
+						{ Messages.DiagramsPreferencePage_createActionExecutionSpecification, CHOICE_ACTION },
 						{ Messages.DiagramsPreferencePage_createNoExecutionSpecification, CHOICE_NONE }
 				}, composite);
 
 		// preference for choosing if and which execution specifications should be automatically created with asynchronous message
 		// choice between behavior execution specification, action execution specification or nothing
-		executionSpecificationWithAsyncMsg = new RadioGroupFieldEditor(PREF_EXECUTION_SPECIFICATION_ASYNC_MSG, 
+		executionSpecificationWithAsyncMsg = new RadioGroupFieldEditor(PREF_EXECUTION_SPECIFICATION_ASYNC_MSG,
 				Messages.DiagramsPreferencePage_executionSpecificationWithAsyncMsg_label, 1,
 				new String[][] {
-						{ Messages.DiagramsPreferencePage_createBehaviorExecutionSpecification, CHOICE_BEHAVIOR }, 
-						{ Messages.DiagramsPreferencePage_createActionExecutionSpecification, CHOICE_ACTION }, 
+						{ Messages.DiagramsPreferencePage_createBehaviorExecutionSpecification, CHOICE_BEHAVIOR },
+						{ Messages.DiagramsPreferencePage_createActionExecutionSpecification, CHOICE_ACTION },
 						{ Messages.DiagramsPreferencePage_createNoExecutionSpecification, CHOICE_NONE }
 				}, composite);
 	}
-	
+
 	/**
 	 * Initializes the default preference values for this preference store.
 	 *
@@ -118,10 +139,12 @@ public class CustomDiagramGeneralPreferencePage extends DiagramPreferencePage {
 	 *            preferenceStore
 	 */
 	public static void initSpecificDefaults(IPreferenceStore preferenceStore) {
-		preferenceStore.setDefault(PREF_EXECUTION_SPECIFICATION_SYNC_MSG, 
+		preferenceStore.setDefault(PREF_EXECUTION_SPECIFICATION_SYNC_MSG,
 				CHOICE_BEHAVIOR_AND_REPLY);
-		preferenceStore.setDefault(PREF_EXECUTION_SPECIFICATION_ASYNC_MSG, 
-				CHOICE_NONE);		
+		preferenceStore.setDefault(PREF_EXECUTION_SPECIFICATION_ASYNC_MSG,
+				CHOICE_NONE);
+		preferenceStore.setDefault(PREF_MOVE_ABOVE_MESSAGE,
+				true);
 
-	}	
+	}
 }
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml
index 9fe9dc46ac0..33c6f7686ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/pom.xml
@@ -7,6 +7,6 @@
 	    <version>0.0.1-SNAPSHOT</version>

 	</parent>

 	<artifactId>org.eclipse.papyrus.uml.diagram.sequence</artifactId>

-	<version>4.1.0-SNAPSHOT</version>

+	<version>5.0.0-SNAPSHOT</version>

 	<packaging>eclipse-plugin</packaging>

 </project>
\ No newline at end of file
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
index 825a13715af..0351d4d3c2b 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.nattable.common;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.papyrus.infra.nattable;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.papyrus.uml.nattable.menu;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.junit.framework;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
index 20c13a9786d..4a385a5fcaf 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.tests;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",