Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2016-01-04 14:34:03 -0500
committerBrian Vosburgh2016-01-04 14:34:03 -0500
commit23a1a420e7a2c0d5c5c4d20fc1b9a91da9dd6052 (patch)
tree71da4ab68368ac16d885bb99b04b2f3b9e0e3513
parentc582b135623b25302aa21c299bca01e97cd44e1a (diff)
downloadwebtools.dali-23a1a420e7a2c0d5c5c4d20fc1b9a91da9dd6052.tar.gz
webtools.dali-23a1a420e7a2c0d5c5c4d20fc1b9a91da9dd6052.tar.xz
webtools.dali-23a1a420e7a2c0d5c5c4d20fc1b9a91da9dd6052.zip
clean up JpaContextModel.synchronizeWithResourceModel(...)
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextModel.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/ContextContainerTools.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractMappingFileRef.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java24
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericContextRoot.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaNamedStoredProcedureQuery2_1.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmNamedStoredProcedureQuery2_1.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterContainerImpl.java24
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkAbstractOrmConverterContainer.java24
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistenceUnitDefaults.java6
49 files changed, 196 insertions, 195 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() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericContextRoot.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericContextRoot.java
index 4d03605852..ee4a9d3ecc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericContextRoot.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericContextRoot.java
@@ -69,7 +69,7 @@ public class GenericContextRoot
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncPersistenceXml();
+ this.syncPersistenceXml(monitor);
}
@Override
@@ -96,8 +96,8 @@ public class GenericContextRoot
return (xmlResource == null) ? null : this.buildPersistenceXml(xmlResource);
}
- protected void syncPersistenceXml() {
- this.syncPersistenceXml(true, null);
+ protected void syncPersistenceXml(IProgressMonitor monitor) {
+ this.syncPersistenceXml(true, monitor);
}
/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java
index 28d6d4ad37..3191468252 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java
@@ -63,7 +63,7 @@ public class GenericJarFile
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncJavaManagedTypes();
+ this.syncJavaManagedTypes(monitor);
}
@Override
@@ -104,8 +104,8 @@ public class GenericJarFile
return this.javaManagedTypeContainer.size();
}
- protected void syncJavaManagedTypes() {
- this.javaManagedTypeContainer.synchronizeWithResourceModel();
+ protected void syncJavaManagedTypes(IProgressMonitor monitor) {
+ this.javaManagedTypeContainer.synchronizeWithResourceModel(monitor);
}
protected void addJavaManagedType(JavaResourceType jrt) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java
index 497870ab0f..dbe884a55e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java
@@ -73,7 +73,7 @@ public class GenericJavaJoinTable
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncSpecifiedInverseJoinColumns();
+ this.syncSpecifiedInverseJoinColumns(monitor);
}
@Override
@@ -163,8 +163,8 @@ public class GenericJavaJoinTable
this.specifiedInverseJoinColumnContainer.clear();
}
- protected void syncSpecifiedInverseJoinColumns() {
- this.specifiedInverseJoinColumnContainer.synchronizeWithResourceModel();
+ protected void syncSpecifiedInverseJoinColumns(IProgressMonitor monitor) {
+ this.specifiedInverseJoinColumnContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<JoinColumnAnnotation> getInverseJoinColumnAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java
index d8998ecd38..3994e1577e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java
@@ -56,9 +56,9 @@ public class GenericJavaQueryContainer
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncNamedQueries();
- this.syncNamedNativeQueries();
- this.syncNamedStoredProcedureQueries();
+ this.syncNamedQueries(monitor);
+ this.syncNamedNativeQueries(monitor);
+ this.syncNamedStoredProcedureQueries(monitor);
}
@Override
@@ -123,8 +123,8 @@ public class GenericJavaQueryContainer
return this.getJpaFactory().buildJavaNamedQuery(this, namedQueryAnnotation);
}
- protected void syncNamedQueries() {
- this.namedQueryContainer.synchronizeWithResourceModel();
+ protected void syncNamedQueries(IProgressMonitor monitor) {
+ this.namedQueryContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<NamedQueryAnnotation> getNamedQueryAnnotations() {
@@ -198,8 +198,8 @@ public class GenericJavaQueryContainer
return this.getJpaFactory().buildJavaNamedNativeQuery(this, namedNativeQueryAnnotation);
}
- protected void syncNamedNativeQueries() {
- this.namedNativeQueryContainer.synchronizeWithResourceModel();
+ protected void syncNamedNativeQueries(IProgressMonitor monitor) {
+ this.namedNativeQueryContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<NamedNativeQueryAnnotation> getNamedNativeQueryAnnotations() {
@@ -272,8 +272,8 @@ public class GenericJavaQueryContainer
return this.getJpaFactory2_1().buildJavaNamedStoredProcedureQuery(this, namedStoredProcedureQueryAnnotation);
}
- protected void syncNamedStoredProcedureQueries() {
- this.namedStoredProcedureQueryContainer.synchronizeWithResourceModel();
+ protected void syncNamedStoredProcedureQueries(IProgressMonitor monitor) {
+ this.namedStoredProcedureQueryContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<NamedStoredProcedureQueryAnnotation2_1> getNamedStoredProcedureQueryAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java
index 7f7484c16a..e78b5aeb92 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java
@@ -55,7 +55,7 @@ public abstract class GenericJavaReferenceTable<P extends JpaContextModel, PA ex
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncSpecifiedJoinColumns();
+ this.syncSpecifiedJoinColumns(monitor);
}
@Override
@@ -132,8 +132,8 @@ public abstract class GenericJavaReferenceTable<P extends JpaContextModel, PA ex
this.specifiedJoinColumnContainer.clear();
}
- protected void syncSpecifiedJoinColumns() {
- this.specifiedJoinColumnContainer.synchronizeWithResourceModel();
+ protected void syncSpecifiedJoinColumns(IProgressMonitor monitor) {
+ this.specifiedJoinColumnContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<JoinColumnAnnotation> getJoinColumnAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java
index 60edc8edcc..85f24c112a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java
@@ -60,7 +60,7 @@ public class GenericJavaSecondaryTable
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncSpecifiedPrimaryKeyJoinColumns();
+ this.syncSpecifiedPrimaryKeyJoinColumns(monitor);
}
@Override
@@ -174,8 +174,8 @@ public class GenericJavaSecondaryTable
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/jpa1/context/java/GenericJavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java
index 7d036bc233..11c6103eb4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java
@@ -87,7 +87,7 @@ public class GenericJavaTableGenerator
this.setSpecifiedPkColumnName_(this.generatorAnnotation.getPkColumnName());
this.setSpecifiedValueColumnName_(this.generatorAnnotation.getValueColumnName());
this.setSpecifiedPkColumnValue_(this.generatorAnnotation.getPkColumnValue());
- this.syncUniqueConstraints();
+ this.syncUniqueConstraints(monitor);
}
@Override
@@ -370,12 +370,12 @@ public class GenericJavaTableGenerator
this.uniqueConstraintContainer.move(targetIndex, sourceIndex);
}
- protected void syncUniqueConstraints() {
- this.uniqueConstraintContainer.synchronizeWithResourceModel();
+ protected void syncUniqueConstraints(IProgressMonitor monitor) {
+ this.uniqueConstraintContainer.synchronizeWithResourceModel(monitor);
}
- protected void updateUniqueConstraints() {
- this.uniqueConstraintContainer.synchronizeWithResourceModel();
+ protected void updateUniqueConstraints(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/jpa1/context/orm/AbstractOrmOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java
index 4229d1d868..a3b380064a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java
@@ -76,7 +76,7 @@ public abstract class AbstractOrmOverrideContainer<
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncSpecifiedOverrides();
+ this.syncSpecifiedOverrides(monitor);
// the virtual overrides do not need a sync
}
@@ -247,8 +247,8 @@ public abstract class AbstractOrmOverrideContainer<
protected abstract S buildSpecifiedOverride(X xmlOverride);
- protected void syncSpecifiedOverrides() {
- ContextContainerTools.synchronizeWithResourceModel(this.specifiedOverrideContainerAdapter);
+ protected void syncSpecifiedOverrides(IProgressMonitor monitor) {
+ ContextContainerTools.synchronizeWithResourceModel(this.specifiedOverrideContainerAdapter, monitor);
}
protected Iterable<X> getXmlOverrides() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java
index 0c6676618e..72ea8d3e2d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java
@@ -69,7 +69,7 @@ public class GenericOrmJoinTable
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncSpecifiedInverseJoinColumns();
+ this.syncSpecifiedInverseJoinColumns(monitor);
if (this.defaultInverseJoinColumn != null) {
this.defaultInverseJoinColumn.synchronizeWithResourceModel(monitor);
}
@@ -166,8 +166,8 @@ public class GenericOrmJoinTable
this.getXmlTable().getInverseJoinColumns().clear();
}
- protected void syncSpecifiedInverseJoinColumns() {
- this.specifiedInverseJoinColumnContainer.synchronizeWithResourceModel();
+ protected void syncSpecifiedInverseJoinColumns(IProgressMonitor monitor) {
+ this.specifiedInverseJoinColumnContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlJoinColumn> getXmlInverseJoinColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java
index d76773d3a7..17452feb79 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java
@@ -62,9 +62,9 @@ public class GenericOrmQueryContainer
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncNamedQueries();
- this.syncNamedNativeQueries();
- this.syncNamedStoredProcedureQueries();
+ this.syncNamedQueries(monitor);
+ this.syncNamedNativeQueries(monitor);
+ this.syncNamedStoredProcedureQueries(monitor);
}
@Override
@@ -130,8 +130,8 @@ public class GenericOrmQueryContainer
return this.getContextModelFactory().buildOrmNamedQuery(this, xmlNamedQuery);
}
- protected void syncNamedQueries() {
- this.namedQueryContainer.synchronizeWithResourceModel();
+ protected void syncNamedQueries(IProgressMonitor monitor) {
+ this.namedQueryContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlNamedQuery> getXmlNamedQueries() {
@@ -203,8 +203,8 @@ public class GenericOrmQueryContainer
return this.getContextModelFactory().buildOrmNamedNativeQuery(this, xmlNamedNativeQuery);
}
- protected void syncNamedNativeQueries() {
- this.namedNativeQueryContainer.synchronizeWithResourceModel();
+ protected void syncNamedNativeQueries(IProgressMonitor monitor) {
+ this.namedNativeQueryContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlNamedNativeQuery> getXmlNamedNativeQueries() {
@@ -282,8 +282,8 @@ public class GenericOrmQueryContainer
null;
}
- protected void syncNamedStoredProcedureQueries() {
- this.namedStoredProcedureQueryContainer.synchronizeWithResourceModel();
+ protected void syncNamedStoredProcedureQueries(IProgressMonitor monitor) {
+ this.namedStoredProcedureQueryContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlNamedStoredProcedureQuery> getXmlNamedStoredProcedureQueries() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java
index 5b662ad922..b26331f5e5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java
@@ -56,7 +56,7 @@ public abstract class GenericOrmReferenceTable<P extends JpaContextModel, PA ext
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncSpecifiedJoinColumns();
+ this.syncSpecifiedJoinColumns(monitor);
}
@Override
@@ -136,8 +136,8 @@ public abstract class GenericOrmReferenceTable<P extends JpaContextModel, PA ext
this.getXmlTable().getJoinColumns().clear();
}
- 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/jpa1/context/orm/GenericOrmSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java
index d4a609507c..71e644ec19 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java
@@ -64,7 +64,7 @@ public class GenericOrmSecondaryTable
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncSpecifiedPrimaryKeyJoinColumns();
+ this.syncSpecifiedPrimaryKeyJoinColumns(monitor);
if (this.defaultPrimaryKeyJoinColumn != null) {
this.defaultPrimaryKeyJoinColumn.synchronizeWithResourceModel(monitor);
}
@@ -190,8 +190,8 @@ public class GenericOrmSecondaryTable
this.xmlSecondaryTable.getPrimaryKeyJoinColumns().move(targetIndex, sourceIndex);
}
- 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/jpa1/context/orm/GenericOrmTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java
index 02df0bf32f..e292e688b0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java
@@ -84,7 +84,7 @@ public class GenericOrmTableGenerator
this.setSpecifiedPkColumnName_(this.xmlGenerator.getPkColumnName());
this.setSpecifiedValueColumnName_(this.xmlGenerator.getValueColumnName());
this.setSpecifiedPkColumnValue_(this.xmlGenerator.getPkColumnValue());
- this.syncUniqueConstraints();
+ this.syncUniqueConstraints(monitor);
}
@Override
@@ -378,8 +378,8 @@ public class GenericOrmTableGenerator
return this.getContextModelFactory().buildOrmUniqueConstraint(this, resourceUniqueConstraint);
}
- protected void syncUniqueConstraints() {
- this.uniqueConstraintContainer.synchronizeWithResourceModel();
+ protected void syncUniqueConstraints(IProgressMonitor monitor) {
+ this.uniqueConstraintContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlUniqueConstraint> getXmlUniqueConstraints() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java
index 0339260aa8..79d23c579c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java
@@ -98,11 +98,11 @@ public class GenericOrmXml
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncEntityMappings();
+ this.syncEntityMappings(monitor);
}
- protected void syncEntityMappings() {
- this.syncEntityMappings(true, null);
+ protected void syncEntityMappings(IProgressMonitor monitor) {
+ this.syncEntityMappings(true, monitor);
}
/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java
index d12dfac415..0fa636848c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java
@@ -78,11 +78,11 @@ public class GenericPersistenceXml
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncPersistence();
+ this.syncPersistence(monitor);
}
- protected void syncPersistence() {
- this.syncPersistence(true, null);
+ protected void syncPersistence(IProgressMonitor monitor) {
+ this.syncPersistence(true, monitor);
}
/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java
index 8ac848dd4a..e9aa3c2095 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java
@@ -221,7 +221,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0
this.mapKeyColumn.synchronizeWithResourceModel(monitor);
this.syncMapKeyConverter(monitor);
this.mapKeyAttributeOverrideContainer.synchronizeWithResourceModel(monitor);
- this.syncSpecifiedMapKeyJoinColumns();
+ this.syncSpecifiedMapKeyJoinColumns(monitor);
}
@Override
@@ -1103,8 +1103,8 @@ public abstract class AbstractJavaElementCollectionMapping2_0
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/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java
index fc19d8d99f..b095b5ab56 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java
@@ -59,7 +59,7 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- setSpecifiedIdAttributeName_(buildSpecifiedIdAttributeName());
+ this.setSpecifiedIdAttributeName_(this.buildSpecifiedIdAttributeName());
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java
index 5225ef4cfd..992459a5cf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java
@@ -222,7 +222,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
this.mapKeyColumn.synchronizeWithResourceModel(monitor);
this.syncMapKeyConverter(monitor);
this.mapKeyAttributeOverrideContainer.synchronizeWithResourceModel(monitor);
- this.syncSpecifiedMapKeyJoinColumns();
+ this.syncSpecifiedMapKeyJoinColumns(monitor);
}
@Override
@@ -1096,8 +1096,8 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
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/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java
index b51b425f98..486767be0c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java
@@ -58,7 +58,7 @@ public class GenericOrmMapsIdDerivedIdentityStrategy2_0
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.setSpecifiedIdAttributeName_(buildSpecifiedIdAttributeName());
+ this.setSpecifiedIdAttributeName_(this.buildSpecifiedIdAttributeName());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaNamedStoredProcedureQuery2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaNamedStoredProcedureQuery2_1.java
index 7f2469a9bd..4527c70fa2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaNamedStoredProcedureQuery2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaNamedStoredProcedureQuery2_1.java
@@ -59,7 +59,7 @@ public class GenericJavaNamedStoredProcedureQuery2_1
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
this.setProcedureName_(this.queryAnnotation.getProcedureName());
- this.syncParameters();
+ this.syncParameters(monitor);
this.syncResultClasses();
this.syncResultSetMappings();
}
@@ -129,8 +129,8 @@ public class GenericJavaNamedStoredProcedureQuery2_1
return this.getJpaFactory2_1().buildJavaStoredProcedureParameter(this, parameterAnnotation);
}
- protected void syncParameters() {
- this.parameterContainer.synchronizeWithResourceModel();
+ protected void syncParameters(IProgressMonitor monitor) {
+ this.parameterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<StoredProcedureParameterAnnotation2_1> getParameterAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmNamedStoredProcedureQuery2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmNamedStoredProcedureQuery2_1.java
index a2b5d12acd..24eef6a762 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmNamedStoredProcedureQuery2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmNamedStoredProcedureQuery2_1.java
@@ -57,7 +57,7 @@ public class GenericOrmNamedStoredProcedureQuery2_1
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
this.setProcedureName_(this.xmlQuery.getProcedureName());
- this.syncParameters();
+ this.syncParameters(monitor);
this.syncResultClasses();
this.syncResultSetMappings();
}
@@ -135,8 +135,8 @@ public class GenericOrmNamedStoredProcedureQuery2_1
null;
}
- protected void syncParameters() {
- this.parameterContainer.synchronizeWithResourceModel();
+ protected void syncParameters(IProgressMonitor monitor) {
+ this.parameterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlStoredProcedureParameter> getXmlParameters() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterContainerImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterContainerImpl.java
index 71784bf53a..cb3d13112c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterContainerImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterContainerImpl.java
@@ -56,10 +56,10 @@ public class EclipseLinkJavaConverterContainerImpl
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncCustomConverters();
- this.syncObjectTypeConverters();
- this.syncStructConverters();
- this.syncTypeConverters();
+ this.syncCustomConverters(monitor);
+ this.syncObjectTypeConverters(monitor);
+ this.syncStructConverters(monitor);
+ this.syncTypeConverters(monitor);
}
@Override
@@ -115,8 +115,8 @@ public class EclipseLinkJavaConverterContainerImpl
return new EclipseLinkJavaCustomConverter(this, converterAnnotation);
}
- protected void syncCustomConverters() {
- this.customConverterContainer.synchronizeWithResourceModel();
+ protected void syncCustomConverters(IProgressMonitor monitor) {
+ this.customConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<ConverterAnnotation> getCustomConverterAnnotations() {
@@ -193,8 +193,8 @@ public class EclipseLinkJavaConverterContainerImpl
return new EclipseLinkJavaObjectTypeConverter(this, converterAnnotation);
}
- protected void syncObjectTypeConverters() {
- this.objectTypeConverterContainer.synchronizeWithResourceModel();
+ protected void syncObjectTypeConverters(IProgressMonitor monitor) {
+ this.objectTypeConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<ObjectTypeConverterAnnotation> getObjectTypeConverterAnnotations() {
@@ -271,8 +271,8 @@ public class EclipseLinkJavaConverterContainerImpl
return new EclipseLinkJavaStructConverter(this, converterAnnotation);
}
- protected void syncStructConverters() {
- this.structConverterContainer.synchronizeWithResourceModel();
+ protected void syncStructConverters(IProgressMonitor monitor) {
+ this.structConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<StructConverterAnnotation> getStructConverterAnnotations() {
@@ -350,8 +350,8 @@ public class EclipseLinkJavaConverterContainerImpl
return new EclipseLinkJavaTypeConverter(this, converterAnnotation);
}
- protected void syncTypeConverters() {
- this.typeConverterContainer.synchronizeWithResourceModel();
+ protected void syncTypeConverters(IProgressMonitor monitor) {
+ this.typeConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<TypeConverterAnnotation> getTypeConverterAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java
index 9cd31e6b0c..afbc94b134 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java
@@ -98,7 +98,7 @@ public class EclipseLinkJavaMultitenancyImpl2_3
MultitenantAnnotation2_3 multitenantAnnotation = this.getMultitenantAnnotation();
this.setSpecifiedType_(EclipseLinkMultitenantType2_3.fromJavaResourceModel(multitenantAnnotation.getValue()));
this.setSpecifiedIncludeCriteria_(multitenantAnnotation.getIncludeCriteria());
- this.syncSpecifiedTenantDiscriminatorColumns();
+ this.syncSpecifiedTenantDiscriminatorColumns(monitor);
}
@Override
@@ -314,8 +314,8 @@ public class EclipseLinkJavaMultitenancyImpl2_3
return new EclipseLinkNullTenantDiscriminatorColumnAnnotation2_3(this.getJavaResourceType());
}
- protected void syncSpecifiedTenantDiscriminatorColumns() {
- this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel();
+ protected void syncSpecifiedTenantDiscriminatorColumns(IProgressMonitor monitor) {
+ this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel(monitor);
}
protected ContextListContainer<EclipseLinkJavaSpecifiedTenantDiscriminatorColumn2_3, TenantDiscriminatorColumnAnnotation2_3> buildSpecifiedTenantDiscriminatorColumnContainer() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java
index 5220c43a98..7b0909d303 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java
@@ -62,7 +62,7 @@ public class EclipseLinkJavaObjectTypeConverter
super.synchronizeWithResourceModel(monitor);
this.setDataType_(this.converterAnnotation.getDataType());
this.setObjectType_(this.converterAnnotation.getObjectType());
- this.syncConversionValues();
+ this.syncConversionValues(monitor);
this.setDefaultObjectValue_(this.converterAnnotation.getDefaultObjectValue());
}
@@ -178,8 +178,8 @@ public class EclipseLinkJavaObjectTypeConverter
return new EclipseLinkJavaConversionValue(this, conversionValueAnnotation);
}
- protected void syncConversionValues() {
- this.conversionValueContainer.synchronizeWithResourceModel();
+ protected void syncConversionValues(IProgressMonitor monitor) {
+ this.conversionValueContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<ConversionValueAnnotation> getConversionValueAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkAbstractOrmConverterContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkAbstractOrmConverterContainer.java
index 5e97222172..f53c05f896 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkAbstractOrmConverterContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkAbstractOrmConverterContainer.java
@@ -62,10 +62,10 @@ public abstract class EclipseLinkAbstractOrmConverterContainer
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncCustomConverters();
- this.syncObjectTypeConverters();
- this.syncStructConverters();
- this.syncTypeConverters();
+ this.syncCustomConverters(monitor);
+ this.syncObjectTypeConverters(monitor);
+ this.syncStructConverters(monitor);
+ this.syncTypeConverters(monitor);
}
@Override
@@ -123,8 +123,8 @@ public abstract class EclipseLinkAbstractOrmConverterContainer
return new EclipseLinkOrmCustomConverter(this, xmlConverter);
}
- protected void syncCustomConverters() {
- this.customConverterContainer.synchronizeWithResourceModel();
+ protected void syncCustomConverters(IProgressMonitor monitor) {
+ this.customConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlConverter> getXmlCustomConverters() {
@@ -203,8 +203,8 @@ public abstract class EclipseLinkAbstractOrmConverterContainer
return new EclipseLinkOrmObjectTypeConverter(this, xmlConverter);
}
- protected void syncObjectTypeConverters() {
- this.objectTypeConverterContainer.synchronizeWithResourceModel();
+ protected void syncObjectTypeConverters(IProgressMonitor monitor) {
+ this.objectTypeConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlObjectTypeConverter> getXmlObjectTypeConverters() {
@@ -278,8 +278,8 @@ public abstract class EclipseLinkAbstractOrmConverterContainer
return new EclipseLinkOrmStructConverter(this, xmlConverter);
}
- protected void syncStructConverters() {
- this.structConverterContainer.synchronizeWithResourceModel();
+ protected void syncStructConverters(IProgressMonitor monitor) {
+ this.structConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlStructConverter> getXmlStructConverters() {
@@ -354,8 +354,8 @@ public abstract class EclipseLinkAbstractOrmConverterContainer
return new EclipseLinkOrmTypeConverter(this, xmlConverter);
}
- protected void syncTypeConverters() {
- this.typeConverterContainer.synchronizeWithResourceModel();
+ protected void syncTypeConverters(IProgressMonitor monitor) {
+ this.typeConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlTypeConverter> getXmlTypeConverters() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
index 8edfcc892e..3c487151ae 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
@@ -92,10 +92,10 @@ public class EclipseLinkEntityMappingsImpl
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
this.converterContainer.synchronizeWithResourceModel(monitor);
- this.syncSpecifiedTenantDiscriminatorColumns();
+ this.syncSpecifiedTenantDiscriminatorColumns(monitor);
this.setSpecifiedGetMethod_(this.buildSpecifiedGetMethod());
this.setSpecifiedSetMethod_(this.buildSpecifiedSetMethod());
- this.syncUuidGenerators();
+ this.syncUuidGenerators(monitor);
}
@Override
@@ -244,8 +244,8 @@ public class EclipseLinkEntityMappingsImpl
this.getXmlEntityMappings().getTenantDiscriminatorColumns().move(targetIndex, sourceIndex);
}
- protected void syncSpecifiedTenantDiscriminatorColumns() {
- this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel();
+ protected void syncSpecifiedTenantDiscriminatorColumns(IProgressMonitor monitor) {
+ this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlTenantDiscriminatorColumn> getXmlTenantDiscriminatorColumns() {
@@ -591,8 +591,8 @@ public class EclipseLinkEntityMappingsImpl
this.xmlEntityMappings.getSequenceGenerators().move(targetIndex, sourceIndex);
}
- protected void syncUuidGenerators() {
- this.uuidGeneratorContainer.synchronizeWithResourceModel();
+ protected void syncUuidGenerators(IProgressMonitor monitor) {
+ this.uuidGeneratorContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlUuidGenerator_2_4> getXmlUuidGenerators() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java
index 335c95dfa8..ba703df21e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java
@@ -99,7 +99,7 @@ public class EclipseLinkOrmMultitenancyImpl2_3
this.setSpecifiedMultitenant_(isMultitenantElementSpecified());
this.setSpecifiedType_(this.buildSpecifiedType());
this.setSpecifiedIncludeCriteria_(this.buildSpecifiedIncludeCriteria());
- this.syncSpecifiedTenantDiscriminatorColumns();
+ this.syncSpecifiedTenantDiscriminatorColumns(monitor);
}
@Override
@@ -335,8 +335,8 @@ public class EclipseLinkOrmMultitenancyImpl2_3
}
- protected void syncSpecifiedTenantDiscriminatorColumns() {
- this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel();
+ protected void syncSpecifiedTenantDiscriminatorColumns(IProgressMonitor monitor) {
+ this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlTenantDiscriminatorColumn> getXmlTenantDiscriminatorColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java
index b397373788..115bdf1c11 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java
@@ -68,7 +68,7 @@ public class EclipseLinkOrmObjectTypeConverter
super.synchronizeWithResourceModel(monitor);
this.setDataType_(this.xmlConverter.getDataType());
this.setObjectType_(this.xmlConverter.getObjectType());
- this.syncConversionValues();
+ this.syncConversionValues(monitor);
this.setDefaultObjectValue_(this.xmlConverter.getDefaultObjectValue());
}
@@ -223,8 +223,8 @@ public class EclipseLinkOrmObjectTypeConverter
return new EclipseLinkOrmConversionValue(this, xmlConversionValue);
}
- protected void syncConversionValues() {
- this.conversionValueContainer.synchronizeWithResourceModel();
+ protected void syncConversionValues(IProgressMonitor monitor) {
+ this.conversionValueContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlConversionValue> getXmlConversionValues() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistenceUnitDefaults.java
index d7ecf9e0da..bffe8a7bb4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistenceUnitDefaults.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistenceUnitDefaults.java
@@ -79,7 +79,7 @@ public class EclipseLinkOrmPersistenceUnitDefaults
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncTenantDiscriminatorColumns();
+ this.syncTenantDiscriminatorColumns(monitor);
this.setSpecifiedGetMethod_(this.buildSpecifiedGetMethod());
this.setSpecifiedSetMethod_(this.buildSpecifiedSetMethod());
}
@@ -138,8 +138,8 @@ public class EclipseLinkOrmPersistenceUnitDefaults
this.getXmlDefaults().getTenantDiscriminatorColumns().move(targetIndex, sourceIndex);
}
- protected void syncTenantDiscriminatorColumns() {
- this.tenantDiscriminatorColumnContainer.synchronizeWithResourceModel();
+ protected void syncTenantDiscriminatorColumns(IProgressMonitor monitor) {
+ this.tenantDiscriminatorColumnContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlTenantDiscriminatorColumn> getXmlTenantDiscriminatorColumns() {

Back to the top