Initial cut of a model export wizard (repository -> workspace).

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

4 files changed, 129 insertions, 166 deletions

diff --git a/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ManyToOneModelImportMappingTest.java b/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ManyToOneModelImportMappingTest.java
index fe8c65ba289..41adc0811a7 100644
--- a/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ManyToOneModelImportMappingTest.java
+++ b/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ManyToOneModelImportMappingTest.java
@@ -21,11 +21,11 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.cdo.core.importer.IModelImportConfiguration;
 import org.eclipse.papyrus.cdo.core.importer.IModelImportMapping;
-import org.eclipse.papyrus.cdo.core.importer.IModelImportNode;
-import org.eclipse.papyrus.cdo.core.importer.IModelImportOperation;
-import org.eclipse.papyrus.cdo.core.importer.ModelImportMappingListenerAdapter;
+import org.eclipse.papyrus.cdo.core.importer.IModelTransferConfiguration;
+import org.eclipse.papyrus.cdo.core.importer.IModelTransferNode;
+import org.eclipse.papyrus.cdo.core.importer.IModelTransferOperation;
+import org.eclipse.papyrus.cdo.core.importer.ModelTransferMappingListenerAdapter;
 import org.eclipse.papyrus.cdo.core.tests.AbstractPapyrusCDOTest;
 import org.eclipse.papyrus.cdo.core.tests.TestProject;
 import org.junit.After;
@@ -39,10 +39,9 @@ import com.google.common.collect.Sets;
 /**
  * This is the ManyToOneModelImportMappingTest type. Enjoy.
  */
-public class ManyToOneModelImportMappingTest
-		extends AbstractPapyrusCDOTest {
+public class ManyToOneModelImportMappingTest extends AbstractPapyrusCDOTest {
 
-	private IModelImportConfiguration config;
+	private IModelTransferConfiguration config;
 
 	private IModelImportMapping fixture;
 
@@ -61,13 +60,11 @@ public class ManyToOneModelImportMappingTest
 		URI uri1 = hasDependencies.getResourceURI("model.di");
 		URI uri2 = hasDependents.getResourceURI("Datatypes.di");
 
-		config.addModelToImport(uri1);
-		config.addModelToImport(uri2);
+		config.addModelToTransfer(uri1);
+		config.addModelToTransfer(uri2);
 
-		assertThat(fixture.getMapping(getNode(uri1)), is((IPath) new Path(
-			"/has_dependencies/model.di")));
-		assertThat(fixture.getMapping(getNode(uri2)), is((IPath) new Path(
-			"/has_dependencies/model.di")));
+		assertThat(fixture.getMapping(getNode(uri1)), is((IPath)new Path("/has_dependencies/model.di")));
+		assertThat(fixture.getMapping(getNode(uri2)), is((IPath)new Path("/has_dependencies/model.di")));
 	}
 
 	@Test
@@ -75,27 +72,25 @@ public class ManyToOneModelImportMappingTest
 		URI uri1 = hasDependencies.getResourceURI("model.di");
 		URI uri2 = hasDependents.getResourceURI("Datatypes.di");
 
-		config.addModelToImport(uri1);
-		config.addModelToImport(uri2);
+		config.addModelToTransfer(uri1);
+		config.addModelToTransfer(uri2);
 
-		class Test
-				extends ModelImportMappingListenerAdapter {
+		class Test extends ModelTransferMappingListenerAdapter {
 
-			Set<IModelImportNode> notified = Sets.newHashSet();
+			Set<IModelTransferNode> notified = Sets.newHashSet();
 
 			@Override
-			public void modelImportMappingChanged(IModelImportNode node) {
+			public void modelTransferMappingChanged(IModelTransferNode node) {
 				notified.add(node);
 			}
 		}
 		Test test = new Test();
-		fixture.addModelImportMappingListener(test);
+		fixture.addModelTransferMappingListener(test);
 
 		IPath path = new Path("/myfolder/MyModel.di");
 		fixture.mapTo(getNode(uri1), path);
 
-		assertThat(test.notified, is((Set<IModelImportNode>) ImmutableSet.of(
-			getNode(uri1), getNode(uri2))));
+		assertThat(test.notified, is((Set<IModelTransferNode>)ImmutableSet.of(getNode(uri1), getNode(uri2))));
 
 		assertThat(fixture.getMapping(getNode(uri1)), is(path));
 		assertThat(fixture.getMapping(getNode(uri2)), is(path));
@@ -107,14 +102,13 @@ public class ManyToOneModelImportMappingTest
 
 	@Before
 	public void createTestFixture() {
-		config = IModelImportConfiguration.Factory.DEFAULT
-			.create(new IModelImportOperation.Context() {
+		config = IModelTransferConfiguration.Factory.IMPORT.create(new IModelTransferOperation.Context() {
 
-				public Diagnostic run(IModelImportOperation operation) {
-					operation.run(new NullProgressMonitor());
-					return Diagnostic.OK_INSTANCE;
-				}
-			});
+			public Diagnostic run(IModelTransferOperation operation) {
+				operation.run(new NullProgressMonitor());
+				return Diagnostic.OK_INSTANCE;
+			}
+		}, null);
 
 		fixture = IModelImportMapping.Factory.MANY_TO_ONE.create(config);
 		fixture.setRepository(getPapyrusRepository());
@@ -128,11 +122,11 @@ public class ManyToOneModelImportMappingTest
 		config = null;
 	}
 
-	IModelImportNode getNode(URI uri) {
-		IModelImportNode result = null;
+	IModelTransferNode getNode(URI uri) {
+		IModelTransferNode result = null;
 
-		for (IModelImportNode next : config.getModelsToImport()) {
-			if (next.getPrimaryResourceURI().equals(uri)) {
+		for(IModelTransferNode next : config.getModelsToTransfer()) {
+			if(next.getPrimaryResourceURI().equals(uri)) {
 				result = next;
 				break;
 			}
diff --git a/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImportConfigurationTest.java b/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImportConfigurationTest.java
index 495168cff3a..44ca8e1e597 100644
--- a/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImportConfigurationTest.java
+++ b/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImportConfigurationTest.java
@@ -19,9 +19,9 @@ import static org.junit.matchers.JUnitMatchers.hasItem;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.cdo.core.importer.IModelImportConfiguration;
-import org.eclipse.papyrus.cdo.core.importer.IModelImportNode;
-import org.eclipse.papyrus.cdo.core.importer.IModelImportOperation;
+import org.eclipse.papyrus.cdo.core.importer.IModelTransferConfiguration;
+import org.eclipse.papyrus.cdo.core.importer.IModelTransferNode;
+import org.eclipse.papyrus.cdo.core.importer.IModelTransferOperation;
 import org.eclipse.papyrus.cdo.core.tests.TestProject;
 import org.junit.After;
 import org.junit.Before;
@@ -35,7 +35,7 @@ import com.google.common.collect.Iterables;
  */
 public class ModelImportConfigurationTest {
 
-	private IModelImportConfiguration fixture;
+	private IModelTransferConfiguration fixture;
 
 	@Rule
 	public TestProject isolated = new TestProject("isolated");
@@ -54,11 +54,10 @@ public class ModelImportConfigurationTest {
 	public void testIsolatedModel() {
 		URI uri = isolated.getResourceURI("model.di");
 
-		fixture.addModelToImport(uri);
+		fixture.addModelToTransfer(uri);
 
-		assertThat(fixture.getModelsToImport().size(), is(1));
-		IModelImportNode node = Iterables.getOnlyElement(fixture
-			.getModelsToImport());
+		assertThat(fixture.getModelsToTransfer().size(), is(1));
+		IModelTransferNode node = Iterables.getOnlyElement(fixture.getModelsToTransfer());
 
 		assertThat(node.getPrimaryResourceURI(), is(uri));
 		assertThat(node.getDependencies().size(), is(0));
@@ -74,18 +73,16 @@ public class ModelImportConfigurationTest {
 	public void testModelHavingDependencies() {
 		URI uri = hasDependencies.getResourceURI("model.di");
 
-		fixture.addModelToImport(uri);
+		fixture.addModelToTransfer(uri);
 
-		assertThat(fixture.getModelsToImport().size(), is(1));
-		IModelImportNode node = Iterables.getOnlyElement(fixture
-			.getModelsToImport());
+		assertThat(fixture.getModelsToTransfer().size(), is(1));
+		IModelTransferNode node = Iterables.getOnlyElement(fixture.getModelsToTransfer());
 
 		assertThat(node.getPrimaryResourceURI(), is(uri));
 
 		assertThat(node.getDependencies().size(), is(1));
-		IModelImportNode dep = Iterables.getOnlyElement(node.getDependencies());
-		assertThat(dep.getPrimaryResourceURI(),
-			is(hasDependents.getResourceURI("Datatypes.di")));
+		IModelTransferNode dep = Iterables.getOnlyElement(node.getDependencies());
+		assertThat(dep.getPrimaryResourceURI(), is(hasDependents.getResourceURI("Datatypes.di")));
 
 		assertThat(node.getDependents().size(), is(0));
 
@@ -99,20 +96,18 @@ public class ModelImportConfigurationTest {
 	public void testModelHavingDependents() {
 		URI uri = hasDependents.getResourceURI("Datatypes.di");
 
-		fixture.addModelToImport(uri);
+		fixture.addModelToTransfer(uri);
 
-		assertThat(fixture.getModelsToImport().size(), is(1));
-		IModelImportNode node = Iterables.getOnlyElement(fixture
-			.getModelsToImport());
+		assertThat(fixture.getModelsToTransfer().size(), is(1));
+		IModelTransferNode node = Iterables.getOnlyElement(fixture.getModelsToTransfer());
 
 		assertThat(node.getPrimaryResourceURI(), is(uri));
 
 		assertThat(node.getDependencies().size(), is(0));
 
 		assertThat(node.getDependents().size(), is(1));
-		IModelImportNode dep = Iterables.getOnlyElement(node.getDependents());
-		assertThat(dep.getPrimaryResourceURI(),
-			is(hasDependencies.getResourceURI("model.di")));
+		IModelTransferNode dep = Iterables.getOnlyElement(node.getDependents());
+		assertThat(dep.getPrimaryResourceURI(), is(hasDependencies.getResourceURI("model.di")));
 
 		assertThat(node.getResourceURIs().size(), is(3));
 		assertThat(node.getResourceURIs(), hasItem(uri));
@@ -124,21 +119,20 @@ public class ModelImportConfigurationTest {
 	public void testValidationOfDependents() {
 		URI uri = hasDependents.getResourceURI("Datatypes.di");
 
-		fixture.addModelToImport(uri);
+		fixture.addModelToTransfer(uri);
 
-		assertThat(fixture.getModelsToImport().size(), is(1));
-		IModelImportNode node = Iterables.getOnlyElement(fixture
-			.getModelsToImport());
+		assertThat(fixture.getModelsToTransfer().size(), is(1));
+		IModelTransferNode node = Iterables.getOnlyElement(fixture.getModelsToTransfer());
 
 		Diagnostic problems = fixture.validate();
 
 		assertThat(problems.getChildren().size(), is(1));
 		Diagnostic child = problems.getChildren().get(0);
 		assertThat(child.getSeverity(), is(Diagnostic.WARNING));
-		assertThat(child.getData().get(0), sameInstance((Object) node));
-		assertThat(child.getData().get(1), is((Object) node.getDependents()));
+		assertThat(child.getData().get(0), sameInstance((Object)node));
+		assertThat(child.getData().get(1), is((Object)node.getDependents()));
 
-		fixture.addModelToImport(hasDependencies.getResourceURI("model.di"));
+		fixture.addModelToTransfer(hasDependencies.getResourceURI("model.di"));
 
 		problems = fixture.validate();
 
@@ -150,21 +144,20 @@ public class ModelImportConfigurationTest {
 	public void testValidationOfDependencies() {
 		URI uri = hasDependencies.getResourceURI("model.di");
 
-		fixture.addModelToImport(uri);
+		fixture.addModelToTransfer(uri);
 
-		assertThat(fixture.getModelsToImport().size(), is(1));
-		IModelImportNode node = Iterables.getOnlyElement(fixture
-			.getModelsToImport());
+		assertThat(fixture.getModelsToTransfer().size(), is(1));
+		IModelTransferNode node = Iterables.getOnlyElement(fixture.getModelsToTransfer());
 
 		Diagnostic problems = fixture.validate();
 
 		assertThat(problems.getChildren().size(), is(1));
 		Diagnostic child = problems.getChildren().get(0);
 		assertThat(child.getSeverity(), is(Diagnostic.INFO));
-		assertThat(child.getData().get(0), sameInstance((Object) node));
-		assertThat(child.getData().get(1), is((Object) node.getDependencies()));
+		assertThat(child.getData().get(0), sameInstance((Object)node));
+		assertThat(child.getData().get(1), is((Object)node.getDependencies()));
 
-		fixture.addModelToImport(hasDependents.getResourceURI("Datatypes.di"));
+		fixture.addModelToTransfer(hasDependents.getResourceURI("Datatypes.di"));
 
 		problems = fixture.validate();
 
@@ -178,14 +171,13 @@ public class ModelImportConfigurationTest {
 
 	@Before
 	public void createTestFixture() {
-		fixture = IModelImportConfiguration.Factory.DEFAULT
-			.create(new IModelImportOperation.Context() {
-
-				public Diagnostic run(IModelImportOperation operation) {
-					operation.run(new NullProgressMonitor());
-					return Diagnostic.OK_INSTANCE;
-				}
-			});
+		fixture = IModelTransferConfiguration.Factory.IMPORT.create(new IModelTransferOperation.Context() {
+
+			public Diagnostic run(IModelTransferOperation operation) {
+				operation.run(new NullProgressMonitor());
+				return Diagnostic.OK_INSTANCE;
+			}
+		}, null);
 	}
 
 	@After
diff --git a/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java b/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java
index adfb537db17..f5a291602ee 100644
--- a/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java
+++ b/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/ModelImporterTest.java
@@ -30,10 +30,10 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.cdo.core.importer.IModelImportConfiguration;
 import org.eclipse.papyrus.cdo.core.importer.IModelImportMapping;
-import org.eclipse.papyrus.cdo.core.importer.IModelImportOperation;
 import org.eclipse.papyrus.cdo.core.importer.IModelImporter;
+import org.eclipse.papyrus.cdo.core.importer.IModelTransferConfiguration;
+import org.eclipse.papyrus.cdo.core.importer.IModelTransferOperation;
 import org.eclipse.papyrus.cdo.core.tests.AbstractPapyrusCDOTest;
 import org.eclipse.papyrus.cdo.core.tests.TestProject;
 import org.eclipse.papyrus.infra.core.sashwindows.di.DiPackage;
@@ -50,10 +50,9 @@ import com.google.common.io.CharStreams;
 /**
  * This is the ModelImporterTest type. Enjoy.
  */
-public class ModelImporterTest
-		extends AbstractPapyrusCDOTest {
+public class ModelImporterTest extends AbstractPapyrusCDOTest {
 
-	private IModelImportConfiguration config;
+	private IModelTransferConfiguration config;
 
 	private IModelImporter fixture;
 
@@ -72,11 +71,10 @@ public class ModelImporterTest
 		URI uri1 = hasDependencies.getResourceURI("model.di");
 		URI uri2 = hasDependents.getResourceURI("Datatypes.di");
 
-		config.addModelToImport(uri1);
-		config.addModelToImport(uri2);
+		config.addModelToTransfer(uri1);
+		config.addModelToTransfer(uri2);
 
-		IModelImportMapping mapping = IModelImportMapping.Factory.ONE_TO_ONE
-			.create(config);
+		IModelImportMapping mapping = IModelImportMapping.Factory.ONE_TO_ONE.create(config);
 		mapping.setRepository(getPapyrusRepository());
 
 		Diagnostic problems = fixture.importModels(mapping);
@@ -100,14 +98,12 @@ public class ModelImporterTest
 		URI uri1 = hasDependencies.getResourceURI("model.di");
 		URI uri2 = hasDependents.getResourceURI("Datatypes.di");
 
-		config.addModelToImport(uri1);
-		config.addModelToImport(uri2);
+		config.addModelToTransfer(uri1);
+		config.addModelToTransfer(uri2);
 
-		IModelImportMapping mapping = IModelImportMapping.Factory.MANY_TO_ONE
-			.create(config);
+		IModelImportMapping mapping = IModelImportMapping.Factory.MANY_TO_ONE.create(config);
 		mapping.setRepository(getPapyrusRepository());
-		mapping.mapTo(Iterables.get(config.getModelsToImport(), 0), new Path(
-			"my_import/combined.di"));
+		mapping.mapTo(Iterables.get(config.getModelsToTransfer(), 0), new Path("my_import/combined.di"));
 
 		Diagnostic problems = fixture.importModels(mapping);
 		assertThat(problems.getSeverity(), is(Diagnostic.OK));
@@ -118,12 +114,9 @@ public class ModelImporterTest
 
 		assertResource(view.getResource("my_import/combined.di"), "di", 1);
 		assertResource(view.getResource("my_import/combined.uml"), "uml", 2);
-		assertResource(view.getResource("my_import/combined.notation"),
-			"notation", 2);
+		assertResource(view.getResource("my_import/combined.notation"), "notation", 2);
 
-		SashWindowsMngr mngr = (SashWindowsMngr) EcoreUtil.getObjectByType(view
-			.getResource("my_import/combined.di").getContents(),
-			DiPackage.Literals.SASH_WINDOWS_MNGR);
+		SashWindowsMngr mngr = (SashWindowsMngr)EcoreUtil.getObjectByType(view.getResource("my_import/combined.di").getContents(), DiPackage.Literals.SASH_WINDOWS_MNGR);
 		assertThat(mngr.getSashModel().getWindows().size(), is(2));
 		assertThat(mngr.getPageList().getAvailablePage().size(), is(3));
 	}
@@ -134,27 +127,22 @@ public class ModelImporterTest
 	 * imported, now reference the imported resources.
 	 */
 	@Test
-	public void testWorkspaceResourcesURIsUpdated()
-			throws Exception {
+	public void testWorkspaceResourcesURIsUpdated() throws Exception {
 
-		config.addModelToImport(hasDependents.getResourceURI("Datatypes.di"));
+		config.addModelToTransfer(hasDependents.getResourceURI("Datatypes.di"));
 
-		IModelImportMapping mapping = IModelImportMapping.Factory.ONE_TO_ONE
-			.create(config);
+		IModelImportMapping mapping = IModelImportMapping.Factory.ONE_TO_ONE.create(config);
 		mapping.setRepository(getPapyrusRepository());
 
 		fixture.importModels(mapping);
 
 		IFile notImported = hasDependencies.getFile("model.uml");
-		Reader reader = new InputStreamReader(notImported.getContents(),
-			notImported.getCharset());
+		Reader reader = new InputStreamReader(notImported.getContents(), notImported.getCharset());
 		String text = CharStreams.toString(reader);
 		reader.close();
 
-		assertThat(text,
-			not(containsString("href=\"../has_dependents/Datatypes.uml")));
-		assertThat(text,
-			containsString("href=\"cdo://MEM/has_dependents/Datatypes.uml"));
+		assertThat(text, not(containsString("href=\"../has_dependents/Datatypes.uml")));
+		assertThat(text, containsString("href=\"cdo://MEM/has_dependents/Datatypes.uml"));
 	}
 
 	//
@@ -163,14 +151,13 @@ public class ModelImporterTest
 
 	@Before
 	public void createTestFixture() {
-		config = IModelImportConfiguration.Factory.DEFAULT
-			.create(new IModelImportOperation.Context() {
+		config = IModelTransferConfiguration.Factory.IMPORT.create(new IModelTransferOperation.Context() {
 
-				public Diagnostic run(IModelImportOperation operation) {
-					operation.run(new NullProgressMonitor());
-					return Diagnostic.OK_INSTANCE;
-				}
-			});
+			public Diagnostic run(IModelTransferOperation operation) {
+				operation.run(new NullProgressMonitor());
+				return Diagnostic.OK_INSTANCE;
+			}
+		}, null);
 
 		fixture = IModelImporter.Factory.DEFAULT.create();
 	}
@@ -184,7 +171,7 @@ public class ModelImporterTest
 	}
 
 	void sleep(int seconds) {
-		for (int i = 0; i < seconds; i++) {
+		for(int i = 0; i < seconds; i++) {
 			try {
 				Thread.sleep(1000);
 			} catch (Exception e) {
@@ -201,19 +188,18 @@ public class ModelImporterTest
 	void assertResource(Resource resource, final String metamodel, int count) {
 		assertResource(resource);
 
-		assertThat(Iterables.size(Iterables.filter(resource.getContents(),
-			new Predicate<EObject>() {
-
-				public boolean apply(EObject input) {
-					boolean result = false;
+		assertThat(Iterables.size(Iterables.filter(resource.getContents(), new Predicate<EObject>() {
 
-					if (input != null) {
-						EPackage epackage = input.eClass().getEPackage();
-						result = epackage.getName().equalsIgnoreCase(metamodel);
-					}
+			public boolean apply(EObject input) {
+				boolean result = false;
 
-					return result;
+				if(input != null) {
+					EPackage epackage = input.eClass().getEPackage();
+					result = epackage.getName().equalsIgnoreCase(metamodel);
 				}
-			})), is(count));
+
+				return result;
+			}
+		})), is(count));
 	}
 }
diff --git a/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/OneToOneModelImportMappingTest.java b/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/OneToOneModelImportMappingTest.java
index 1bf0e3efab1..ead25f4d24e 100644
--- a/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/OneToOneModelImportMappingTest.java
+++ b/tests/cdo/org.eclipse.papyrus.cdo.core.tests/src/org/eclipse/papyrus/cdo/internal/core/importer/tests/OneToOneModelImportMappingTest.java
@@ -22,10 +22,10 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.cdo.core.importer.IModelImportConfiguration;
 import org.eclipse.papyrus.cdo.core.importer.IModelImportMapping;
-import org.eclipse.papyrus.cdo.core.importer.IModelImportNode;
-import org.eclipse.papyrus.cdo.core.importer.IModelImportOperation;
+import org.eclipse.papyrus.cdo.core.importer.IModelTransferConfiguration;
+import org.eclipse.papyrus.cdo.core.importer.IModelTransferNode;
+import org.eclipse.papyrus.cdo.core.importer.IModelTransferOperation;
 import org.eclipse.papyrus.cdo.core.tests.AbstractPapyrusCDOTest;
 import org.eclipse.papyrus.cdo.core.tests.TestProject;
 import org.junit.After;
@@ -36,10 +36,9 @@ import org.junit.Test;
 /**
  * This is the OneToOneModelImportMappingTest type. Enjoy.
  */
-public class OneToOneModelImportMappingTest
-		extends AbstractPapyrusCDOTest {
+public class OneToOneModelImportMappingTest extends AbstractPapyrusCDOTest {
 
-	private IModelImportConfiguration config;
+	private IModelTransferConfiguration config;
 
 	private IModelImportMapping fixture;
 
@@ -58,24 +57,21 @@ public class OneToOneModelImportMappingTest
 		URI uri1 = hasDependencies.getResourceURI("model.di");
 		URI uri2 = hasDependents.getResourceURI("Datatypes.di");
 
-		config.addModelToImport(uri1);
-		config.addModelToImport(uri2);
+		config.addModelToTransfer(uri1);
+		config.addModelToTransfer(uri2);
 
-		assertThat(fixture.getMapping(getNode(uri1)), is((IPath) new Path(
-			"/has_dependencies/model.di")));
-		assertThat(fixture.getMapping(getNode(uri2)), is((IPath) new Path(
-			"/has_dependents/Datatypes.di")));
+		assertThat(fixture.getMapping(getNode(uri1)), is((IPath)new Path("/has_dependencies/model.di")));
+		assertThat(fixture.getMapping(getNode(uri2)), is((IPath)new Path("/has_dependents/Datatypes.di")));
 	}
 
 	@Test
-	public void testValidation_ok()
-			throws Exception {
+	public void testValidation_ok() throws Exception {
 
 		URI uri1 = hasDependencies.getResourceURI("model.di");
 		URI uri2 = hasDependents.getResourceURI("Datatypes.di");
 
-		config.addModelToImport(uri1);
-		config.addModelToImport(uri2);
+		config.addModelToTransfer(uri1);
+		config.addModelToTransfer(uri2);
 
 		Diagnostic problems = fixture.validate();
 
@@ -84,8 +80,7 @@ public class OneToOneModelImportMappingTest
 	}
 
 	@Test
-	public void testValidation_resourceExists()
-			throws Exception {
+	public void testValidation_resourceExists() throws Exception {
 
 		CDOTransaction transaction = createTransaction();
 		transaction.getOrCreateResource("has_dependencies/model.di");
@@ -93,22 +88,21 @@ public class OneToOneModelImportMappingTest
 		transaction.close();
 
 		URI uri = hasDependencies.getResourceURI("model.di");
-		config.addModelToImport(uri);
+		config.addModelToTransfer(uri);
 
 		Diagnostic problems = fixture.validate();
 
 		assertThat(problems.getChildren().size(), is(1));
 		Diagnostic child = problems.getChildren().get(0);
 		assertThat(child.getSeverity(), is(Diagnostic.ERROR));
-		assertThat(child.getMessage(),
-			containsString("Resource already exists"));
-		assertThat(child.getData().get(0), sameInstance((Object) getNode(uri)));
+		assertThat(child.getMessage(), containsString("Resource already exists"));
+		assertThat(child.getData().get(0), sameInstance((Object)getNode(uri)));
 	}
 
 	@Test
 	public void testValidation_mappingAbsent() {
 		URI uri = hasDependencies.getResourceURI("model.di");
-		config.addModelToImport(uri);
+		config.addModelToTransfer(uri);
 
 		fixture.mapTo(getNode(uri), null);
 
@@ -118,12 +112,11 @@ public class OneToOneModelImportMappingTest
 		Diagnostic child = problems.getChildren().get(0);
 		assertThat(child.getSeverity(), is(Diagnostic.ERROR));
 		assertThat(child.getMessage(), containsString("No mapping"));
-		assertThat(child.getData().get(0), sameInstance((Object) getNode(uri)));
+		assertThat(child.getData().get(0), sameInstance((Object)getNode(uri)));
 	}
 
 	@Test
-	public void testValidation_repository()
-			throws Exception {
+	public void testValidation_repository() throws Exception {
 
 		getPapyrusRepository().disconnect();
 
@@ -133,8 +126,7 @@ public class OneToOneModelImportMappingTest
 		Diagnostic child = problems.getChildren().get(0);
 		assertThat(child.getSeverity(), is(Diagnostic.ERROR));
 		assertThat(child.getMessage(), containsString("is not connected"));
-		assertThat(child.getData().get(0),
-			sameInstance((Object) getPapyrusRepository()));
+		assertThat(child.getData().get(0), sameInstance((Object)getPapyrusRepository()));
 
 		fixture.setRepository(null);
 
@@ -152,14 +144,13 @@ public class OneToOneModelImportMappingTest
 
 	@Before
 	public void createTestFixture() {
-		config = IModelImportConfiguration.Factory.DEFAULT
-			.create(new IModelImportOperation.Context() {
+		config = IModelTransferConfiguration.Factory.IMPORT.create(new IModelTransferOperation.Context() {
 
-				public Diagnostic run(IModelImportOperation operation) {
-					operation.run(new NullProgressMonitor());
-					return Diagnostic.OK_INSTANCE;
-				}
-			});
+			public Diagnostic run(IModelTransferOperation operation) {
+				operation.run(new NullProgressMonitor());
+				return Diagnostic.OK_INSTANCE;
+			}
+		}, null);
 
 		fixture = IModelImportMapping.Factory.ONE_TO_ONE.create(config);
 		fixture.setRepository(getPapyrusRepository());
@@ -173,11 +164,11 @@ public class OneToOneModelImportMappingTest
 		config = null;
 	}
 
-	IModelImportNode getNode(URI uri) {
-		IModelImportNode result = null;
+	IModelTransferNode getNode(URI uri) {
+		IModelTransferNode result = null;
 
-		for (IModelImportNode next : config.getModelsToImport()) {
-			if (next.getPrimaryResourceURI().equals(uri)) {
+		for(IModelTransferNode next : config.getModelsToTransfer()) {
+			if(next.getPrimaryResourceURI().equals(uri)) {
 				result = next;
 				break;
 			}