fix for bug 209720

4 files changed, 16 insertions, 15 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 213566539d..021035921d 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
@@ -50,11 +50,11 @@ public class OrmXmlJpaFileContentProvider implements IJpaFileContentProvider
 				OrmArtifactEdit.getArtifactEditForRead(resourceFile.getProject());
 		OrmResource resource = 
 				oae.getOrmResource(resourceFile);
+		oae.addListener(buildReloadListener(resource));
 		XmlRootContentNode root = OrmFactory.eINSTANCE.createXmlRootContentNode();
-		root.setResource(resource);
+		root.setArtifactEdit(oae);
 		root.setEntityMappings(resource.getEntityMappings());
 		resource.eAdapters().add(buildRootNodeListener(resourceFile, root));
-		oae.addListener(buildReloadListener(resource));
 		jpaFile.setContent(root);
 		return root;
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlRootContentNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlRootContentNode.java
index 56142a21a7..ed1ba64720 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlRootContentNode.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/orm/XmlRootContentNode.java
@@ -23,6 +23,7 @@ import org.eclipse.jpt.core.internal.ITextRange;
 import org.eclipse.jpt.core.internal.JpaCorePackage;
 import org.eclipse.jpt.core.internal.JpaFile;
 import org.eclipse.jpt.core.internal.XmlEObject;
+import org.eclipse.jpt.core.internal.content.orm.resource.OrmArtifactEdit;
 
 /**
  * <!-- begin-user-doc -->
@@ -53,7 +54,7 @@ public class XmlRootContentNode extends XmlEObject
 	 */
 	protected EntityMappingsInternal entityMappings;
 	
-	private OrmResource resource;
+	private OrmArtifactEdit artifactEdit;
 	
 	
 	/**
@@ -333,8 +334,8 @@ public class XmlRootContentNode extends XmlEObject
 	}
 
 	public void dispose() {
-		if (resource != null) {
-			resource.releaseFromRead();
+		if (artifactEdit != null) {
+			artifactEdit.dispose();
 		}
 	}
 	
@@ -360,7 +361,7 @@ public class XmlRootContentNode extends XmlEObject
 		}
 	}
 
-	public void setResource(OrmResource ormResource) {
-		resource = ormResource;
+	public void setArtifactEdit(OrmArtifactEdit ormArtifactEdit) {
+		artifactEdit = ormArtifactEdit;
 	}
 }
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 c8bb31b3c0..afd2b08e9d 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
@@ -51,11 +51,11 @@ public class PersistenceXmlJpaFileContentProvider implements IJpaFileContentProv
 				PersistenceArtifactEdit.getArtifactEditForRead(resourceFile.getProject());
 		PersistenceResource resource = 
 				pae.getPersistenceResource(resourceFile);
+		pae.addListener(buildReloadListener(resource));
 		PersistenceXmlRootContentNode root = PersistenceFactory.eINSTANCE.createPersistenceXmlRootContentNode();		
-		root.setResource(resource);
+		root.setArtifactEdit(pae);
 		root.setPersistence(resource.getPersistence());
 		resource.eAdapters().add(buildRootNodeListener(resourceFile, root));
-		pae.addListener(buildReloadListener(resource));
 		jpaFile.setContent(root);
 		return root;
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceXmlRootContentNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceXmlRootContentNode.java
index 407a88103c..0d619aad0c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceXmlRootContentNode.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/content/persistence/PersistenceXmlRootContentNode.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.core.internal.JpaCorePackage;
 import org.eclipse.jpt.core.internal.JpaFile;
 import org.eclipse.jpt.core.internal.XmlEObject;
 import org.eclipse.jpt.core.internal.content.persistence.resource.IPersistenceXmlContentNodes;
-import org.eclipse.jpt.core.internal.content.persistence.resource.PersistenceResource;
+import org.eclipse.jpt.core.internal.content.persistence.resource.PersistenceArtifactEdit;
 
 /**
  * <!-- begin-user-doc -->
@@ -55,7 +55,7 @@ public class PersistenceXmlRootContentNode extends XmlEObject
 	 */
 	protected Persistence persistence;
 	
-	private PersistenceResource resource;
+	private PersistenceArtifactEdit artifactEdit;
 	
 	
 	/**
@@ -343,8 +343,8 @@ public class PersistenceXmlRootContentNode extends XmlEObject
 	}
 	
 	public void dispose() {
-		if (resource != null) {
-			resource.releaseFromRead();
+		if (artifactEdit != null) {
+			artifactEdit.dispose();
 		}
 	}
 	
@@ -373,7 +373,7 @@ public class PersistenceXmlRootContentNode extends XmlEObject
 	// TODO Auto-generated method stub
 	}
 	
-	public void setResource(PersistenceResource persistenceResource) {
-		resource = persistenceResource;
+	public void setArtifactEdit(PersistenceArtifactEdit persistenceArtifactEdit) {
+		artifactEdit = persistenceArtifactEdit;
 	}
 }
\ No newline at end of file