clean up JpaContextModel.synchronizeWithResourceModel(...)

20 files changed, 78 insertions, 77 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextModel.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextModel.java
index b7d21d5237..223557b416 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextModel.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextModel.java
@@ -449,12 +449,12 @@ public abstract class AbstractJpaContextModel<P extends JpaContextModel>
 		 * appropriate (as opposed to simply rebuilding them in place).
 		 * </ul>
 		 */
-		public void synchronizeWithResourceModel() {
-			this.sync(true, null);  // true = sync
+		public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+			this.sync(true, monitor);  // true = sync
 		}
 
 		/**
-		 * @see #synchronizeWithResourceModel()
+		 * @see #synchronizeWithResourceModel(IProgressMonitor)
 		 */
 		public void update(IProgressMonitor monitor) {
 			this.sync(false, monitor);  // false = update
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/ContextContainerTools.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/ContextContainerTools.java
index cde262f34b..93ac15c8e9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/ContextContainerTools.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/ContextContainerTools.java
@@ -77,13 +77,14 @@ public class ContextContainerTools {
 	 * <li>the Java resource model will re-use existing annotations when
 	 * appropriate (as opposed to simply rebuilding them in place).
 	 * </ul>
+	 * @param monitor TODO
 	 */
-	public static <C extends JpaContextModel, R> void synchronizeWithResourceModel(Adapter<C, R> adapter) {
-		sync(adapter, true, null);  // true = sync
+	public static <C extends JpaContextModel, R> void synchronizeWithResourceModel(Adapter<C, R> adapter, IProgressMonitor monitor) {
+		sync(adapter, true, monitor);  // true = sync
 	}
 
 	/**
-	 * @see #synchronizeWithResourceModel(Adapter)
+	 * @see #synchronizeWithResourceModel(Adapter, IProgressMonitor)
 	 */
 	public static <C extends JpaContextModel, R> void update(Adapter<C, R> adapter, IProgressMonitor monitor) {
 		sync(adapter, false, monitor);  // false = update
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java
index 57dd8232af..6d4c6d0254 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java
@@ -176,8 +176,8 @@ public abstract class AbstractJavaEntity
 		super.synchronizeWithResourceModel(monitor);
 		this.setSpecifiedName_(this.mappingAnnotation.getName());
 		this.table.synchronizeWithResourceModel(monitor);
-		this.syncSpecifiedSecondaryTables();
-		this.syncSpecifiedPrimaryKeyJoinColumns();
+		this.syncSpecifiedSecondaryTables(monitor);
+		this.syncSpecifiedPrimaryKeyJoinColumns(monitor);
 		this.setSpecifiedInheritanceStrategy_(this.buildSpecifiedInheritanceStrategy());
 		this.setSpecifiedDiscriminatorValue_(this.getDiscriminatorValueAnnotation().getValue());
 		this.discriminatorColumn.synchronizeWithResourceModel(monitor);
@@ -429,8 +429,8 @@ public abstract class AbstractJavaEntity
 		return this.getJpaFactory().buildJavaSecondaryTable(this.specifiedSecondaryTableParentAdapter, secondaryTableAnnotation);
 	}
 
-	protected void syncSpecifiedSecondaryTables() {
-		this.specifiedSecondaryTableContainer.synchronizeWithResourceModel();
+	protected void syncSpecifiedSecondaryTables(IProgressMonitor monitor) {
+		this.specifiedSecondaryTableContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<SecondaryTableAnnotation> getSecondaryTableAnnotations() {
@@ -546,8 +546,8 @@ public abstract class AbstractJavaEntity
 		this.specifiedPrimaryKeyJoinColumnContainer.move(targetIndex, sourceIndex);
 	}
 
-	protected void syncSpecifiedPrimaryKeyJoinColumns() {
-		this.specifiedPrimaryKeyJoinColumnContainer.synchronizeWithResourceModel();
+	protected void syncSpecifiedPrimaryKeyJoinColumns(IProgressMonitor monitor) {
+		this.specifiedPrimaryKeyJoinColumnContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<PrimaryKeyJoinColumnAnnotation> getPrimaryKeyJoinColumnAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java
index 8500de24c1..fb80ceb261 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java
@@ -52,7 +52,7 @@ public abstract class AbstractJavaJoinColumnRelationshipStrategy<P extends JavaJ
 	@Override
 	public void synchronizeWithResourceModel(IProgressMonitor monitor) {
 		super.synchronizeWithResourceModel(monitor);
-		this.syncSpecifiedJoinColumns();
+		this.syncSpecifiedJoinColumns(monitor);
 	}
 
 	@Override
@@ -136,8 +136,8 @@ public abstract class AbstractJavaJoinColumnRelationshipStrategy<P extends JavaJ
 		this.specifiedJoinColumnContainer.clear();
 	}
 
-	protected void syncSpecifiedJoinColumns() {
-		this.specifiedJoinColumnContainer.synchronizeWithResourceModel();
+	protected void syncSpecifiedJoinColumns(IProgressMonitor monitor) {
+		this.specifiedJoinColumnContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ContextListContainer<JavaSpecifiedJoinColumn, JoinColumnAnnotation> buildSpecifiedJoinColumnContainer() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java
index 121d9f3c6f..393a365d97 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java
@@ -154,7 +154,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi
 
 		this.mapKeyColumn.synchronizeWithResourceModel(monitor);
 		this.syncMapKeyConverter(monitor);
-		this.syncSpecifiedMapKeyJoinColumns();
+		this.syncSpecifiedMapKeyJoinColumns(monitor);
 
 		this.mapKeyAttributeOverrideContainer.synchronizeWithResourceModel(monitor);
 	}
@@ -739,8 +739,8 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi
 		this.specifiedMapKeyJoinColumnContainer.move(targetIndex, sourceIndex);
 	}
 
-	protected void syncSpecifiedMapKeyJoinColumns() {
-		this.specifiedMapKeyJoinColumnContainer.synchronizeWithResourceModel();
+	protected void syncSpecifiedMapKeyJoinColumns(IProgressMonitor monitor) {
+		this.specifiedMapKeyJoinColumnContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ContextListContainer<JavaSpecifiedJoinColumn, MapKeyJoinColumnAnnotation2_0> buildSpecifiedMapKeyJoinColumnContainer() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java
index c18eeb6c24..740066b912 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java
@@ -79,7 +79,7 @@ public abstract class AbstractJavaNamedColumn<PA extends NamedColumn.ParentAdapt
 	@Override
 	public void synchronizeWithResourceModel(IProgressMonitor monitor) {
 		super.synchronizeWithResourceModel(monitor);
-		this.synchronizeWithResourceModel(getColumnAnnotation());
+		this.synchronizeWithResourceModel(this.getColumnAnnotation());
 	}
 
 	protected void synchronizeWithResourceModel(A columnAnnotation) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java
index cb349c46ae..b9dcaa612c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java
@@ -58,7 +58,7 @@ public abstract class AbstractJavaQuery<P extends JavaQueryContainer, A extends
 	public void synchronizeWithResourceModel(IProgressMonitor monitor) {
 		super.synchronizeWithResourceModel(monitor);
 		this.setName_(this.queryAnnotation.getName());
-		this.syncHints();
+		this.syncHints(monitor);
 	}
 
 	@Override
@@ -127,8 +127,8 @@ public abstract class AbstractJavaQuery<P extends JavaQueryContainer, A extends
 		return this.getJpaFactory().buildJavaQueryHint(this, hintAnnotation);
 	}
 
-	protected void syncHints() {
-		this.hintContainer.synchronizeWithResourceModel();
+	protected void syncHints(IProgressMonitor monitor) {
+		this.hintContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<QueryHintAnnotation> getHintAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java
index d7324e16cb..3a7d01b19f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java
@@ -87,7 +87,7 @@ public abstract class AbstractJavaTable<P extends JpaContextModel, PA extends Ta
 		this.setSpecifiedName_(this.buildSpecifiedName());
 		this.setSpecifiedSchema_(this.buildSpecifiedSchema());
 		this.setSpecifiedCatalog_(this.buildSpecifiedCatalog());
-		this.syncUniqueConstraints();
+		this.syncUniqueConstraints(monitor);
 	}
 
 	@Override
@@ -290,8 +290,8 @@ public abstract class AbstractJavaTable<P extends JpaContextModel, PA extends Ta
 		this.uniqueConstraintContainer.move(targetIndex, sourceIndex);
 	}
 
-	protected void syncUniqueConstraints() {
-		this.uniqueConstraintContainer.synchronizeWithResourceModel();
+	protected void syncUniqueConstraints(IProgressMonitor monitor) {
+		this.uniqueConstraintContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected JavaSpecifiedUniqueConstraint buildUniqueConstraint(UniqueConstraintAnnotation constraintAnnotation) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java
index 8078322740..6f3701b930 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java
@@ -59,7 +59,7 @@ public class GenericJavaPrimaryKeyJoinColumnRelationshipStrategy
 	@Override
 	public void synchronizeWithResourceModel(IProgressMonitor monitor) {
 		super.synchronizeWithResourceModel(monitor);
-		this.syncPrimaryKeyJoinColumns();
+		this.syncPrimaryKeyJoinColumns(monitor);
 	}
 
 	@Override
@@ -110,8 +110,8 @@ public class GenericJavaPrimaryKeyJoinColumnRelationshipStrategy
 		this.primaryKeyJoinColumnContainer.move(targetIndex, sourceIndex);
 	}
 
-	protected void syncPrimaryKeyJoinColumns() {
-		this.primaryKeyJoinColumnContainer.synchronizeWithResourceModel();
+	protected void syncPrimaryKeyJoinColumns(IProgressMonitor monitor) {
+		this.primaryKeyJoinColumnContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ContextListContainer<JavaSpecifiedPrimaryKeyJoinColumn, PrimaryKeyJoinColumnAnnotation> buildPrimaryKeyJoinColumnContainer() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java
index 79d1d2f11b..e6ad6aa42f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java
@@ -168,10 +168,10 @@ public abstract class AbstractEntityMappings
 
 		this.persistenceUnitMetadata.synchronizeWithResourceModel(monitor);
 
-		this.syncManagedTypes();
+		this.syncManagedTypes(monitor);
 
-		this.syncSequenceGenerators();
-		this.syncTableGenerators();
+		this.syncSequenceGenerators(monitor);
+		this.syncTableGenerators(monitor);
 
 		this.queryContainer.synchronizeWithResourceModel(monitor);
 	}
@@ -865,8 +865,8 @@ public abstract class AbstractEntityMappings
 		}
 	}
 
-	protected void syncManagedTypes() {
-		ContextContainerTools.synchronizeWithResourceModel(this.managedTypeContainerAdapter);
+	protected void syncManagedTypes(IProgressMonitor monitor) {
+		ContextContainerTools.synchronizeWithResourceModel(this.managedTypeContainerAdapter, monitor);
 	}
 
 	protected Iterable<XmlManagedType> getXmlManagedTypes() {
@@ -976,8 +976,8 @@ public abstract class AbstractEntityMappings
 		this.xmlEntityMappings.getSequenceGenerators().move(targetIndex, sourceIndex);
 	}
 
-	protected void syncSequenceGenerators() {
-		this.sequenceGeneratorContainer.synchronizeWithResourceModel();
+	protected void syncSequenceGenerators(IProgressMonitor monitor) {
+		this.sequenceGeneratorContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<XmlSequenceGenerator> getXmlSequenceGenerators() {
@@ -1050,8 +1050,8 @@ public abstract class AbstractEntityMappings
 		this.xmlEntityMappings.getTableGenerators().move(targetIndex, sourceIndex);
 	}
 
-	protected void syncTableGenerators() {
-		this.tableGeneratorContainer.synchronizeWithResourceModel();
+	protected void syncTableGenerators(IProgressMonitor monitor) {
+		this.tableGeneratorContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<XmlTableGenerator> getXmlTableGenerators() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java
index 1f3c69d5b5..caf9a6c4e7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java
@@ -202,9 +202,9 @@ public abstract class AbstractOrmEntity<X extends XmlEntity>
 		
 		this.table.synchronizeWithResourceModel(monitor);
 		
-		this.syncSpecifiedSecondaryTables();
+		this.syncSpecifiedSecondaryTables(monitor);
 		
-		this.syncSpecifiedPrimaryKeyJoinColumns();
+		this.syncSpecifiedPrimaryKeyJoinColumns(monitor);
 		
 		this.setSpecifiedInheritanceStrategy_(this.buildSpecifiedInheritanceStrategy());
 		this.setSpecifiedDiscriminatorValue_(this.xmlTypeMapping.getDiscriminatorValue());
@@ -535,8 +535,8 @@ public abstract class AbstractOrmEntity<X extends XmlEntity>
 		this.xmlTypeMapping.getSecondaryTables().clear();
 	}
 
-	protected void syncSpecifiedSecondaryTables() {
-		this.specifiedSecondaryTableContainer.synchronizeWithResourceModel();
+	protected void syncSpecifiedSecondaryTables(IProgressMonitor monitor) {
+		this.specifiedSecondaryTableContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<XmlSecondaryTable> getXmlSecondaryTables() {
@@ -794,8 +794,8 @@ public abstract class AbstractOrmEntity<X extends XmlEntity>
 		return new PrimaryKeyJoinColumnParentAdapter();
 	}
 
-	protected void syncSpecifiedPrimaryKeyJoinColumns() {
-		this.specifiedPrimaryKeyJoinColumnContainer.synchronizeWithResourceModel();
+	protected void syncSpecifiedPrimaryKeyJoinColumns(IProgressMonitor monitor) {
+		this.specifiedPrimaryKeyJoinColumnContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<XmlPrimaryKeyJoinColumn> getXmlPrimaryKeyJoinColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java
index 9a435e3250..fc47ca75ad 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java
@@ -54,7 +54,7 @@ public abstract class AbstractOrmJoinColumnRelationshipStrategy<P extends OrmJoi
 	@Override
 	public void synchronizeWithResourceModel(IProgressMonitor monitor) {
 		super.synchronizeWithResourceModel(monitor);
-		this.syncSpecifiedJoinColumns();
+		this.syncSpecifiedJoinColumns(monitor);
 	}
 
 	@Override
@@ -147,8 +147,8 @@ public abstract class AbstractOrmJoinColumnRelationshipStrategy<P extends OrmJoi
 		this.getXmlJoinColumnContainer().getJoinColumns().move(targetIndex, sourceIndex);
 	}
 
-	protected void syncSpecifiedJoinColumns() {
-		this.specifiedJoinColumnContainer.synchronizeWithResourceModel();
+	protected void syncSpecifiedJoinColumns(IProgressMonitor monitor) {
+		this.specifiedJoinColumnContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<XmlJoinColumn> getXmlJoinColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java
index 3d1bb37e95..b3762584d5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java
@@ -162,7 +162,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM
 		this.syncMapKeyConverter(monitor);
 
 		this.mapKeyAttributeOverrideContainer.synchronizeWithResourceModel(monitor);
-		this.syncSpecifiedMapKeyJoinColumns();
+		this.syncSpecifiedMapKeyJoinColumns(monitor);
 	}
 
 	@Override
@@ -763,8 +763,8 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM
 		this.getXmlAttributeMapping().getMapKeyJoinColumns().move(targetIndex, sourceIndex);
 	}
 
-	protected void syncSpecifiedMapKeyJoinColumns() {
-		this.specifiedMapKeyJoinColumnContainer.synchronizeWithResourceModel();
+	protected void syncSpecifiedMapKeyJoinColumns(IProgressMonitor monitor) {
+		this.specifiedMapKeyJoinColumnContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<XmlJoinColumn> getXmlMapKeyJoinColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java
index 5a36796bd7..2e5bd9434b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java
@@ -61,7 +61,7 @@ public abstract class AbstractOrmQuery<X extends XmlQuery>
 	public void synchronizeWithResourceModel(IProgressMonitor monitor) {
 		super.synchronizeWithResourceModel(monitor);
 		this.setName_(this.xmlQuery.getName());
-		this.syncHints();
+		this.syncHints(monitor);
 	}
 
 	@Override
@@ -136,8 +136,8 @@ public abstract class AbstractOrmQuery<X extends XmlQuery>
 		return this.getContextModelFactory().buildOrmQueryHint(this, xmlHint);
 	}
 
-	protected void syncHints() {
-		this.hintContainer.synchronizeWithResourceModel();
+	protected void syncHints(IProgressMonitor monitor) {
+		this.hintContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<XmlQueryHint> getXmlHints() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java
index ea5d6a4a21..38c478c1bb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java
@@ -90,7 +90,7 @@ public abstract class AbstractOrmTable<P extends JpaContextModel, PA extends Tab
 		this.setSpecifiedName_(this.buildSpecifiedName());
 		this.setSpecifiedSchema_(this.buildSpecifiedSchema());
 		this.setSpecifiedCatalog_(this.buildSpecifiedCatalog());
-		this.syncUniqueConstraints();
+		this.syncUniqueConstraints(monitor);
 	}
 
 	@Override
@@ -320,8 +320,8 @@ public abstract class AbstractOrmTable<P extends JpaContextModel, PA extends Tab
 		return this.getContextModelFactory().buildOrmUniqueConstraint(this, xmlConstraint);
 	}
 
-	protected void syncUniqueConstraints() {
-		this.uniqueConstraintContainer.synchronizeWithResourceModel();
+	protected void syncUniqueConstraints(IProgressMonitor monitor) {
+		this.uniqueConstraintContainer.synchronizeWithResourceModel(monitor);
 	}
 	protected ListIterable<XmlUniqueConstraint> getXmlUniqueConstraints() {
 		X xmlTable = this.getXmlTable();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java
index 5d02248a2e..a8b5b5ec58 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java
@@ -71,7 +71,7 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping>
 	@Override
 	public void synchronizeWithResourceModel(IProgressMonitor monitor) {
 		super.synchronizeWithResourceModel(monitor);
-		setSpecifiedMetadataComplete_(xmlTypeMapping.getMetadataComplete());
+		setSpecifiedMetadataComplete_(this.xmlTypeMapping.getMetadataComplete());
 		setSpecifiedParentClass_(buildSpecifiedParentClass());
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java
index 391e674ea5..3724f05734 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java
@@ -60,7 +60,7 @@ public class GenericOrmPrimaryKeyJoinColumnRelationshipStrategy
 	@Override
 	public void synchronizeWithResourceModel(IProgressMonitor monitor) {
 		super.synchronizeWithResourceModel(monitor);
-		this.syncPrimaryKeyJoinColumns();
+		this.syncPrimaryKeyJoinColumns(monitor);
 	}
 
 	@Override
@@ -118,8 +118,8 @@ public class GenericOrmPrimaryKeyJoinColumnRelationshipStrategy
 	}
 
 
-	protected void syncPrimaryKeyJoinColumns() {
-		this.primaryKeyJoinColumnContainer.synchronizeWithResourceModel();
+	protected void syncPrimaryKeyJoinColumns(IProgressMonitor monitor) {
+		this.primaryKeyJoinColumnContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<XmlPrimaryKeyJoinColumn> getXmlPrimaryKeyJoinColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
index 4d384a576c..565f5196f1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
@@ -120,7 +120,7 @@ public abstract class SpecifiedOrmPersistentType
 		super.synchronizeWithResourceModel(monitor);
 		this.mapping.synchronizeWithResourceModel(monitor);
 		this.setSpecifiedAccess_(this.buildSpecifiedAccess());
-		this.syncSpecifiedAttributes();
+		this.syncSpecifiedAttributes(monitor);
 		this.synchronizeModelsWithResourceModel(this.getDefaultAttributes(), monitor);
 	}
 
@@ -546,8 +546,8 @@ public abstract class SpecifiedOrmPersistentType
 		return this.getContextModelFactory().buildOrmPersistentAttribute(this, xmlMapping);
 	}
 
-	protected void syncSpecifiedAttributes() {
-		ContextContainerTools.synchronizeWithResourceModel(this.specifiedAttributeContainerAdapter);
+	protected void syncSpecifiedAttributes(IProgressMonitor monitor) {
+		ContextContainerTools.synchronizeWithResourceModel(this.specifiedAttributeContainerAdapter, monitor);
 	}
 
 	protected void moveSpecifiedAttribute_(int index, OrmSpecifiedPersistentAttribute attribute) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractMappingFileRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractMappingFileRef.java
index dff4acbdb7..db2debbd64 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractMappingFileRef.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractMappingFileRef.java
@@ -71,7 +71,7 @@ public abstract class AbstractMappingFileRef<MF extends MappingFile>
 	@Override
 	public void synchronizeWithResourceModel(IProgressMonitor monitor) {
 		super.synchronizeWithResourceModel(monitor);
-		this.syncMappingFile();
+		this.syncMappingFile(monitor);
 	}
 
 	@Override
@@ -112,8 +112,8 @@ public abstract class AbstractMappingFileRef<MF extends MappingFile>
 
 	protected abstract MF buildMappingFile();
 
-	protected void syncMappingFile() {
-		this.syncMappingFile(true, null);
+	protected void syncMappingFile(IProgressMonitor monitor) {
+		this.syncMappingFile(true, monitor);
 	}
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java
index f2c46000c3..047572dd6e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java
@@ -260,15 +260,15 @@ public abstract class AbstractPersistenceUnit
 		this.setJtaDataSource_(this.xmlPersistenceUnit.getJtaDataSource());
 		this.setNonJtaDataSource_(this.xmlPersistenceUnit.getNonJtaDataSource());
 
-		this.syncSpecifiedMappingFileRefs();
+		this.syncSpecifiedMappingFileRefs(monitor);
 		this.syncImpliedMappingFileRef(monitor);
 
-		this.syncJarFileRefs();
+		this.syncJarFileRefs(monitor);
 
-		this.syncSpecifiedClassRefs();
+		this.syncSpecifiedClassRefs(monitor);
 		this.synchronizeModelsWithResourceModel(this.getImpliedClassRefs(), monitor);
 
-		this.syncProperties();
+		this.syncProperties(monitor);
 
 		this.setSpecifiedSharedCacheMode_(this.buildSpecifiedSharedCacheMode());
 		this.setSpecifiedValidationMode_(this.buildSpecifiedValidationMode());
@@ -605,8 +605,8 @@ public abstract class AbstractPersistenceUnit
 		this.specifiedMappingFileRefContainer.remove(index);
 	}
 
-	protected void syncSpecifiedMappingFileRefs() {
-		this.specifiedMappingFileRefContainer.synchronizeWithResourceModel();
+	protected void syncSpecifiedMappingFileRefs(IProgressMonitor monitor) {
+		this.specifiedMappingFileRefContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<XmlMappingFileRef> getXmlMappingFileRefs() {
@@ -735,8 +735,8 @@ public abstract class AbstractPersistenceUnit
 		this.jarFileRefContainer.remove(index);
 	}
 
-	protected void syncJarFileRefs() {
-		this.jarFileRefContainer.synchronizeWithResourceModel();
+	protected void syncJarFileRefs(IProgressMonitor monitor) {
+		this.jarFileRefContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<XmlJarFileRef> getXmlJarFileRefs() {
@@ -847,8 +847,8 @@ public abstract class AbstractPersistenceUnit
 		this.xmlPersistenceUnit.getClasses().removeAll(xmlClassRefs);
 	}
 
-	protected void syncSpecifiedClassRefs() {
-		this.specifiedClassRefContainer.synchronizeWithResourceModel();
+	protected void syncSpecifiedClassRefs(IProgressMonitor monitor) {
+		this.specifiedClassRefContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<XmlJavaClassRef> getXmlClassRefs() {
@@ -1186,8 +1186,8 @@ public abstract class AbstractPersistenceUnit
 				new NullGenericSchemaGeneration2_1(this);
 	}
 
-	protected void syncProperties() {
-		this.propertyContainer.synchronizeWithResourceModel();
+	protected void syncProperties(IProgressMonitor monitor) {
+		this.propertyContainer.synchronizeWithResourceModel(monitor);
 	}
 
 	protected ListIterable<XmlProperty> getXmlProperties() {