404141: [Sequence Diagram] Migrate the sequence diagram from 0.9.2 (Juno) to 0.10 (Kepler)

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

Merge back modifications from 0.10 to the source 0.9 version

35 files changed, 127 insertions, 69 deletions

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 f70f71f7d88..410f36aa1ad 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
@@ -2,18 +2,24 @@ Manifest-Version: 1.0
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

  org.junit4;bundle-version="4.5.0",

- org.eclipse.papyrus.infra.core;bundle-version="0.9.2",

- org.eclipse.papyrus.editor;bundle-version="0.9.2",

+ org.eclipse.papyrus.infra.core;bundle-version="0.10.0",

+ org.eclipse.papyrus.editor;bundle-version="0.10.0",

  org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.2",

+ org.eclipse.papyrus.uml.diagram.common;bundle-version="0.10.0",

  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.9.2",

- org.eclipse.papyrus.diagram.tests;bundle-version="0.9.0",

- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="0.9.0"

+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="0.10.0",

+ org.eclipse.papyrus.diagram.tests;bundle-version="0.10.0",

+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="0.10.0",

+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.10.0",

+ org.eclipse.uml2.uml;bundle-version="4.1.0",

+ org.eclipse.papyrus.infra.services.edit;bundle-version="0.10.0",

+ org.eclipse.ui.ide;bundle-version="3.9.0",

+ org.eclipse.papyrus.infra.core.log;bundle-version="0.10.0",

+ org.eclipse.papyrus.uml.tools.utils;bundle-version="0.10.0"

 Export-Package: org.eclipse.papyrus.uml.diagram.sequence.tests

 Bundle-Vendor: %Bundle-Vendor

 Bundle-ActivationPolicy: lazy

-Bundle-Version: 0.9.2.qualifier

+Bundle-Version: 0.10.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.sequence.tests.Activ

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/build.properties b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/build.properties
index 5d7848ab179..e814f378e5c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/build.properties
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/build.properties
@@ -2,4 +2,6 @@ source.. = src/
 output.. = bin/

 bin.includes = META-INF/,\

                .,\

-               OSGI-INF/l10n/bundle.properties

+               OSGI-INF/,\

+               about.html

+src.includes = about.html

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestAdvancedDragDrop_364696.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestAdvancedDragDrop_364696.java
index f0810227a3d..52e6e2cc718 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestAdvancedDragDrop_364696.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestAdvancedDragDrop_364696.java
@@ -26,7 +26,12 @@ import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gef.commands.Command;

 import org.eclipse.gef.commands.UnexecutableCommand;

 import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.commands.ICreationCommand;

+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;

+import org.eclipse.papyrus.infra.core.resource.ModelSet;

+import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

 import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

 import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

@@ -54,22 +59,26 @@ public class TestAdvancedDragDrop_364696 extends TestTopNode {
 

 	private static final String UML_REPLACEMENT_TEMPLATE = "><nestedClassifier xmi:type=\"uml:Class\" xmi:id=\"_zAqbcIP8EeGnt9CMb_JfYQ\" name=\"Person\">" + "<ownedAttribute xmi:id=\"__-RhYIP8EeGnt9CMb_JfYQ\" name=\"company\" isStatic=\"true\" type=\"_6imi4IP8EeGnt9CMb_JfYQ\"/>" + "</nestedClassifier>" + "<nestedClassifier xmi:type=\"uml:Class\" xmi:id=\"_6imi4IP8EeGnt9CMb_JfYQ\" name=\"Company\">" + "<ownedAttribute xmi:type=\"uml:Port\" xmi:id=\"_1oQd4IP-EeGnt9CMb_JfYQ\" name=\"port1\">" + "<type xmi:type=\"uml:PrimitiveType\" href=\"pathmap://UML_METAMODELS/Ecore.metamodel.uml#EShort\"/>" + "</ownedAttribute>" + "<ownedAttribute xmi:id=\"_CVUmYIP_EeGnt9CMb_JfYQ\" name=\"Property1\">" + "<type xmi:type=\"uml:PrimitiveType\" href=\"pathmap://UML_METAMODELS/Ecore.metamodel.uml#EDouble\"/>" + "</ownedAttribute>" + "</nestedClassifier>" + "</packagedElement>" + "<packageImport xmi:id=\"_q19q4YP8EeGnt9CMb_JfYQ\">" + "<importedPackage xmi:type=\"uml:Model\" href=\"pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0\"/>" + "</packageImport>";

 

+	@Override

 	protected ICreationCommand getDiagramCommandCreation() {

 		return new CreateSequenceDiagramCommand();

 	}

 

+	@Override

 	protected void projectCreation() {

 		IWorkspace workspace = ResourcesPlugin.getWorkspace();

 		root = workspace.getRoot();

-		project = root.getProject("ClazzDiagramTestProject");

-		file = project.getFile("ClazzDiagramTest.di");

+		project = root.getProject("SequenceDiagramTestProject");

+		file = project.getFile("SequenceDiagramTest.di");

 		this.diResourceSet = new DiResourceSet();

 		try {

 			//at this point, no resources have been created

-			if(!project.exists())

+			if(!project.exists()) {

 				project.create(null);

-			if(!project.isOpen())

+			}

+			if(!project.isOpen()) {

 				project.open(null);

+			}

 

 			if(file.exists()) {

 				file.delete(true, new NullProgressMonitor());

@@ -78,10 +87,16 @@ public class TestAdvancedDragDrop_364696 extends TestTopNode {
 			if(!file.exists()) {

 				file.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());

 				diResourceSet.createsModels(file);

-				new CreateUMLModelCommand().createModel((DiResourceSet)this.diResourceSet);

-				// diResourceSet.createsModels(file);

+				new CreateUMLModelCommand().createModel(this.diResourceSet);

+				ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);

+				try {

+					registry.add(ModelSet.class, Integer.MAX_VALUE, diResourceSet); //High priority to override all contributions

+					registry.startRegistry();

+				} catch (ServiceException ex) {

+					//Ignore exceptions

+				}

 				ICreationCommand command = getDiagramCommandCreation();

-				command.createDiagram((DiResourceSet)diResourceSet, null, "DiagramToTest");

+				command.createDiagram(diResourceSet, null, "DiagramToTest");

 				diResourceSet.save(new NullProgressMonitor());

 

 			}

@@ -91,14 +106,14 @@ public class TestAdvancedDragDrop_364696 extends TestTopNode {
 			page.closeAllEditors(true);

 

 			IEditorDescriptor desc = PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor(file.getName());

-			page.openEditor(new FileEditorInput(file), desc.getId());

+			papyrusEditor = (IMultiDiagramEditor)page.openEditor(new FileEditorInput(file), desc.getId());

 		} catch (Exception e) {

 			System.err.println("error " + e);

 		}

 	}

 

 	protected void initUml() throws CoreException {

-		IFile uml = project.getFile("ClazzDiagramTest.uml");

+		IFile uml = project.getFile("SequenceDiagramTest.uml");

 		String content = FileUtil.read(uml.getContents());

 		content = content.replaceAll("/>", UML_REPLACEMENT_TEMPLATE);

 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java
index cfc12612a63..0d8d37cdc2c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentDeletion_364804.java
@@ -26,8 +26,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
 import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java
index 1a76e5b25ef..8b4376a5d75 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentGates_364816.java
@@ -28,7 +28,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message2EditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.Message6EditPart;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java
index e0a211bb212..2b2b637d0a2 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentKind_364710.java
@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java
index 530e5b1cc2c..345e7faa39e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentName_382951.java
@@ -24,7 +24,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

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

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConsiderIgnoreFragmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java
index 975bd4c582d..50a49862d0e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCombinedFragmentOperand_364701.java
@@ -31,8 +31,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
 import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java
index f3c9e9c6dfe..e563d3e87b9 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestCreationUndo_384618.java
@@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.CreateSequenceDiagramCommand;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionCombinedFragment_364813.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionCombinedFragment_364813.java
index 827e4596b86..c225b1b7a09 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionCombinedFragment_364813.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionCombinedFragment_364813.java
@@ -31,8 +31,13 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;

+import org.eclipse.papyrus.infra.core.resource.ModelSet;

+import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

 import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

@@ -66,22 +71,26 @@ public class TestDecompositionCombinedFragment_364813 extends TestTopNode {
 

 	private static final String UML_REPLACEMENT_TEMPLATE = "><nestedClassifier xmi:type=\"uml:Class\" xmi:id=\"_zAqbcIP8EeGnt9CMb_JfYQ\" name=\"Person\">" + "<ownedAttribute xmi:id=\"__-RhYIP8EeGnt9CMb_JfYQ\" name=\"company\" isStatic=\"true\" type=\"_6imi4IP8EeGnt9CMb_JfYQ\"/>" + "</nestedClassifier>" + "<nestedClassifier xmi:type=\"uml:Class\" xmi:id=\"_6imi4IP8EeGnt9CMb_JfYQ\" name=\"Company\">" + "<ownedAttribute xmi:type=\"uml:Port\" xmi:id=\"_1oQd4IP-EeGnt9CMb_JfYQ\" name=\"port1\">" + "<type xmi:type=\"uml:PrimitiveType\" href=\"pathmap://UML_METAMODELS/Ecore.metamodel.uml#EShort\"/>" + "</ownedAttribute>" + "<ownedAttribute xmi:id=\"_CVUmYIP_EeGnt9CMb_JfYQ\" name=\"Property1\">" + "<type xmi:type=\"uml:PrimitiveType\" href=\"pathmap://UML_METAMODELS/Ecore.metamodel.uml#EDouble\"/>" + "</ownedAttribute>" + "</nestedClassifier>" + "</packagedElement>" + "<packageImport xmi:id=\"_q19q4YP8EeGnt9CMb_JfYQ\">" + "<importedPackage xmi:type=\"uml:Model\" href=\"pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0\"/>" + "</packageImport>";

 

+	@Override

 	protected ICreationCommand getDiagramCommandCreation() {

 		return new CreateSequenceDiagramCommand();

 	}

 

+	@Override

 	protected void projectCreation() {

 		IWorkspace workspace = ResourcesPlugin.getWorkspace();

 		root = workspace.getRoot();

-		project = root.getProject("ClazzDiagramTestProject");

-		file = project.getFile("ClazzDiagramTest.di");

+		project = root.getProject("SequenceDiagramTestProject");

+		file = project.getFile("SequenceDiagramTest.di");

 		this.diResourceSet = new DiResourceSet();

 		try {

 			//at this point, no resources have been created

-			if(!project.exists())

+			if(!project.exists()) {

 				project.create(null);

-			if(!project.isOpen())

+			}

+			if(!project.isOpen()) {

 				project.open(null);

+			}

 

 			if(file.exists()) {

 				file.delete(true, new NullProgressMonitor());

@@ -90,11 +99,17 @@ public class TestDecompositionCombinedFragment_364813 extends TestTopNode {
 			if(!file.exists()) {

 				file.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());

 				diResourceSet.createsModels(file);

-				new CreateUMLModelCommand().createModel((DiResourceSet)this.diResourceSet);

+				new CreateUMLModelCommand().createModel(this.diResourceSet);

+				ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);

+				try {

+					registry.add(ModelSet.class, Integer.MAX_VALUE, diResourceSet); //High priority to override all contributions

+					registry.startRegistry();

+				} catch (ServiceException ex) {

+					//Ignore exceptions

+				}

 				ICreationCommand command = getDiagramCommandCreation();

-				command.createDiagram((DiResourceSet)diResourceSet, null, "DiagramToTest");

+				command.createDiagram(diResourceSet, null, "DiagramToTest");

 				diResourceSet.save(new NullProgressMonitor());

-

 			}

 			initUml();

 

@@ -102,14 +117,14 @@ public class TestDecompositionCombinedFragment_364813 extends TestTopNode {
 			page.closeAllEditors(true);

 

 			IEditorDescriptor desc = PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor(file.getName());

-			page.openEditor(new FileEditorInput(file), desc.getId());

+			papyrusEditor = (IMultiDiagramEditor)page.openEditor(new FileEditorInput(file), desc.getId());

 		} catch (Exception e) {

 			System.err.println("error " + e);

 		}

 	}

 

 	protected void initUml() throws CoreException {

-		IFile uml = project.getFile("ClazzDiagramTest.uml");

+		IFile uml = project.getFile("SequenceDiagramTest.uml");

 		String content = FileUtil.read(uml.getContents());

 		content = content.replaceAll("/>", UML_REPLACEMENT_TEMPLATE);

 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionMove_364812.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionMove_364812.java
index 9945fb60fdf..b1b264a5479 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionMove_364812.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDecompositionMove_364812.java
@@ -37,9 +37,14 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
 import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.infra.core.editor.IMultiDiagramEditor;

+import org.eclipse.papyrus.infra.core.resource.ModelSet;

+import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;

+import org.eclipse.papyrus.infra.core.services.ServiceException;

+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;

 import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

@@ -73,22 +78,26 @@ public class TestDecompositionMove_364812 extends TestTopNode {
 

 	private static final String CHANGE_REPRESENTS = "Change Represents: ";

 

+	@Override

 	protected ICreationCommand getDiagramCommandCreation() {

 		return new CreateSequenceDiagramCommand();

 	}

 

+	@Override

 	protected void projectCreation() {

 		IWorkspace workspace = ResourcesPlugin.getWorkspace();

 		root = workspace.getRoot();

-		project = root.getProject("ClazzDiagramTestProject");

-		file = project.getFile("ClazzDiagramTest.di");

+		project = root.getProject("SequenceDiagramTestProject");

+		file = project.getFile("SequenceDiagramTest.di");

 		this.diResourceSet = new DiResourceSet();

 		try {

 			//at this point, no resources have been created

-			if(!project.exists())

+			if(!project.exists()) {

 				project.create(null);

-			if(!project.isOpen())

+			}

+			if(!project.isOpen()) {

 				project.open(null);

+			}

 

 			if(file.exists()) {

 				file.delete(true, new NullProgressMonitor());

@@ -97,9 +106,16 @@ public class TestDecompositionMove_364812 extends TestTopNode {
 			if(!file.exists()) {

 				file.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());

 				diResourceSet.createsModels(file);

-				new CreateUMLModelCommand().createModel((DiResourceSet)this.diResourceSet);

+				new CreateUMLModelCommand().createModel(this.diResourceSet);

+				ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);

+				try {

+					registry.add(ModelSet.class, Integer.MAX_VALUE, diResourceSet); //High priority to override all contributions

+					registry.startRegistry();

+				} catch (ServiceException ex) {

+					//Ignore exceptions

+				}

 				ICreationCommand command = getDiagramCommandCreation();

-				command.createDiagram((DiResourceSet)diResourceSet, null, "DiagramToTest");

+				command.createDiagram(diResourceSet, null, "DiagramToTest");

 				diResourceSet.save(new NullProgressMonitor());

 

 			}

@@ -109,14 +125,14 @@ public class TestDecompositionMove_364812 extends TestTopNode {
 			page.closeAllEditors(true);

 

 			IEditorDescriptor desc = PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor(file.getName());

-			page.openEditor(new FileEditorInput(file), desc.getId());

+			papyrusEditor = (IMultiDiagramEditor)page.openEditor(new FileEditorInput(file), desc.getId());

 		} catch (Exception e) {

 			System.err.println("error " + e);

 		}

 	}

 

 	protected void initUml() throws CoreException {

-		IFile uml = project.getFile("ClazzDiagramTest.uml");

+		IFile uml = project.getFile("SequenceDiagramTest.uml");

 		String content = FileUtil.read(uml.getContents());

 		content = content.replaceAll("/>", UML_REPLACEMENT_TEMPLATE);

 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java
index e4522972aa9..ee36d00d5b1 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDestructionNode_384201.java
@@ -26,8 +26,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DestructionOccurrenceSpecificationEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java
index 5e2e38fff55..51eeb449754 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestDurationConstraints_384596.java
@@ -29,7 +29,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

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

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.DurationConstraintLabelEditPart;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java
index ce340da22bb..3a465168098 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestExecutionSpecificationDimension_384572.java
@@ -26,8 +26,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.CreateSequenceDiagramCommand;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java
index 6bae61e96a6..3388ab62fb0 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestGuardEdition_364808.java
@@ -27,8 +27,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java
index b598b43be91..60196cef7f0 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestInteractionConstraint_382966.java
@@ -32,8 +32,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
 import org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java
index add09e06b62..09b162046e6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAlignment_364688.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.CreateSequenceDiagramCommand;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java
index 136169d7091..0709eb3eeda 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineAutoResize_383723.java
@@ -43,9 +43,9 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
 import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java
index bcd4a5788a4..1a6148c07d4 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestLifelineLabelCustomize_383722.java
@@ -36,8 +36,8 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

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

 import org.eclipse.jface.preference.IPreferenceStore;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.infra.core.utils.DiResourceSet;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java
index 47b5a9b7cfd..f1b67a4e91f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageCreate_379661.java
@@ -30,8 +30,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.CreateSequenceDiagramCommand;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java
index f84d1d5d745..0778d383d3d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageEndConstraint_364817.java
@@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractMessageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ConstraintEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.MessageEndEditPart;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java
index 7e8f4790f6b..94ffff0bba8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessageLostFound_384202.java
@@ -38,7 +38,7 @@ import org.eclipse.gmf.runtime.notation.Anchor;
 import org.eclipse.gmf.runtime.notation.Edge;

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

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

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractMessageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java
index 579b7cbcd46..6c444d8357c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMessagesDeletion_364828.java
@@ -29,8 +29,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractExecutionSpecificationEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java
index c6fef38d99e..ebd18da07eb 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestMovingCombinedFragment_364711.java
@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java
index 72c91032214..70ad503e4c3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedCombinedFragment_364795.java
@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
 import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionOperandEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java
index 4c52546a529..6b6c1be6366 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestNestedExecution_384616.java
@@ -30,8 +30,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;
 import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.CreateSequenceDiagramCommand;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java
index 5c28d20d4e8..ec9c26cb8de 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestObservationLink_364826.java
@@ -46,8 +46,8 @@ import org.eclipse.gmf.runtime.notation.Anchor;
 import org.eclipse.gmf.runtime.notation.Edge;

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

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

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.ObservationLinkMetamodelType;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractMessageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java
index 8a444ab3ad9..24e37fd0a22 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestParentBarAutoresize_385603.java
@@ -26,8 +26,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.papyrus.uml.diagram.sequence.tests.canonical.CreateSequenceDiagramCommand;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java
index 3c1ffcd0ee1..54607629999 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/TestSynchronousMessageCreation_364827.java
@@ -28,7 +28,7 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;

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

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractMessageEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.ActionExecutionSpecificationEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.BehaviorExecutionSpecificationEditPart;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java
index 6a81431a439..bcdfa944e30 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestCombinedFragmentChildNode.java
@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.CombinedFragmentCombinedFragmentCompartmentEditPart;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestLink.java
index efddb5cb893..35fdb4f9dd5 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestLink.java
@@ -190,7 +190,7 @@ public abstract class TestLink extends AbstractPapyrusTestCase {
 	 * @return the editing domain (can be null)

 	 */

 	protected TransactionalEditingDomain getEditingDomain() {

-		ServiceUtilsForActionHandlers serviceUtils = new ServiceUtilsForActionHandlers();

+		ServiceUtilsForActionHandlers serviceUtils = ServiceUtilsForActionHandlers.getInstance();

 		TransactionalEditingDomain editingDomain = null;

 		try {

 			editingDomain = serviceUtils.getTransactionalEditingDomain();

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramChildNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramChildNode.java
index d0434720167..99e802860dc 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramChildNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramChildNode.java
@@ -24,8 +24,8 @@ import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest;
 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

 import org.eclipse.gmf.runtime.diagram.ui.requests.EditCommandRequestWrapper;

 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.commands.wrappers.GEFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

 import org.eclipse.uml2.uml.ActionExecutionSpecification;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramLink.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramLink.java
index 08b7fdd4cea..5bb97847d74 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramLink.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramLink.java
@@ -23,7 +23,7 @@ import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;

 import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

 import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.AbstractExecutionSpecificationEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.InteractionEditPart;

 import org.eclipse.papyrus.uml.diagram.sequence.edit.parts.LifelineEditPart;

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramTopNode.java
index f382b81a928..245258a6732 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramTopNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestSequenceDiagramTopNode.java
@@ -14,9 +14,8 @@
 package org.eclipse.papyrus.uml.diagram.sequence.tests.canonical;

 

 import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart;

-import org.eclipse.papyrus.infra.core.extension.commands.ICreationCommand;

+import org.eclipse.papyrus.commands.ICreationCommand;

 import org.eclipse.papyrus.uml.diagram.sequence.providers.UMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.sequence.tests.bug.PopupUtil;

 import org.eclipse.uml2.uml.Element;

 import org.junit.Test;

 

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestTopNode.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestTopNode.java
index b7fbd528364..20ebe1af1ab 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestTopNode.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/canonical/TestTopNode.java
@@ -61,10 +61,12 @@ public abstract class TestTopNode extends AbstractPapyrusTestCase {
 		return rootPart;

 	}

 

+	@Override

 	protected View getRootView() {

 		return getRootEditPart().getNotationView();

 	}

 

+	@Override

 	protected Element getRootSemanticModel() {

 		return (Element)getRootView().getElement();

 	}

@@ -85,11 +87,13 @@ public abstract class TestTopNode extends AbstractPapyrusTestCase {
 		return (Package)container;

 	}

 

+	@Override

 	protected void setUp() throws Exception {

 		super.setUp();

 	}

 

 

+	@Override

 	protected void tearDown() throws Exception {

 		super.tearDown();

 	}

@@ -188,7 +192,7 @@ public abstract class TestTopNode extends AbstractPapyrusTestCase {
 	 * @return the editing domain (can be null)

 	 */

 	protected TransactionalEditingDomain getEditingDomain() {

-		ServiceUtilsForActionHandlers serviceUtils = new ServiceUtilsForActionHandlers();

+		ServiceUtilsForActionHandlers serviceUtils = ServiceUtilsForActionHandlers.getInstance();

 		TransactionalEditingDomain editingDomain = null;

 		try {

 			editingDomain = serviceUtils.getTransactionalEditingDomain();

@@ -240,8 +244,9 @@ public abstract class TestTopNode extends AbstractPapyrusTestCase {
 	 * @param provider

 	 */

 	public void testDrop(IElementType type, ITestProvider provider) {

-		if(provider.getDropElement() == null)

+		if(provider.getDropElement() == null) {

 			return;

+		}

 		//DROP

 		assertTrue(DROP + INITIALIZATION_TEST, provider.getEditPartChildrenSize() == 0);

 		assertTrue(DROP + INITIALIZATION_TEST, provider.getSemanticChildrenSize() == 1);