190692 - File not found on xml file deletion.

2 files changed, 31 insertions, 20 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/OrmXmlJpaFileContentProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/OrmXmlJpaFileContentProvider.java
index 35e36f183e..bc1aeefa8e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/OrmXmlJpaFileContentProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/OrmXmlJpaFileContentProvider.java
@@ -29,6 +29,9 @@ public class OrmXmlJpaFileContentProvider implements IJpaFileContentProvider
 	public static OrmXmlJpaFileContentProvider INSTANCE = new OrmXmlJpaFileContentProvider();
 	
 	
+	private IFile resourceFile;
+	
+	
 	/**
 	 * Restrict access
 	 */
@@ -38,7 +41,7 @@ public class OrmXmlJpaFileContentProvider implements IJpaFileContentProvider
 
 	public IJpaRootContentNode buildRootContent(IFile resourceFile) {
 		OrmXmlResourceFactory.register();
-		
+		this.resourceFile = resourceFile;
 		URI fileURI = URI.createPlatformResourceURI(resourceFile.getFullPath().toString());
 		OrmXmlResource resource = (OrmXmlResource) getResourceSet(resourceFile).getResource(fileURI, true);
 		XmlRootContentNode root = OrmFactory.eINSTANCE.createXmlRootContentNode();
@@ -78,15 +81,17 @@ public class OrmXmlJpaFileContentProvider implements IJpaFileContentProvider
 				}
 			}
 			else if (featureId == Resource.RESOURCE__IS_LOADED) {
-				// dumb translator is unloading my resource, reload it
-				if (notification.getNewBooleanValue() == false) {
-					OrmXmlResource resource = (OrmXmlResource) notification.getNotifier();
-					try {
-						resource.load(Collections.EMPTY_MAP);
-					}
-					catch (IOException ioe) {
-						// hmmm, log for now
-						JptCorePlugin.log(ioe);
+				if (resourceFile.exists()) {
+					// dumb translator is unloading my resource, reload it
+					if (notification.getNewBooleanValue() == false) {
+						OrmXmlResource resource = (OrmXmlResource) notification.getNotifier();
+						try {
+							resource.load(Collections.EMPTY_MAP);
+						}
+						catch (IOException ioe) {
+							// hmmm, log for now
+							JptCorePlugin.log(ioe);
+						}
 					}
 				}
 			}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceXmlJpaFileContentProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceXmlJpaFileContentProvider.java
index 15f32de191..c5e5322634 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceXmlJpaFileContentProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceXmlJpaFileContentProvider.java
@@ -29,6 +29,10 @@ public class PersistenceXmlJpaFileContentProvider implements IJpaFileContentProv
 {
 	public static PersistenceXmlJpaFileContentProvider INSTANCE = new PersistenceXmlJpaFileContentProvider();
 	
+	
+	private IFile resourceFile;
+	
+	
 	/**
 	 * Restrict access
 	 */
@@ -38,7 +42,7 @@ public class PersistenceXmlJpaFileContentProvider implements IJpaFileContentProv
 
 	public IJpaRootContentNode buildRootContent(IFile resourceFile) {
 		PersistenceXmlResourceFactory.register();
-		
+		this.resourceFile = resourceFile;
 		URI fileURI = URI.createPlatformResourceURI(resourceFile.getFullPath().toString());
 		PersistenceResource resource = (PersistenceResource) getResourceSet(resourceFile).getResource(fileURI, true);
 		PersistenceXmlRootContentNode root = PersistenceFactory.eINSTANCE.createPersistenceXmlRootContentNode();
@@ -79,15 +83,17 @@ public class PersistenceXmlJpaFileContentProvider implements IJpaFileContentProv
 				}
 			}
 			else if (featureId == Resource.RESOURCE__IS_LOADED) {
-				// dumb translator is unloading my resource, reload it
-				if (notification.getNewBooleanValue() == false) {
-					PersistenceResource resource = (PersistenceResource) notification.getNotifier();
-					try {
-						resource.load(Collections.EMPTY_MAP);
-					}
-					catch (IOException ioe) {
-						// hmmm, log for now
-						JptCorePlugin.log(ioe);
+				if (resourceFile.exists()) {
+					// dumb translator is unloading my resource, reload it
+					if (notification.getNewBooleanValue() == false) {
+						PersistenceResource resource = (PersistenceResource) notification.getNotifier();
+						try {
+							resource.load(Collections.EMPTY_MAP);
+						}
+						catch (IOException ioe) {
+							// hmmm, log for now
+							JptCorePlugin.log(ioe);
+						}
 					}
 				}
 			}