Bug 374918 - Let default paste use LocalSelectionTransfer
* Improvements and header updates
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/clipboard/ModelClipboard.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/clipboard/ModelClipboard.java
index 5b32f82..20dbccd 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/clipboard/ModelClipboard.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/internal/util/clipboard/ModelClipboard.java
@@ -1,7 +1,7 @@
/*******************************************************************************
* <copyright>
*
- * Copyright (c) 2005, 2010 SAP AG.
+ * Copyright (c) 2005, 2012 SAP AG.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
*
* Contributors:
* SAP AG - initial API, implementation and documentation
+ * mwenz - Felix Velasco - Bug 374918 - Let default paste use LocalSelectionTransfer
*
* </copyright>
*
@@ -126,16 +127,16 @@
if (resourceSet == null) {
throw new IllegalArgumentException("ResourceSet resourceSet must not be null"); //$NON-NLS-1$
}
- final List<EObject> uriStrings;
+ final List<EObject> eObjectList;
if (canUseNative()) {
- uriStrings = getLocalSelectionContent();
+ eObjectList = getLocalSelectionContent();
} else {
- uriStrings = Collections.emptyList();
+ eObjectList = Collections.emptyList();
}
- if (uriStrings.isEmpty()) {
+ if (eObjectList.isEmpty()) {
return NO_E_OBJECTS;
}
- return uriStrings.toArray(new EObject[uriStrings.size()]);
+ return eObjectList.toArray(new EObject[eObjectList.size()]);
}
private List<EObject> getLocalSelectionContent() {
diff --git a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/AbstractGFTests.java b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/AbstractGFTests.java
index fd08b9b..e329c72 100644
--- a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/AbstractGFTests.java
+++ b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/AbstractGFTests.java
@@ -1,7 +1,7 @@
/*******************************************************************************
* <copyright>
*
- * Copyright (c) 2005, 2011 SAP AG.
+ * Copyright (c) 2005, 2012 SAP AG.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,6 +11,7 @@
* SAP AG - initial API, implementation and documentation
* mwenz - Bug 356828 - Escaped diagram name is used as editor title
* Bug 336488 - DiagramEditor API
+ * mwenz - Felix Velasco - Bug 374918 - Let default paste use LocalSelectionTransfer
*
* </copyright>
*
diff --git a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFPackageTests.java b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFPackageTests.java
index d7191d2..00e4a08 100644
--- a/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFPackageTests.java
+++ b/tests/org.eclipse.graphiti.bot.tests/src/org/eclipse/graphiti/bot/tests/GFPackageTests.java
@@ -11,6 +11,7 @@
* SAP AG - initial API, implementation and documentation
* mwenz - Bug 363539 - Enabled feature delegation via IDiagramEditor.execute method
* mgorning - Bug 371671 - addGraphicalRepresentation returns null in dark mode
+ * mwenz - Felix Velasco - Bug 374918 - Let default paste use LocalSelectionTransfer
*
* </copyright>
*
@@ -344,6 +345,11 @@
PictogramElement pe = getPictogramElement(diagramEditor);
assertNotNull(pe);
PictogramElement[] pes = new PictogramElement[] { pe };
+ syncExec(new VoidResult() {
+ public void run() {
+ diagramEditor.doSave(null);
+ }
+ });
final DefaultCopyFeature myDefaultCopyFeature = new DefaultCopyFeature(
myDiagramTypeProvider.getFeatureProvider());
@@ -376,6 +382,11 @@
}
});
+ syncExec(new VoidResult() {
+ public void run() {
+ diagramEditor2.doSave(null);
+ }
+ });
page.closeAllEditors();
}