Bug 511287 - FileNotFoundException below
AbstractPasteFeature.isResolvable
Change-Id: Id1ee1ada5e6c5fee56a111e1db011f0e3ab879a3
diff --git a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/features/AbstractPasteFeature.java b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/features/AbstractPasteFeature.java
index e0106e5..b5d9509 100644
--- a/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/features/AbstractPasteFeature.java
+++ b/plugins/org.eclipse.graphiti.ui/src/org/eclipse/graphiti/ui/features/AbstractPasteFeature.java
@@ -11,6 +11,7 @@
* SAP AG - initial API, implementation and documentation
* mwenz - Bug 375533 - Problems with copy&paste in the tutorial
* pjpaulin - Bug 352120 - Now uses IDiagramContainerUI interface
+ * mwenz - Bug 511287 - FileNotFoundException below AbstractPasteFeature.isResolvable
*
* </copyright>
*
@@ -20,6 +21,8 @@
*/
package org.eclipse.graphiti.ui.features;
+import java.io.FileNotFoundException;
+
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -146,7 +149,16 @@
// ResourceSet or not
EObject resolved = getDiagramBehavior().getEditingDomain().getResourceSet().getEObject(uri, false);
if (resolved == null) {
- resolved = getDiagramBehavior().getEditingDomain().getResourceSet().getEObject(uri, true);
+ try {
+ resolved = getDiagramBehavior().getEditingDomain().getResourceSet().getEObject(uri, true);
+ } catch (Exception e) {
+ if (e instanceof FileNotFoundException) {
+ // Bug 511287 - file not resolvable means object not
+ // resolvable
+ return false;
+ }
+ throw e;
+ }
}
return resolved != null;
}