rename JpaContextModelRoot to JpaContextRoot etc.

18 files changed, 29 insertions, 29 deletions

diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/CreateEntityTypeHierarchy.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/CreateEntityTypeHierarchy.java
index b3b71e178e..53b17cc77f 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/CreateEntityTypeHierarchy.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/CreateEntityTypeHierarchy.java
@@ -48,7 +48,7 @@ public class CreateEntityTypeHierarchy implements Command {
 

 	public void execute() {

 		buildHierarchy(superclass, subclass, shouldCreate);

-		subclass.getJpaProject().getContextModelRoot().synchronizeWithResourceModel();

+		subclass.getJpaProject().getContextRoot().synchronizeWithResourceModel();

 		JavaResourceType jrt = subclass.getJavaResourceType();

 		jrt.getJavaResourceCompilationUnit().synchronizeWithJavaSource();

 		subclass.update();

diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/RenameAttributeCommand.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/RenameAttributeCommand.java
index cebbd02ba5..3dbc01573f 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/RenameAttributeCommand.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/RenameAttributeCommand.java
@@ -68,7 +68,7 @@ public class RenameAttributeCommand implements Command {
 			renameAttribute(jptCompilationUnit, oldName, newName, isMethodAnnotated);

 			

 			

-			jpt.getJpaProject().getContextModelRoot().synchronizeWithResourceModel();

+			jpt.getJpaProject().getContextRoot().synchronizeWithResourceModel();

 			JavaResourceType jrt = jpt.getJavaResourceType();

 			jrt.getJavaResourceCompilationUnit().synchronizeWithJavaSource();

 			jpt.update();

diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/RenameEntityCommand.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/RenameEntityCommand.java
index efb110ff35..3dafc1dc24 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/RenameEntityCommand.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/RenameEntityCommand.java
@@ -43,7 +43,7 @@ public class RenameEntityCommand implements Command {
 

 	public void execute() {

 		renameEntityClass(JPAEditorUtil.getCompilationUnit(jpt), newEntityName);

-		jpt.getJpaProject().getContextModelRoot().synchronizeWithResourceModel();

+		jpt.getJpaProject().getContextRoot().synchronizeWithResourceModel();

 		JavaResourceType jrt = jpt.getJavaResourceType();

 		jrt.getJavaResourceCompilationUnit().synchronizeWithJavaSource();

 		jpt.update();

diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java
index 277932d082..c8648cb2d1 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAllEntitiesFeature.java
@@ -74,7 +74,7 @@ public class AddAllEntitiesFeature extends AbstractCustomFeature implements IAdd
 	public void execute(ICustomContext context) {
 		Diagram d = getDiagram();
 		JpaProject project = getTargetJPAProject();
-		PersistenceUnit unit = project.getContextModelRoot().getPersistenceXml().
+		PersistenceUnit unit = project.getContextRoot().getPersistenceXml().
 								getRoot().getPersistenceUnits().iterator().next();
 		
 		
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickRemoveAttributeButtonFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickRemoveAttributeButtonFeature.java
index d645cc5bee..eec5269bdf 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickRemoveAttributeButtonFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickRemoveAttributeButtonFeature.java
@@ -147,7 +147,7 @@ public class ClickRemoveAttributeButtonFeature extends DefaultDeleteFeature {
 	 */
 	private Set<PersistentType> getAllJPTWithSameIDClassOrEmbeddedId(PersistentType jpt, String fqn){
 		HashSet<PersistentType> persistentTypes = new HashSet<PersistentType>();
-		ListIterator<PersistenceUnit> lit = jpt.getJpaProject().getContextModelRoot().getPersistenceXml().getRoot().getPersistenceUnits().iterator();		
+		ListIterator<PersistenceUnit> lit = jpt.getJpaProject().getContextRoot().getPersistenceXml().getRoot().getPersistenceUnits().iterator();		
 		PersistenceUnit pu = lit.next();
 		for(PersistentType persistentType : pu.getPersistentTypes()){
 			if(!persistentType.getName().equals(jpt.getName())  && ((hasSameEmbeddedId(persistentType, fqn)) || hasSameIdClass(persistentType, fqn))){
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateInheritedEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateInheritedEntityFeature.java
index 1aaacb2d4e..bf74de38c3 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateInheritedEntityFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateInheritedEntityFeature.java
@@ -124,7 +124,7 @@ public class CreateInheritedEntityFeature extends AbstractCreateConnectionFeatur
 	private void disableAllNotValidJPTs(){
 		Diagram d = getDiagram();
 		JpaProject project = ModelIntegrationUtil.getProjectByDiagram(d.getName());
-		PersistenceUnit unit = project.getContextModelRoot().getPersistenceXml().
+		PersistenceUnit unit = project.getContextRoot().getPersistenceXml().
 								getRoot().getPersistenceUnits().iterator().next();
 		disableAllEmbeddables(unit);
 	}
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateIsARelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateIsARelationFeature.java
index 4ae1cc4f2f..4499470574 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateIsARelationFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateIsARelationFeature.java
@@ -155,7 +155,7 @@ public class CreateIsARelationFeature extends AbstractCreateConnectionFeature {
 	private void disableUnvalidRelationTargets(){

 		Diagram d = getDiagram();

 		JpaProject project = ModelIntegrationUtil.getProjectByDiagram(d.getName());

-		PersistenceUnit unit = project.getContextModelRoot().getPersistenceXml().

+		PersistenceUnit unit = project.getContextRoot().getPersistenceXml().

 								getRoot().getPersistenceUnits().iterator().next();

 		for (ClassRef classRef : unit.getClassRefs()) {

 			if (classRef.getJavaPersistentType() != null) {

@@ -175,7 +175,7 @@ public class CreateIsARelationFeature extends AbstractCreateConnectionFeature {
 	private void disableAllEmbeddables() {

 		Diagram d = getDiagram();

 		JpaProject project = ModelIntegrationUtil.getProjectByDiagram(d.getName());

-		PersistenceUnit unit = project.getContextModelRoot().getPersistenceXml().

+		PersistenceUnit unit = project.getContextRoot().getPersistenceXml().

 								getRoot().getPersistenceUnits().iterator().next();

 		for (ClassRef classRef : unit.getClassRefs()) {

 			if (classRef.getJavaPersistentType() != null) {

diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFeature.java
index 7d91b469b0..db10be5074 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateJPAEntityFeature.java
@@ -157,7 +157,7 @@ public class CreateJPAEntityFeature extends AbstractCreateFeature {
 			JPADiagramEditorPlugin.logError("Cannot refresh the project", e1);  //$NON-NLS-1$		 
 		}
 		
-		ListIterator<PersistenceUnit> lit = jpaProject.getContextModelRoot().getPersistenceXml().getRoot().getPersistenceUnits().iterator();		
+		ListIterator<PersistenceUnit> lit = jpaProject.getContextRoot().getPersistenceXml().getRoot().getPersistenceUnits().iterator();		
 		PersistenceUnit pu = lit.next();
 		PersistentType jpt = pu.getPersistentType(entityName);
 
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateRelationFeature.java
index 981ab721cf..544f1e2a5f 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateRelationFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateRelationFeature.java
@@ -183,7 +183,7 @@ abstract public class CreateRelationFeature extends AbstractCreateConnectionFeat
 	private void disableUnvalidRelationTargets(){
 		Diagram d = getDiagram();
 		JpaProject project = ModelIntegrationUtil.getProjectByDiagram(d.getName());
-		PersistenceUnit unit = project.getContextModelRoot().getPersistenceXml().
+		PersistenceUnit unit = project.getContextRoot().getPersistenceXml().
 								getRoot().getPersistenceUnits().iterator().next();
 		if(JpaArtifactFactory.instance().isEntity(owner)){
 			disableAllJPTsThatAreNotEntities(unit);
@@ -243,7 +243,7 @@ abstract public class CreateRelationFeature extends AbstractCreateConnectionFeat
 	private void disableAllEmbeddables() {
 		Diagram d = getDiagram();
 		JpaProject project = ModelIntegrationUtil.getProjectByDiagram(d.getName());
-		PersistenceUnit unit = project.getContextModelRoot().getPersistenceXml().
+		PersistenceUnit unit = project.getContextRoot().getPersistenceXml().
 								getRoot().getPersistenceUnits().iterator().next();
 		boolean isJPA10Project = JPAEditorUtil.checkJPAFacetVersion(ModelIntegrationUtil.getProjectByDiagram(getDiagram().getName()), JPAEditorUtil.JPA_PROJECT_FACET_10);
 
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedCollectionOfObjectsFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedCollectionOfObjectsFeature.java
index 6ac4da0739..bc34402023 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedCollectionOfObjectsFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedCollectionOfObjectsFeature.java
@@ -210,7 +210,7 @@ public class EmbedCollectionOfObjectsFeature extends AbstractCreateConnectionFea
 	private void disableUnvalidRelationTargets(){

 		Diagram d = getDiagram();

 		JpaProject project = ModelIntegrationUtil.getProjectByDiagram(d.getName());

-		PersistenceUnit unit = project.getContextModelRoot().getPersistenceXml().

+		PersistenceUnit unit = project.getContextRoot().getPersistenceXml().

 								getRoot().getPersistenceUnits().iterator().next();

 		if(JpaArtifactFactory.instance().isEntity(embeddingEntity) 

 				|| JpaArtifactFactory.instance().isEmbeddable(embeddingEntity)){

@@ -261,7 +261,7 @@ public class EmbedCollectionOfObjectsFeature extends AbstractCreateConnectionFea
 	private void disableAllMappedSuperclasses() {

 		Diagram d = getDiagram();

 		JpaProject project = ModelIntegrationUtil.getProjectByDiagram(d.getName());

-		PersistenceUnit unit = project.getContextModelRoot().getPersistenceXml().

+		PersistenceUnit unit = project.getContextRoot().getPersistenceXml().

 								getRoot().getPersistenceUnits().iterator().next();

 		for (ClassRef classRef : unit.getClassRefs()) {

 			if (classRef.getJavaPersistentType() != null) {

diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedSingleObjectFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedSingleObjectFeature.java
index 8ba6d8b34e..e35592cc1c 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedSingleObjectFeature.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedSingleObjectFeature.java
@@ -150,7 +150,7 @@ public class EmbedSingleObjectFeature extends AbstractCreateConnectionFeature {
 	private void disableUnvalidRelationTargets(){

 		Diagram d = getDiagram();

 		JpaProject project = ModelIntegrationUtil.getProjectByDiagram(d.getName());

-		PersistenceUnit unit = project.getContextModelRoot().getPersistenceXml().

+		PersistenceUnit unit = project.getContextRoot().getPersistenceXml().

 								getRoot().getPersistenceUnits().iterator().next();

 		boolean isJPA10Project = JPAEditorUtil.checkJPAFacetVersion(embeddingEntity.getJpaProject(), JPAEditorUtil.JPA_PROJECT_FACET_10);

 		if(JpaArtifactFactory.instance().isEntity(embeddingEntity)

@@ -188,7 +188,7 @@ public class EmbedSingleObjectFeature extends AbstractCreateConnectionFeature {
 	private void disableAllMappedSuperclasses() {

 		Diagram d = getDiagram();

 		JpaProject project = ModelIntegrationUtil.getProjectByDiagram(d.getName());

-		PersistenceUnit unit = project.getContextModelRoot().getPersistenceXml().

+		PersistenceUnit unit = project.getContextRoot().getPersistenceXml().

 								getRoot().getPersistenceUnits().iterator().next();

 		boolean isJPA10Project = JPAEditorUtil.checkJPAFacetVersion(ModelIntegrationUtil.getProjectByDiagram(getDiagram().getName()), JPAEditorUtil.JPA_PROJECT_FACET_10);

 		for (ClassRef classRef : unit.getClassRefs()) {

diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorDiagramTypeProvider.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorDiagramTypeProvider.java
index ba44bb0368..086d4910ec 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorDiagramTypeProvider.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorDiagramTypeProvider.java
@@ -109,7 +109,7 @@ public class JPAEditorDiagramTypeProvider extends AbstractDiagramTypeProvider {
     
 	public boolean hasToAdd() {
 		JpaProject project = getTargetJPAProject();
-		PersistenceUnit unit = project.getContextModelRoot().getPersistenceXml().
+		PersistenceUnit unit = project.getContextRoot().getPersistenceXml().
 								getRoot().getPersistenceUnits().iterator().next();
 		
 		for (ClassRef classRef : unit.getClassRefs()) {
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorFeatureProvider.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorFeatureProvider.java
index 372e81b858..29e2ad9a0d 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorFeatureProvider.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorFeatureProvider.java
@@ -784,7 +784,7 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements
 	public void setOriginalPersistentTypeColor(){
 		final Diagram d = getDiagram();
 		JpaProject project = ModelIntegrationUtil.getProjectByDiagram(d.getName());
-		PersistenceUnit unit = project.getContextModelRoot().getPersistenceXml().
+		PersistenceUnit unit = project.getContextRoot().getPersistenceXml().
 								getRoot().getPersistenceUnits().iterator().next();
 		for (ClassRef classRef : unit.getClassRefs()) {
 			if (classRef.getJavaPersistentType() != null) { // null if
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java
index dbee958c98..8b0031e1c2 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java
@@ -1283,7 +1283,7 @@ public class JPAEditorUtil {
 	
 	static private HashSet<String> getEntityNames(JpaProject jpaProject) {
 		HashSet<String> names = new HashSet<String>();
-		ListIterator<PersistenceUnit> lit = jpaProject.getContextModelRoot().getPersistenceXml().
+		ListIterator<PersistenceUnit> lit = jpaProject.getContextRoot().getPersistenceXml().
 												getRoot().getPersistenceUnits().iterator();
 		PersistenceUnit pu = lit.next();
 		for (ClassRef cf : pu.getClassRefs()) {
@@ -1294,7 +1294,7 @@ public class JPAEditorUtil {
 	
 	static private HashSet<String> getEntitySimpleNames(JpaProject jpaProject) {
 		HashSet<String> names = new HashSet<String>();
-		ListIterator<PersistenceUnit> lit = jpaProject.getContextModelRoot().getPersistenceXml().
+		ListIterator<PersistenceUnit> lit = jpaProject.getContextRoot().getPersistenceXml().
 												getRoot().getPersistenceUnits().iterator();
 		PersistenceUnit pu = lit.next();			
 		for (ClassRef cf : pu.getClassRefs()) {
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java
index a9bc5d83e6..0e692cc095 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java
@@ -665,7 +665,7 @@ public class JpaArtifactFactory {
 		HashSet<PersistentType> embeddingEntities = new HashSet<PersistentType>();
 		if(!isEmbeddable(embeddable))
 			return embeddingEntities;
-		ListIterator<PersistenceUnit> lit = embeddable.getJpaProject().getContextModelRoot().getPersistenceXml().getRoot().getPersistenceUnits().iterator();		
+		ListIterator<PersistenceUnit> lit = embeddable.getJpaProject().getContextRoot().getPersistenceXml().getRoot().getPersistenceUnits().iterator();		
 		PersistenceUnit pu = lit.next();
 		for(PersistentType jpt : pu.getPersistentTypes()){
 			if(!jpt.getName().equals(embeddable.getName())){
@@ -741,7 +741,7 @@ public class JpaArtifactFactory {
 		
 		if(attributeType == null) {
 			PersistentType jpt = (PersistentType) attribute.getParent();
-			jpt.getJpaProject().getContextModelRoot().synchronizeWithResourceModel();
+			jpt.getJpaProject().getContextRoot().synchronizeWithResourceModel();
 			JavaResourceType jrt = jpt.getJavaResourceType();
 			jrt.getJavaResourceCompilationUnit().synchronizeWithJavaSource();
 			jpt.update();
@@ -1121,7 +1121,7 @@ public class JpaArtifactFactory {
 	 * @return the {@link PersistentType} registered in the {@link PersistenceUnit} with the given name.
 	 */
 	public PersistentType getJPT(String name, PersistenceUnit pu) {
-		pu.getJpaProject().getContextModelRoot().synchronizeWithResourceModel();
+		pu.getJpaProject().getContextRoot().synchronizeWithResourceModel();
 		pu.synchronizeWithResourceModel();
 		pu.update();
 		PersistentType jpt = pu.getPersistentType(name);
@@ -1652,9 +1652,9 @@ public class JpaArtifactFactory {
 	}
 	
 	public PersistenceUnit getPersistenceUnit(JpaProject project) {
-		if(project.getContextModelRoot().getPersistenceXml() == null)
+		if(project.getContextRoot().getPersistenceXml() == null)
 			return null;
-		return project.getContextModelRoot().getPersistenceXml().getRoot()
+		return project.getContextRoot().getPersistenceXml().getRoot()
 				.getPersistenceUnits().iterator().next();
 	}
 	
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/JPACreateFactory.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/JPACreateFactory.java
index e27760a8dd..bcf88e3337 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/JPACreateFactory.java
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/JPACreateFactory.java
@@ -46,7 +46,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
 import org.eclipse.jpt.jpa.core.JpaFile;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.JpaStructureNode;
-import org.eclipse.jpt.jpa.core.context.JpaContextModelRoot;
+import org.eclipse.jpt.jpa.core.context.JpaContextRoot;
 import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml;
@@ -224,7 +224,7 @@ public class JPACreateFactory {
 		String name = nameElements.get(Math.max(0, nameElements.size()-1));
 //		SynchronousJpaProjectUpdater updater = new SynchronousJpaProjectUpdater(jpaProject);
 //		updater.start();
-		JpaContextModelRoot jpaProjectContent = jpaProject.getContextModelRoot();
+		JpaContextRoot jpaProjectContent = jpaProject.getContextRoot();
 		PersistenceXml persXML = jpaProjectContent.getPersistenceXml();
 		int cnt = 0;
 		while ((persXML == null) && (cnt < 100)) {		
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationAttributesTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationAttributesTest.java
index 5e817bbf23..5a156cfc52 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationAttributesTest.java
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationAttributesTest.java
@@ -112,7 +112,7 @@ public class CreateRelationAttributesTest {
 		PersistentAttribute attr = JpaArtifactFactory.instance().
 				addAttribute(t1, t2, null, "add", "add", false);
 		jpaProject.getProject().build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor());
-		PersistenceUnit pu = jpaProject.getContextModelRoot().getPersistenceXml().getRoot().getPersistenceUnits().iterator().next();
+		PersistenceUnit pu = jpaProject.getContextRoot().getPersistenceXml().getRoot().getPersistenceUnits().iterator().next();
 		t1 = pu.getPersistentType("abc.Customer");
 		assertNotNull(attr);			
 
diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/CreateDeleteEntity.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/CreateDeleteEntity.java
index d3b9c2ef6b..b0562392fa 100644
--- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/CreateDeleteEntity.java
+++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/CreateDeleteEntity.java
@@ -21,7 +21,7 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType;
 import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.core.context.JpaContextModelRoot;
+import org.eclipse.jpt.jpa.core.context.JpaContextRoot;
 import org.eclipse.jpt.jpa.core.context.PersistentType;
 import org.eclipse.jpt.jpa.core.context.persistence.Persistence;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
@@ -51,7 +51,7 @@ public class CreateDeleteEntity {
 		assertNotNull(jpaProject);
 //		SynchronousJpaProjectUpdater updater = new SynchronousJpaProjectUpdater(jpaProject);
 //		updater.start();
-		JpaContextModelRoot jpaProjectContent = jpaProject.getContextModelRoot();
+		JpaContextRoot jpaProjectContent = jpaProject.getContextRoot();
 		assertNotNull(jpaProjectContent);		
 //		if(jpaProjectContent.getPersistenceXml() == null) {		
 //			updater = new SynchronousJpaProjectUpdater(jpaProject);