Bug 476618: [Table] Improve the re-import mechanism in an existing table

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

Correction of failing tests:
 - Insert and Paste because of wrong paste text
 - Import because of not found resource to paste

Change-Id: Ifcfef534a17fd12f77089e877460acf31f5193ae
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@all4tec.net>

6 files changed, 31 insertions, 31 deletions

diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/import/ImportEmptyAddAll_H1_H1_H1_MultiColumns_Test.csv b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/import/ImportEmptyAddAll_H1_H1_H1_MultiColumns_Test.csv
index 2ebbea4d0ec..31fb85d957f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/import/ImportEmptyAddAll_H1_H1_H1_MultiColumns_Test.csv
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/import/ImportEmptyAddAll_H1_H1_H1_MultiColumns_Test.csv
@@ -1,26 +1,26 @@
 Class0;package;true;N/A
 Operation0_0;public;true;N/A
-Param0_0_0;package;N/A;int
+Param0_0_0;package;N/A;in
 Param0_0_1;package;N/A;out
 Param0_0_2;package;N/A;return
 Operation0_1;private;true;N/A
-Param0_1_0;public;N/A;int
+Param0_1_0;public;N/A;in
 Param0_1_1;public;N/A;out
 Param0_1_2;public;N/A;return
 Operation0_2;public;true;N/A
-Param0_2_0;private;N/A;int
+Param0_2_0;private;N/A;in
 Param0_2_1;private;N/A;out
 Param0_2_2;private;N/A;return
 Class1;package;true;N/A
 Operation1_0;public;true;N/A
-Param1_0_0;package;N/A;int
+Param1_0_0;package;N/A;in
 Param1_0_1;package;N/A;out
 Param1_0_2;package;N/A;return
 Operation1_1;private;true;N/A
-Param1_1_0;public;N/A;int
+Param1_1_0;public;N/A;in
 Param1_1_1;public;N/A;out
 Param1_1_2;public;N/A;return
 Operation1_2;public;true;N/A
-Param1_2_0;private;N/A;int
+Param1_2_0;private;N/A;in
 Param1_2_1;private;N/A;out
 Param1_2_2;private;N/A;return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/import/ImportRowsAddAll_H1_H1_H1_MultiColumns_Test.csv b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/import/ImportRowsAddAll_H1_H1_H1_MultiColumns_Test.csv
index 2ebbea4d0ec..31fb85d957f 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/import/ImportRowsAddAll_H1_H1_H1_MultiColumns_Test.csv
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/import/ImportRowsAddAll_H1_H1_H1_MultiColumns_Test.csv
@@ -1,26 +1,26 @@
 Class0;package;true;N/A
 Operation0_0;public;true;N/A
-Param0_0_0;package;N/A;int
+Param0_0_0;package;N/A;in
 Param0_0_1;package;N/A;out
 Param0_0_2;package;N/A;return
 Operation0_1;private;true;N/A
-Param0_1_0;public;N/A;int
+Param0_1_0;public;N/A;in
 Param0_1_1;public;N/A;out
 Param0_1_2;public;N/A;return
 Operation0_2;public;true;N/A
-Param0_2_0;private;N/A;int
+Param0_2_0;private;N/A;in
 Param0_2_1;private;N/A;out
 Param0_2_2;private;N/A;return
 Class1;package;true;N/A
 Operation1_0;public;true;N/A
-Param1_0_0;package;N/A;int
+Param1_0_0;package;N/A;in
 Param1_0_1;package;N/A;out
 Param1_0_2;package;N/A;return
 Operation1_1;private;true;N/A
-Param1_1_0;public;N/A;int
+Param1_1_0;public;N/A;in
 Param1_1_1;public;N/A;out
 Param1_1_2;public;N/A;return
 Operation1_2;public;true;N/A
-Param1_2_0;private;N/A;int
+Param1_2_0;private;N/A;in
 Param1_2_1;private;N/A;out
 Param1_2_2;private;N/A;return
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/insert/InsertEmptyAddAll_H1_H1_H1_MultiColumns_Test_ToCopy.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/insert/InsertEmptyAddAll_H1_H1_H1_MultiColumns_Test_ToCopy.txt
index cfd146418cd..8c21e826474 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/insert/InsertEmptyAddAll_H1_H1_H1_MultiColumns_Test_ToCopy.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/insert/InsertEmptyAddAll_H1_H1_H1_MultiColumns_Test_ToCopy.txt
@@ -1,27 +1,27 @@
 Class0	package	true	N/A
 Operation0_0	public	true	N/A
-Param0_0_0	package	N/A	int
+Param0_0_0	package	N/A	in
 Param0_0_1	package	N/A	out
 Param0_0_2	package	N/A	return
 Operation0_1	private	true	N/A
-Param0_1_0	public	N/A	int
+Param0_1_0	public	N/A	in
 Param0_1_1	public	N/A	out
 Param0_1_2	public	N/A	return
 Operation0_2	public	true	N/A
-Param0_2_0	private	N/A	int
+Param0_2_0	private	N/A	in
 Param0_2_1	private	N/A	out
 Param0_2_2	private	N/A	return
 Class1	package	true	N/A
 Operation1_0	public	true	N/A
-Param1_0_0	package	N/A	int
+Param1_0_0	package	N/A	in
 Param1_0_1	package	N/A	out
 Param1_0_2	package	N/A	return
 Operation1_1	private	true	N/A
-Param1_1_0	public	N/A	int
+Param1_1_0	public	N/A	in
 Param1_1_1	public	N/A	out
 Param1_1_2	public	N/A	return
 Operation1_2	public	true	N/A
-Param1_2_0	private	N/A	int
+Param1_2_0	private	N/A	in
 Param1_2_1	private	N/A	out
 Param1_2_2	private	N/A	return
 
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/insert/InsertRowsAddAll_H1_H1_H1_MultiColumns_Test_ToCopy.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/insert/InsertRowsAddAll_H1_H1_H1_MultiColumns_Test_ToCopy.txt
index cfd146418cd..8c21e826474 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/insert/InsertRowsAddAll_H1_H1_H1_MultiColumns_Test_ToCopy.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/insert/InsertRowsAddAll_H1_H1_H1_MultiColumns_Test_ToCopy.txt
@@ -1,27 +1,27 @@
 Class0	package	true	N/A
 Operation0_0	public	true	N/A
-Param0_0_0	package	N/A	int
+Param0_0_0	package	N/A	in
 Param0_0_1	package	N/A	out
 Param0_0_2	package	N/A	return
 Operation0_1	private	true	N/A
-Param0_1_0	public	N/A	int
+Param0_1_0	public	N/A	in
 Param0_1_1	public	N/A	out
 Param0_1_2	public	N/A	return
 Operation0_2	public	true	N/A
-Param0_2_0	private	N/A	int
+Param0_2_0	private	N/A	in
 Param0_2_1	private	N/A	out
 Param0_2_2	private	N/A	return
 Class1	package	true	N/A
 Operation1_0	public	true	N/A
-Param1_0_0	package	N/A	int
+Param1_0_0	package	N/A	in
 Param1_0_1	package	N/A	out
 Param1_0_2	package	N/A	return
 Operation1_1	private	true	N/A
-Param1_1_0	public	N/A	int
+Param1_1_0	public	N/A	in
 Param1_1_1	public	N/A	out
 Param1_1_2	public	N/A	return
 Operation1_2	public	true	N/A
-Param1_2_0	private	N/A	int
+Param1_2_0	private	N/A	in
 Param1_2_1	private	N/A	out
 Param1_2_2	private	N/A	return
 
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_overwrite/PasteEmptyOverwriteAddAll_V1_V3_V1_MultiColumns_Test_ToCopy.txt b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_overwrite/PasteEmptyOverwriteAddAll_V1_V3_V1_MultiColumns_Test_ToCopy.txt
index bb0ce6f3d0f..a658db2c7c6 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_overwrite/PasteEmptyOverwriteAddAll_V1_V3_V1_MultiColumns_Test_ToCopy.txt
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/resources/paste_overwrite/PasteEmptyOverwriteAddAll_V1_V3_V1_MultiColumns_Test_ToCopy.txt
@@ -11,17 +11,17 @@ NestedClass0_2	package	false	N/A
 			
 Operation0_0	public	true	N/A
 			
-Param0_0_0	package	N/A	int
+Param0_0_0	package	N/A	in
 Param0_0_1	package	N/A	out
 Param0_0_2	package	N/A	return
 Operation0_1	private	true	N/A
 			
-Param0_1_0	public	N/A	int
+Param0_1_0	public	N/A	in
 Param0_1_1	public	N/A	out
 Param0_1_2	public	N/A	return
 Operation0_2	public	true	N/A
 			
-Param0_2_0	private	N/A	int
+Param0_2_0	private	N/A	in
 Param0_2_1	private	N/A	out
 Param0_2_2	private	N/A	return
 Class1	package	true	N/A
@@ -36,17 +36,17 @@ NestedClass1_2	package	false	N/A
 			
 Operation1_0	public	true	N/A
 			
-Param1_0_0	package	N/A	int
+Param1_0_0	package	N/A	in
 Param1_0_1	package	N/A	out
 Param1_0_2	package	N/A	return
 Operation1_1	private	true	N/A
 			
-Param1_1_0	public	N/A	int
+Param1_1_0	public	N/A	in
 Param1_1_1	public	N/A	out
 Param1_1_2	public	N/A	return
 Operation1_2	public	true	N/A
 			
-Param1_2_0	private	N/A	int
+Param1_2_0	private	N/A	in
 Param1_2_1	private	N/A	out
 Param1_2_2	private	N/A	return
 
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/importfile/AbstractImportTest.java b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/importfile/AbstractImportTest.java
index 8b9a15761e0..347b36a35b9 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/importfile/AbstractImportTest.java
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config.tests/src/org/eclipse/papyrus/uml/nattable/clazz/config/tests/importfile/AbstractImportTest.java
@@ -127,7 +127,7 @@ public abstract class AbstractImportTest extends AbstractPasteInsertTest {
 
 		final IPath path = new Path(location.toString());
 
-		parameters.put(ImportTableHandler.SELECTED_FILE_PATH_STRING_PARAMETER, path.toFile().getAbsolutePath());
+		parameters.put(ImportTableHandler.SELECTED_FILE_PATH_STRING_PARAMETER, path.toFile().getPath());
 	}
 
 	/**