Synchronize with master

13 files changed, 14 insertions, 13 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/xpt/editor/Editor.xpt b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/xpt/editor/Editor.xpt
index cde5e12ddf2..2b2d33efa11 100644
--- a/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/xpt/editor/Editor.xpt
+++ b/plugins/developer/org.eclipse.papyrus.def/dynamic-templates3.5/codegen/aspects/xpt/editor/Editor.xpt
@@ -448,7 +448,7 @@ protected void performSaveAs(org.eclipse.core.runtime.IProgressMonitor progressM
 
 					@Override
 					protected Object getJavaObject(org.eclipse.swt.dnd.TransferData data) {
-						return LocalSelectionTransfer.getTransfer().nativeToJava(data);
+						return LocalSelectionTransfer.getTransfer().getSelection();
 					}
 
 					@Override
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/UMLDiagramEditor.java
index 6c6855cf00e..0a6c9226855 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src/org/eclipse/papyrus/uml/diagram/activity/part/UMLDiagramEditor.java
@@ -489,7 +489,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 

 			@Override

 			protected Object getJavaObject(TransferData data) {

-				return LocalSelectionTransfer.getTransfer().nativeToJava(data);

+				return LocalSelectionTransfer.getTransfer().getSelection();

 			}

 

 			@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java
index 368835255f3..5eb046ba98e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/src/org/eclipse/papyrus/uml/diagram/clazz/part/UMLDiagramEditor.java
@@ -472,7 +472,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 

 			@Override

 			protected Object getJavaObject(TransferData data) {

-				return LocalSelectionTransfer.getTransfer().nativeToJava(data);

+				return LocalSelectionTransfer.getTransfer().getSelection();

 			}

 

 			@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditor.java
index 28f497800c0..bf59bd3b483 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/src/org/eclipse/papyrus/uml/diagram/communication/part/UMLDiagramEditor.java
@@ -477,7 +477,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 

 			@Override

 			protected Object getJavaObject(TransferData data) {

-				return LocalSelectionTransfer.getTransfer().nativeToJava(data);

+				return LocalSelectionTransfer.getTransfer().getSelection();

 			}

 

 			@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditor.java
index dbbc73ea25f..fb1e1984b89 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/src/org/eclipse/papyrus/uml/diagram/component/part/UMLDiagramEditor.java
@@ -444,7 +444,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 

 			@Override

 			protected Object getJavaObject(TransferData data) {

-				return LocalSelectionTransfer.getTransfer().nativeToJava(data);

+				return LocalSelectionTransfer.getTransfer().getSelection();

 			}

 

 			@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
index f39b866326b..7646ce22411 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/src/org/eclipse/papyrus/uml/diagram/composite/part/UMLDiagramEditor.java
@@ -438,7 +438,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 

 			@Override

 			protected Object getJavaObject(TransferData data) {

-				return LocalSelectionTransfer.getTransfer().nativeToJava(data);

+				return LocalSelectionTransfer.getTransfer().getSelection();

 			}

 

 			@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditor.java
index 3745ffc2a4c..0f4b980cdb4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/src/org/eclipse/papyrus/uml/diagram/deployment/part/UMLDiagramEditor.java
@@ -463,7 +463,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 

 			@Override

 			protected Object getJavaObject(TransferData data) {

-				return LocalSelectionTransfer.getTransfer().nativeToJava(data);

+				return LocalSelectionTransfer.getTransfer().getSelection();

 			}

 

 			@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java
index e9bdcd84816..db53565907f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/src/org/eclipse/papyrus/uml/diagram/profile/part/UMLDiagramEditor.java
@@ -473,7 +473,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 

 			@Override

 			protected Object getJavaObject(TransferData data) {

-				return LocalSelectionTransfer.getTransfer().nativeToJava(data);

+				return LocalSelectionTransfer.getTransfer().getSelection();

 			}

 

 			@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditor.java
index 47c6d844214..ab5ead1dc4d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/part/UMLDiagramEditor.java
@@ -484,7 +484,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 

 			@Override

 			protected Object getJavaObject(TransferData data) {

-				return LocalSelectionTransfer.getTransfer().nativeToJava(data);

+				return LocalSelectionTransfer.getTransfer().getSelection();

 			}

 

 			@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramEditor.java
index 83366cec81a..f6656d91190 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src/org/eclipse/papyrus/uml/diagram/statemachine/part/UMLDiagramEditor.java
@@ -432,7 +432,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 

 			@Override

 			protected Object getJavaObject(TransferData data) {

-				return LocalSelectionTransfer.getTransfer().nativeToJava(data);

+				return LocalSelectionTransfer.getTransfer().getSelection();

 			}

 

 			@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/part/UMLDiagramEditor.java
index 4f951c6ebe7..f6a1e9b18ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/src/org/eclipse/papyrus/uml/diagram/timing/part/UMLDiagramEditor.java
@@ -499,7 +499,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 

 			@Override

 			protected Object getJavaObject(final TransferData data) {

-				return LocalSelectionTransfer.getTransfer().nativeToJava(data);

+				return LocalSelectionTransfer.getTransfer().getSelection();

 			}

 

 			@Override

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramEditor.java
index d4277557525..3c65d52e943 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/src/org/eclipse/papyrus/uml/diagram/usecase/part/UMLDiagramEditor.java
@@ -466,6 +466,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 		return super.getGraphicalViewer();

 	}

 

+	

 	/**

 	 * @generated

 	 */

@@ -477,7 +478,7 @@ public class UMLDiagramEditor extends UmlGmfDiagramEditor implements IProviderCh
 

 			@Override

 			protected Object getJavaObject(TransferData data) {

-				return LocalSelectionTransfer.getTransfer().nativeToJava(data);

+				return LocalSelectionTransfer.getTransfer().getSelection();

 			}

 

 			@Override

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF
index adba4d1e6bd..40077093780 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite.tests/META-INF/MANIFEST.MF
@@ -21,6 +21,6 @@ Require-Bundle: org.eclipse.ui,
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
-Bundle-Version: 0.10.1.qualifier
+Bundle-Version: 1.0.0.qualifier
 Export-Package: org.eclipse.papyrus.uml.diagram.composite.test,
  org.eclipse.papyrus.uml.diagram.composite.test.canonical