Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2015-12-24 10:56:12 -0500
committerBrian Vosburgh2015-12-24 11:21:50 -0500
commit67058e4e505ebb1973a566480d9ae5fed2acaa1b (patch)
tree00c00066c678f89df197cc6a262d1f7f72ed5edd
parentdb7d35dca519d8298ad632f457b0c360585ed324 (diff)
downloadwebtools.dali-67058e4e505ebb1973a566480d9ae5fed2acaa1b.tar.gz
webtools.dali-67058e4e505ebb1973a566480d9ae5fed2acaa1b.tar.xz
webtools.dali-67058e4e505ebb1973a566480d9ae5fed2acaa1b.zip
pass IProgressMonitor to
JpaContextModel.synchronizeWithResourceModel(...)
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaContextModel.java3
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AbstractJpaContextModel.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/ContextContainerTools.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaDatabaseGenerator.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java20
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdTypeMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaManagedType.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappedSuperclass.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToManyMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToOneMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSpecifiedOverride.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDatabaseGenerator.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmGenerator.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java20
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdTypeMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmManagedType.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToManyMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToOneMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmPersistentAttribute.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java15
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToManyRelationship.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToOneRelationship.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToManyRelationship.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToOneRelationship.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/VirtualOrmPersistentAttribute.java17
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java12
-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.java12
-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/AbstractJavaOverrideContainer.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseEnumeratedConverter.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseTemporalConverter.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaCascade.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEntity.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedNativeQuery.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedQuery.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderBy.java21
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryHint.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSpecifiedAssociationOverride.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSpecifiedAttributeOverride.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedDiscriminatorColumn.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitDefaults.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitMetadata.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmSpecifiedOverride.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseEnumeratedConverter.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseTemporalConverter.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmCascade.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmColumn.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEntity.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratedValue.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java4
-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/GenericOrmNamedNativeQuery.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedQuery.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderBy.java21
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryHint.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java4
-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/GenericOrmSpecifiedAssociationOverride.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSpecifiedAttributeOverride.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmUniqueConstraint.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericOrmXmlRef.java5
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceUnitProperty.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceXml.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java30
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaIdDerivedIdentityStrategy2_0.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaPersistentType2_0.java5
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java30
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmDerivedIdentity2_0.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmIdDerivedIdentityStrategy2_0.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrderColumn2_0.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmSequenceGenerator2_0.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaConverterType2_1.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaNamedStoredProcedureQuery2_1.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaStoredProcedureParameter2_1.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmConverterType2_1.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmNamedStoredProcedureQuery2_1.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmStoredProcedureParameter2_1.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMapping2_3.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicCollectionMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapping.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCachingImpl.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaChangeTracking.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConversionValue.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConvert.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverter.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterClassConverter.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterContainerImpl.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCustomizer.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaElementCollectionMapping2_0.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableImpl.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddedIdMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddedMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEntityImpl.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaGeneratorContainer.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaIdMapping.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaJoinFetch.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMapping.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMapping.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMappedSuperclassImpl.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMutable.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMapping.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMapping.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaPrivateOwned.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaReadOnly.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTimeOfDay.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTransformationMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTypeConverter.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVariableOneToOneMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMapping.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkAbstractOrmConverterContainer.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmArrayMapping2_3.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMapping.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCachingImpl.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmChangeTracking.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConversionValue.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverter.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterClassConverter.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomizer.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableImpl.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityImpl.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmGeneratorContainer.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMapping.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmJoinFetch.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMapping.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMapping.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassImpl.java20
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMutable.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMapping.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMapping.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistenceUnitDefaults.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentAttribute.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPrivateOwned.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmReadOnly.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTimeOfDay.java7
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTypeConverter.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMapping.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkVirtualJavaPersistentType.java4
226 files changed, 872 insertions, 830 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaContextModel.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaContextModel.java
index d6cbcd10b3..f6c8564be0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaContextModel.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaContextModel.java
@@ -87,7 +87,7 @@ public interface JpaContextModel
* The resource model has changed; synchronize the context model with it.
* This will probably trigger a call to {@link #update(IProgressMonitor)}.
*/
- void synchronizeWithResourceModel();
+ void synchronizeWithResourceModel(IProgressMonitor monitor);
/**
* Some non-trivial state in the JPA project has changed; update the
@@ -96,7 +96,6 @@ public interface JpaContextModel
* If the dependent state changes also, yet another <em>update</em> will be
* triggered, possibly followed by yet more <em>updates</em>; until the JPA
* project's state quiesces.
- * @param monitor TODO
*/
void update(IProgressMonitor monitor);
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
index 477605292a..d9359fb869 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
@@ -1913,9 +1913,14 @@ public abstract class AbstractJpaProject
/**
* Called by the {@link SynchronizeContextModelJobCommand#execute(IProgressMonitor)}.
*/
- // TODO pass the monitor down
- protected IStatus synchronizeContextModel(@SuppressWarnings("unused") IProgressMonitor monitor) {
- this.contextRoot.synchronizeWithResourceModel();
+ protected IStatus synchronizeContextModel(IProgressMonitor monitor) {
+ if (monitor.isCanceled()) {
+ return Status.CANCEL_STATUS;
+ }
+ this.contextRoot.synchronizeWithResourceModel(monitor);
+ if (monitor.isCanceled()) {
+ return Status.CANCEL_STATUS;
+ }
return Status.OK_STATUS;
}
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 9dade627cb..7f2ebc2638 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
@@ -50,16 +50,18 @@ public abstract class AbstractJpaContextModel<P extends JpaContextModel>
// ********** synchronize/update **********
- public void synchronizeWithResourceModel() {
- // NOP
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ if (monitor.isCanceled()) {
+ throw new OperationCanceledException();
+ }
}
/**
* convenience method
*/
- protected void synchronizeModelsWithResourceModel(Iterable<? extends JpaContextModel> models) {
+ protected void synchronizeModelsWithResourceModel(Iterable<? extends JpaContextModel> models, IProgressMonitor monitor) {
for (JpaContextModel model : models) {
- model.synchronizeWithResourceModel();
+ model.synchronizeWithResourceModel(monitor);
}
}
@@ -505,7 +507,7 @@ public abstract class AbstractJpaContextModel<P extends JpaContextModel>
// see ItemAspectListValueModelAdapter.itemAspectChanged(EventObject)
for (C contextElement : contextElementsToSync) {
if (sync) {
- contextElement.synchronizeWithResourceModel();
+ contextElement.synchronizeWithResourceModel(monitor);
} else {
contextElement.update(monitor);
}
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 8205172426..cde262f34b 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
@@ -135,7 +135,7 @@ public class ContextContainerTools {
// see ItemAspectListValueModelAdapter.itemAspectChanged(EventObject)
for (C contextElement : contextElementsToSync) {
if (sync) {
- contextElement.synchronizeWithResourceModel();
+ contextElement.synchronizeWithResourceModel(monitor);
} else {
contextElement.update(monitor);
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java
index d4fdbde3b3..c1148ab474 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java
@@ -63,8 +63,8 @@ public abstract class AbstractJavaAttributeMapping<A extends Annotation>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.updateDefault();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java
index 6737c542a9..b15c3900ae 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java
@@ -66,9 +66,9 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.attributeOverrideContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.attributeOverrideContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java
index 865f73d380..21a58c8bc0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java
@@ -78,12 +78,12 @@ public abstract class AbstractJavaBasicMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.column.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.column.synchronizeWithResourceModel(monitor);
this.setSpecifiedFetch_(this.buildSpecifiedFetch());
this.setSpecifiedOptional_(this.buildSpecifiedOptional());
- this.syncConverter();
+ this.syncConverter(monitor);
}
@Override
@@ -244,7 +244,7 @@ public abstract class AbstractJavaBasicMapping
return this.buildNullConverter();
}
- protected void syncConverter() {
+ protected void syncConverter(IProgressMonitor monitor) {
Association<JavaConverter.Adapter, Annotation> assoc = this.getConverterAnnotation();
if (assoc == null) {
if (this.converter.getConverterType() != null) {
@@ -255,7 +255,7 @@ public abstract class AbstractJavaBasicMapping
Annotation annotation = assoc.getValue();
if ((this.converter.getConverterType() == adapter.getConverterType()) &&
(this.converter.getConverterAnnotation() == annotation)) {
- this.converter.synchronizeWithResourceModel();
+ this.converter.synchronizeWithResourceModel(monitor);
} else {
this.setConverter_(adapter.buildConverter(annotation, this, this.getJpaFactory()));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaDatabaseGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaDatabaseGenerator.java
index fad6df2773..6ee2f7f2c7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaDatabaseGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaDatabaseGenerator.java
@@ -44,8 +44,8 @@ public abstract class AbstractJavaDatabaseGenerator<A extends DatabaseGeneratorA
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedInitialValue_(this.generatorAnnotation.getInitialValue());
this.setSpecifiedAllocationSize_(this.generatorAnnotation.getAllocationSize());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java
index ec22dac810..2d8e623738 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java
@@ -68,9 +68,9 @@ public abstract class AbstractJavaEmbeddedMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.associationOverrideContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.associationOverrideContainer.synchronizeWithResourceModel(monitor);
}
@Override
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 bcde3b8aed..57dd8232af 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
@@ -172,19 +172,19 @@ public abstract class AbstractJavaEntity
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedName_(this.mappingAnnotation.getName());
- this.table.synchronizeWithResourceModel();
+ this.table.synchronizeWithResourceModel(monitor);
this.syncSpecifiedSecondaryTables();
this.syncSpecifiedPrimaryKeyJoinColumns();
this.setSpecifiedInheritanceStrategy_(this.buildSpecifiedInheritanceStrategy());
this.setSpecifiedDiscriminatorValue_(this.getDiscriminatorValueAnnotation().getValue());
- this.discriminatorColumn.synchronizeWithResourceModel();
- this.attributeOverrideContainer.synchronizeWithResourceModel();
- this.associationOverrideContainer.synchronizeWithResourceModel();
- this.generatorContainer.synchronizeWithResourceModel();
- this.queryContainer.synchronizeWithResourceModel();
+ this.discriminatorColumn.synchronizeWithResourceModel(monitor);
+ this.attributeOverrideContainer.synchronizeWithResourceModel(monitor);
+ this.associationOverrideContainer.synchronizeWithResourceModel(monitor);
+ this.generatorContainer.synchronizeWithResourceModel(monitor);
+ this.queryContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java
index f17de4e803..515c51ec4b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.core.internal.context.java;
import java.util.List;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.common.utility.internal.StringTools;
@@ -44,8 +45,8 @@ public abstract class AbstractJavaGenerator<P extends JavaGeneratorContainer, A
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.generatorAnnotation.getName());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java
index 798a12ccbc..13029bfe14 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java
@@ -83,12 +83,12 @@ public abstract class AbstractJavaIdMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.column.synchronizeWithResourceModel();
- this.generatorContainer.synchronizeWithResourceModel();
- this.syncGeneratedValue();
- this.syncConverter();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.column.synchronizeWithResourceModel(monitor);
+ this.generatorContainer.synchronizeWithResourceModel(monitor);
+ this.syncGeneratedValue(monitor);
+ this.syncConverter(monitor);
}
@Override
@@ -183,7 +183,7 @@ public abstract class AbstractJavaIdMapping
return this.getJpaFactory().buildJavaGeneratedValue(this, generatedValueAnnotation);
}
- protected void syncGeneratedValue() {
+ protected void syncGeneratedValue(IProgressMonitor monitor) {
GeneratedValueAnnotation annotation = this.getGeneratedValueAnnotation();
if (annotation == null) {
if (this.generatedValue != null) {
@@ -192,7 +192,7 @@ public abstract class AbstractJavaIdMapping
}
else {
if ((this.generatedValue != null) && (this.generatedValue.getGeneratedValueAnnotation() == annotation)) {
- this.generatedValue.synchronizeWithResourceModel();
+ this.generatedValue.synchronizeWithResourceModel(monitor);
} else {
this.setGeneratedValue(this.buildGeneratedValue(annotation));
}
@@ -257,7 +257,7 @@ public abstract class AbstractJavaIdMapping
return this.buildNullConverter();
}
- protected void syncConverter() {
+ protected void syncConverter(IProgressMonitor monitor) {
Association<JavaConverter.Adapter, Annotation> assoc = this.getConverterAnnotation();
if (assoc == null) {
if (this.converter.getConverterType() != null) {
@@ -268,7 +268,7 @@ public abstract class AbstractJavaIdMapping
Annotation annotation = assoc.getValue();
if ((this.converter.getConverterType() == adapter.getConverterType()) &&
(this.converter.getConverterAnnotation() == annotation)) {
- this.converter.synchronizeWithResourceModel();
+ this.converter.synchronizeWithResourceModel(monitor);
} else {
this.setConverter_(adapter.buildConverter(annotation, this, this.getJpaFactory()));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdTypeMapping.java
index 931e6270bf..9d397d916f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdTypeMapping.java
@@ -44,9 +44,9 @@ public abstract class AbstractJavaIdTypeMapping<A extends Annotation>
// ***** sync/update *****
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.idClassReference.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.idClassReference.synchronizeWithResourceModel(monitor);
}
@Override
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 9407df9a25..8500de24c1 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
@@ -50,8 +50,8 @@ public abstract class AbstractJavaJoinColumnRelationshipStrategy<P extends JavaJ
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncSpecifiedJoinColumns();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java
index acf41e0c19..0a23002a3c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java
@@ -40,10 +40,10 @@ public abstract class AbstractJavaJoinTableRelationshipStrategy<P extends JavaJo
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
if (this.joinTable != null) {
- this.joinTable.synchronizeWithResourceModel();
+ this.joinTable.synchronizeWithResourceModel(monitor);
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaManagedType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaManagedType.java
index 0494fb8889..b755e90486 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaManagedType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaManagedType.java
@@ -43,8 +43,8 @@ public abstract class AbstractJavaManagedType<P extends JpaContextModel>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName(this.resourceType.getTypeBinding().getQualifiedName());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappedSuperclass.java
index c28ec91e84..e8da98d492 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappedSuperclass.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappedSuperclass.java
@@ -44,9 +44,9 @@ public abstract class AbstractJavaMappedSuperclass
// ***** synchronize/update *****
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.queryContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.queryContainer.synchronizeWithResourceModel(monitor);
}
@Override
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 6bc261283e..121d9f3c6f 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
@@ -141,9 +141,9 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.orderable.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.orderable.synchronizeWithResourceModel(monitor);
this.setSpecifiedMapKey_(this.buildSpecifiedMapKey());
this.setNoMapKey_(this.buildNoMapKey());
@@ -152,11 +152,11 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi
this.setSpecifiedMapKeyClass_(this.buildSpecifiedMapKeyClass());
- this.mapKeyColumn.synchronizeWithResourceModel();
- this.syncMapKeyConverter();
+ this.mapKeyColumn.synchronizeWithResourceModel(monitor);
+ this.syncMapKeyConverter(monitor);
this.syncSpecifiedMapKeyJoinColumns();
- this.mapKeyAttributeOverrideContainer.synchronizeWithResourceModel();
+ this.mapKeyAttributeOverrideContainer.synchronizeWithResourceModel(monitor);
}
@Override
@@ -628,7 +628,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi
return this.buildNullMapKeyConverter();
}
- protected void syncMapKeyConverter() {
+ protected void syncMapKeyConverter(IProgressMonitor monitor) {
Association<JavaConverter.Adapter, Annotation> assoc = this.getMapKeyConverterAnnotation();
if (assoc == null) {
if (this.mapKeyConverter.getConverterType() != null) {
@@ -639,7 +639,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi
Annotation annotation = assoc.getValue();
if ((this.mapKeyConverter.getConverterType() == adapter.getConverterType()) &&
(this.mapKeyConverter.getConverterAnnotation() == annotation)) {
- this.mapKeyConverter.synchronizeWithResourceModel();
+ this.mapKeyConverter.synchronizeWithResourceModel(monitor);
} else {
this.setMapKeyConverter_(adapter.buildConverter(annotation, this, this.getJpaFactory()));
}
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 dc39aaa904..c18eeb6c24 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
@@ -77,8 +77,8 @@ public abstract class AbstractJavaNamedColumn<PA extends NamedColumn.ParentAdapt
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.synchronizeWithResourceModel(getColumnAnnotation());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToManyMapping.java
index a08a3b748c..6917f27cfa 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToManyMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToManyMapping.java
@@ -36,9 +36,9 @@ public abstract class AbstractJavaOneToManyMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.orphanRemoval.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.orphanRemoval.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToOneMapping.java
index 32ad7628f1..ef25c6cad6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToOneMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToOneMapping.java
@@ -36,9 +36,9 @@ public abstract class AbstractJavaOneToOneMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.orphanRemoval.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.orphanRemoval.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java
index d1f12f61aa..ea9a0db4c2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java
@@ -95,12 +95,12 @@ public abstract class AbstractJavaPersistentAttribute
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
// this is determined directly from the resource model
this.setDefaultAccess(this.buildDefaultAccess());
this.setSpecifiedAccess_(this.buildSpecifiedAccess());
- this.syncMapping();
+ this.syncMapping(monitor);
}
@Override
@@ -356,8 +356,8 @@ public abstract class AbstractJavaPersistentAttribute
/**
* Sync existing mapping
*/
- protected void syncMapping() {
- this.mapping.synchronizeWithResourceModel();
+ protected void syncMapping(IProgressMonitor monitor) {
+ this.mapping.synchronizeWithResourceModel(monitor);
}
/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java
index fc2353eb15..c8efe65f94 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java
@@ -87,11 +87,11 @@ public abstract class AbstractJavaPersistentType
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedAccess_(this.buildSpecifiedAccess());
- this.syncMapping();
- this.synchronizeModelsWithResourceModel(this.getAttributes());
+ this.syncMapping(monitor);
+ this.synchronizeModelsWithResourceModel(this.getAttributes(), monitor);
}
@Override
@@ -290,7 +290,7 @@ public abstract class AbstractJavaPersistentType
return this.buildNullMapping();
}
- protected void syncMapping() {
+ protected void syncMapping(IProgressMonitor monitor) {
JavaTypeMappingDefinition definition = null;
Annotation annotation = null;
for (Iterator<JavaTypeMappingDefinition> stream = this.mappingDefinitions(); stream.hasNext(); ) {
@@ -302,7 +302,7 @@ public abstract class AbstractJavaPersistentType
}
// 'annotation' can still be null when we get here
if (this.mapping.getMappingAnnotation() == annotation) {
- this.mapping.synchronizeWithResourceModel();
+ this.mapping.synchronizeWithResourceModel(monitor);
} else {
this.setMapping(this.buildMapping(annotation, definition));
}
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 92b2ac303a..cb349c46ae 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
@@ -55,8 +55,8 @@ public abstract class AbstractJavaQuery<P extends JavaQueryContainer, A extends
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.queryAnnotation.getName());
this.syncHints();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java
index 7ccdae19ad..2e51900dd9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java
@@ -67,11 +67,11 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedTargetEntity_(this.buildSpecifiedTargetEntity());
- this.relationship.synchronizeWithResourceModel();
- this.cascade.synchronizeWithResourceModel();
+ this.relationship.synchronizeWithResourceModel(monitor);
+ this.cascade.synchronizeWithResourceModel(monitor);
this.setSpecifiedFetch_(this.buildSpecifiedFetch());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java
index 34ef4227c5..6526427455 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java
@@ -42,8 +42,8 @@ public abstract class AbstractJavaSequenceGenerator<A extends SequenceGeneratorA
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedSequenceName_(this.generatorAnnotation.getSequenceName());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java
index 0e0b7ca1cd..9545220d3d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java
@@ -44,10 +44,10 @@ public abstract class AbstractJavaSingleRelationshipMapping<A extends SingleRela
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedOptional_(this.buildSpecifiedOptional());
- this.derivedIdentity.synchronizeWithResourceModel();
+ this.derivedIdentity.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSpecifiedOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSpecifiedOverride.java
index 7b178d49d8..7dd271adb8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSpecifiedOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSpecifiedOverride.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.core.internal.context.java;
import java.util.List;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.StringTools;
import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable;
@@ -49,8 +50,8 @@ public abstract class AbstractJavaSpecifiedOverride<P extends JavaOverrideContai
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.buildName());
}
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 b1df49bc5d..d7324e16cb 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
@@ -82,8 +82,8 @@ public abstract class AbstractJavaTable<P extends JpaContextModel, PA extends Ta
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedName_(this.buildSpecifiedName());
this.setSpecifiedSchema_(this.buildSpecifiedSchema());
this.setSpecifiedCatalog_(this.buildSpecifiedCatalog());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java
index c3b0a0d6ed..a26385f73d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java
@@ -68,10 +68,10 @@ public abstract class AbstractJavaVersionMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.column.synchronizeWithResourceModel();
- this.syncConverter();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.column.synchronizeWithResourceModel(monitor);
+ this.syncConverter(monitor);
}
@Override
@@ -144,7 +144,7 @@ public abstract class AbstractJavaVersionMapping
return this.buildNullConverter();
}
- protected void syncConverter() {
+ protected void syncConverter(IProgressMonitor monitor) {
Association<JavaConverter.Adapter, Annotation> assoc = this.getConverterAnnotation();
if (assoc == null) {
if (this.converter.getConverterType() != null) {
@@ -155,7 +155,7 @@ public abstract class AbstractJavaVersionMapping
Annotation annotation = assoc.getValue();
if ((this.converter.getConverterType() == adapter.getConverterType()) &&
(this.converter.getConverterAnnotation() == annotation)) {
- this.converter.synchronizeWithResourceModel();
+ this.converter.synchronizeWithResourceModel(monitor);
} else {
this.setConverter_(adapter.buildConverter(annotation, this, this.getJpaFactory()));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java
index 4eb817621a..e372072cb6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaIdClassReference.java
@@ -56,11 +56,11 @@ public class GenericJavaIdClassReference
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
setSpecifiedIdClassName_(buildSpecifiedIdClassName());
if (this.idClass != null) {
- this.idClass.synchronizeWithResourceModel();
+ this.idClass.synchronizeWithResourceModel(monitor);
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java
index 4b80ed2be0..88cc5bfbc1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java
@@ -45,10 +45,10 @@ public class GenericJavaManyToManyRelationship
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.mappedByStrategy.synchronizeWithResourceModel();
- this.joinTableStrategy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.mappedByStrategy.synchronizeWithResourceModel(monitor);
+ this.joinTableStrategy.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java
index 37bf1b300a..d58beb9ea7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java
@@ -44,10 +44,10 @@ public class GenericJavaManyToOneRelationship
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.joinColumnStrategy.synchronizeWithResourceModel();
- this.joinTableStrategy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.joinColumnStrategy.synchronizeWithResourceModel(monitor);
+ this.joinTableStrategy.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java
index fa936e661e..b185394649 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.core.internal.context.java;
import java.util.List;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.core.utility.ValidationMessage;
import org.eclipse.jpt.common.utility.internal.ArrayTools;
@@ -49,8 +50,8 @@ public class GenericJavaMappedByRelationshipStrategy
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setMappedByAttribute_(this.buildMappedByAttribute());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java
index 670b9d30a7..1de3fabafc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java
@@ -55,11 +55,11 @@ public class GenericJavaOneToManyRelationship
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.mappedByStrategy.synchronizeWithResourceModel();
- this.joinColumnStrategy.synchronizeWithResourceModel();
- this.joinTableStrategy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.mappedByStrategy.synchronizeWithResourceModel(monitor);
+ this.joinColumnStrategy.synchronizeWithResourceModel(monitor);
+ this.joinTableStrategy.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java
index 9eaeaf4bd6..8aaf3f8956 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java
@@ -55,12 +55,12 @@ public class GenericJavaOneToOneRelationship
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.mappedByStrategy.synchronizeWithResourceModel();
- this.primaryKeyJoinColumnStrategy.synchronizeWithResourceModel();
- this.joinTableStrategy.synchronizeWithResourceModel();
- this.joinColumnStrategy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.mappedByStrategy.synchronizeWithResourceModel(monitor);
+ this.primaryKeyJoinColumnStrategy.synchronizeWithResourceModel(monitor);
+ this.joinTableStrategy.synchronizeWithResourceModel(monitor);
+ this.joinColumnStrategy.synchronizeWithResourceModel(monitor);
}
@Override
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 44dfac5439..8078322740 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
@@ -57,8 +57,8 @@ public class GenericJavaPrimaryKeyJoinColumnRelationshipStrategy
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncPrimaryKeyJoinColumns();
}
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 fe7dab590e..79d1d2f11b 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
@@ -156,8 +156,8 @@ public abstract class AbstractEntityMappings
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setDescription_(this.xmlEntityMappings.getDescription());
this.setPackage_(this.xmlEntityMappings.getPackage());
@@ -166,14 +166,14 @@ public abstract class AbstractEntityMappings
this.setSpecifiedCatalog_(this.xmlEntityMappings.getCatalog());
this.setSpecifiedSchema_(this.xmlEntityMappings.getSchema());
- this.persistenceUnitMetadata.synchronizeWithResourceModel();
+ this.persistenceUnitMetadata.synchronizeWithResourceModel(monitor);
this.syncManagedTypes();
this.syncSequenceGenerators();
this.syncTableGenerators();
- this.queryContainer.synchronizeWithResourceModel();
+ this.queryContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java
index 5f79f526b3..39ae713d79 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java
@@ -85,8 +85,8 @@ public abstract class AbstractOrmAttributeMapping<X extends XmlAttributeMapping>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.xmlAttributeMapping.getName());
this.setSpecifiedAttributeType_(this.buildSpecifiedAttributeType());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java
index dc83db9118..928cb2535e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseColumn.java
@@ -56,8 +56,8 @@ public abstract class AbstractOrmBaseColumn<PA extends TableColumn.ParentAdapter
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedTableName_(this.buildSpecifiedTableName());
this.setSpecifiedUnique_(this.buildSpecifiedUnique());
this.setSpecifiedNullable_(this.buildSpecifiedNullable());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java
index fc5f1efbd0..8e5af99db6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java
@@ -66,9 +66,9 @@ public abstract class AbstractOrmBaseEmbeddedMapping<X extends AbstractXmlEmbedd
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.attributeOverrideContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.attributeOverrideContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java
index 0d1d272fc6..7d41b38f42 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java
@@ -79,12 +79,12 @@ public abstract class AbstractOrmBasicMapping<X extends XmlBasic>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.column.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.column.synchronizeWithResourceModel(monitor);
this.setSpecifiedFetch_(this.buildSpecifiedFetch());
this.setSpecifiedOptional_(this.buildSpecifiedOptional());
- this.syncConverter();
+ this.syncConverter(monitor);
}
@Override
@@ -241,7 +241,7 @@ public abstract class AbstractOrmBasicMapping<X extends XmlBasic>
return this.nullConverter;
}
- protected void syncConverter() {
+ protected void syncConverter(IProgressMonitor monitor) {
OrmConverter.Adapter adapter = this.getXmlConverterAdapter();
if (adapter == null) {
if (this.converter.getConverterType() != null) {
@@ -249,7 +249,7 @@ public abstract class AbstractOrmBasicMapping<X extends XmlBasic>
}
} else {
if (this.converter.getConverterType() == adapter.getConverterType()) {
- this.converter.synchronizeWithResourceModel();
+ this.converter.synchronizeWithResourceModel(monitor);
} else {
this.setConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDatabaseGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDatabaseGenerator.java
index 68d13ab587..18d30e0957 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDatabaseGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDatabaseGenerator.java
@@ -46,8 +46,8 @@ public abstract class AbstractOrmDatabaseGenerator<X extends XmlGenerator>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedInitialValue_(this.xmlGenerator.getInitialValue());
this.setSpecifiedAllocationSize_(this.xmlGenerator.getAllocationSize());
}
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 7941a23709..1f3c69d5b5 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
@@ -195,12 +195,12 @@ public abstract class AbstractOrmEntity<X extends XmlEntity>
// ***** sync/update *****
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedName_(this.xmlTypeMapping.getName());
- this.table.synchronizeWithResourceModel();
+ this.table.synchronizeWithResourceModel(monitor);
this.syncSpecifiedSecondaryTables();
@@ -208,13 +208,13 @@ public abstract class AbstractOrmEntity<X extends XmlEntity>
this.setSpecifiedInheritanceStrategy_(this.buildSpecifiedInheritanceStrategy());
this.setSpecifiedDiscriminatorValue_(this.xmlTypeMapping.getDiscriminatorValue());
- this.discriminatorColumn.synchronizeWithResourceModel();
+ this.discriminatorColumn.synchronizeWithResourceModel(monitor);
- this.attributeOverrideContainer.synchronizeWithResourceModel();
- this.associationOverrideContainer.synchronizeWithResourceModel();
+ this.attributeOverrideContainer.synchronizeWithResourceModel(monitor);
+ this.associationOverrideContainer.synchronizeWithResourceModel(monitor);
- this.generatorContainer.synchronizeWithResourceModel();
- this.queryContainer.synchronizeWithResourceModel();
+ this.generatorContainer.synchronizeWithResourceModel(monitor);
+ this.queryContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmGenerator.java
index ae8a6d112e..d17d1400f0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.core.internal.context.orm;
import java.util.List;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.common.utility.internal.StringTools;
@@ -44,8 +45,8 @@ public abstract class AbstractOrmGenerator<X extends XmlGenerator>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.xmlGenerator.getName());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java
index 535245f26a..0844e8f4fd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java
@@ -83,12 +83,12 @@ public abstract class AbstractOrmIdMapping<X extends XmlId>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.column.synchronizeWithResourceModel();
- this.generatorContainer.synchronizeWithResourceModel();
- this.syncGeneratedValue();
- this.syncConverter();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.column.synchronizeWithResourceModel(monitor);
+ this.generatorContainer.synchronizeWithResourceModel(monitor);
+ this.syncGeneratedValue(monitor);
+ this.syncConverter(monitor);
}
@Override
@@ -175,7 +175,7 @@ public abstract class AbstractOrmIdMapping<X extends XmlId>
return this.getContextModelFactory().buildOrmGeneratedValue(this, xmlGeneratedValue);
}
- protected void syncGeneratedValue() {
+ protected void syncGeneratedValue(IProgressMonitor monitor) {
XmlGeneratedValue xmlGeneratedValue = this.xmlAttributeMapping.getGeneratedValue();
if (xmlGeneratedValue == null) {
if (this.generatedValue != null) {
@@ -183,7 +183,7 @@ public abstract class AbstractOrmIdMapping<X extends XmlId>
}
} else {
if ((this.generatedValue != null) && (this.generatedValue.getXmlGeneratedValue() == xmlGeneratedValue)) {
- this.generatedValue.synchronizeWithResourceModel();
+ this.generatedValue.synchronizeWithResourceModel(monitor);
} else {
this.setGeneratedValue(this.buildGeneratedValue(xmlGeneratedValue));
}
@@ -244,7 +244,7 @@ public abstract class AbstractOrmIdMapping<X extends XmlId>
return this.nullConverter;
}
- protected void syncConverter() {
+ protected void syncConverter(IProgressMonitor monitor) {
OrmConverter.Adapter adapter = this.getXmlConverterAdapter();
if (adapter == null) {
if (this.converter.getConverterType() != null) {
@@ -252,7 +252,7 @@ public abstract class AbstractOrmIdMapping<X extends XmlId>
}
} else {
if (this.converter.getConverterType() == adapter.getConverterType()) {
- this.converter.synchronizeWithResourceModel();
+ this.converter.synchronizeWithResourceModel(monitor);
} else {
this.setConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdTypeMapping.java
index 4eae60a9cf..86909e7f01 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdTypeMapping.java
@@ -49,9 +49,9 @@ public abstract class AbstractOrmIdTypeMapping<X extends XmlIdTypeMapping>
// ***** sync/update *****
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.idClassReference.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.idClassReference.synchronizeWithResourceModel(monitor);
}
@Override
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 922d3a0615..9a435e3250 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
@@ -52,8 +52,8 @@ public abstract class AbstractOrmJoinColumnRelationshipStrategy<P extends OrmJoi
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncSpecifiedJoinColumns();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java
index 9dc9ea2a53..5631d665ca 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java
@@ -41,10 +41,10 @@ public abstract class AbstractOrmJoinTableRelationshipStrategy<P extends OrmJoin
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
if (this.joinTable != null) {
- this.joinTable.synchronizeWithResourceModel();
+ this.joinTable.synchronizeWithResourceModel(monitor);
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmManagedType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmManagedType.java
index eb4cdb0d20..ecf6dcadaf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmManagedType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmManagedType.java
@@ -23,7 +23,6 @@ import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.common.utility.internal.StringTools;
import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
import org.eclipse.jpt.jpa.core.context.ManagedType;
-import org.eclipse.jpt.jpa.core.context.PersistentType;
import org.eclipse.jpt.jpa.core.context.java.JavaManagedType;
import org.eclipse.jpt.jpa.core.context.orm.EntityMappings;
import org.eclipse.jpt.jpa.core.context.orm.OrmManagedType;
@@ -65,11 +64,11 @@ public abstract class AbstractOrmManagedType<P extends EntityMappings>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setClass_(this.xmlManagedType.getClassName());
this.setName(this.buildName());
- this.syncJavaManagedType();
+ this.syncJavaManagedType(monitor);
}
@Override
@@ -163,17 +162,18 @@ public abstract class AbstractOrmManagedType<P extends EntityMappings>
* <em>sync</em> it. In some circumstances it will be obsolete
* since the name is changed during update (the class name or
* the entity mapping's package affect the name)
+ * @param monitor TODO
*
- * @see #updateJavaManagedType()
+ * @see #updateJavaManagedType(IProgressMonitor)
*/
- protected void syncJavaManagedType() {
+ protected void syncJavaManagedType(IProgressMonitor monitor) {
if (this.javaManagedType != null) {
- this.javaManagedType.synchronizeWithResourceModel();
+ this.javaManagedType.synchronizeWithResourceModel(monitor);
}
}
/**
- * @see #syncJavaManagedType()
+ * @see #syncJavaManagedType(IProgressMonitor)
*/
protected void updateJavaManagedType(IProgressMonitor monitor) {
if (this.getName() == null) {
@@ -201,7 +201,7 @@ public abstract class AbstractOrmManagedType<P extends EntityMappings>
/**
* Return null it's an enum; don't build a JavaManagedType
- * @see #updateJavaManagedType()
+ * @see #updateJavaManagedType(IProgressMonitor)
*/
protected JavaResourceType resolveJavaResourceType() {
if (this.name == null) {
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 e247d23b02..3d1bb37e95 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
@@ -147,9 +147,9 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.orderable.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.orderable.synchronizeWithResourceModel(monitor);
this.setSpecifiedMapKey_(this.buildSpecifiedMapKey());
this.setNoMapKey_(this.buildNoMapKey());
@@ -158,10 +158,10 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM
this.setSpecifiedMapKeyClass_(this.buildSpecifiedMapKeyClass());
- this.mapKeyColumn.synchronizeWithResourceModel();
- this.syncMapKeyConverter();
+ this.mapKeyColumn.synchronizeWithResourceModel(monitor);
+ this.syncMapKeyConverter(monitor);
- this.mapKeyAttributeOverrideContainer.synchronizeWithResourceModel();
+ this.mapKeyAttributeOverrideContainer.synchronizeWithResourceModel(monitor);
this.syncSpecifiedMapKeyJoinColumns();
}
@@ -627,7 +627,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM
return this.nullConverter;
}
- protected void syncMapKeyConverter() {
+ protected void syncMapKeyConverter(IProgressMonitor monitor) {
OrmConverter.Adapter adapter = this.getXmlMapKeyConverterAdapter();
if (adapter == null) {
if (this.mapKeyConverter.getConverterType() != null) {
@@ -635,7 +635,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM
}
} else {
if (this.mapKeyConverter.getConverterType() == adapter.getConverterType()) {
- this.mapKeyConverter.synchronizeWithResourceModel();
+ this.mapKeyConverter.synchronizeWithResourceModel(monitor);
} else {
this.setMapKeyConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java
index d1d393bede..20aaac2086 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java
@@ -74,8 +74,8 @@ public abstract class AbstractOrmNamedColumn<PA extends NamedColumn.ParentAdapte
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedName_(this.buildSpecifiedName());
this.setColumnDefinition_(this.buildColumnDefinition());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToManyMapping.java
index 4d66068158..8d0f8ab9c9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToManyMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToManyMapping.java
@@ -38,9 +38,9 @@ public abstract class AbstractOrmOneToManyMapping<X extends XmlOneToMany>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.orphanRemoval.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.orphanRemoval.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToOneMapping.java
index 6a8e062e0c..b004ed6318 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToOneMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToOneMapping.java
@@ -41,9 +41,9 @@ public abstract class AbstractOrmOneToOneMapping<X extends XmlOneToOne>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.orphanRemoval.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.orphanRemoval.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmPersistentAttribute.java
index aa852af5d7..8824430075 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmPersistentAttribute.java
@@ -90,12 +90,12 @@ public abstract class AbstractOrmPersistentAttribute
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedAccess_(this.buildSpecifiedAccess());
- this.mapping.synchronizeWithResourceModel();
+ this.mapping.synchronizeWithResourceModel(monitor);
if (this.cachedJavaPersistentAttribute != null) {
- this.cachedJavaPersistentAttribute.synchronizeWithResourceModel();
+ this.cachedJavaPersistentAttribute.synchronizeWithResourceModel(monitor);
}
}
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 1897649193..5a36796bd7 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
@@ -58,8 +58,8 @@ public abstract class AbstractOrmQuery<X extends XmlQuery>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.xmlQuery.getName());
this.syncHints();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java
index 24f13d22e2..ca3f7365ee 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java
@@ -72,11 +72,11 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedTargetEntity_(this.xmlAttributeMapping.getTargetEntity());
- this.relationship.synchronizeWithResourceModel();
- this.cascade.synchronizeWithResourceModel();
+ this.relationship.synchronizeWithResourceModel(monitor);
+ this.cascade.synchronizeWithResourceModel(monitor);
this.setSpecifiedFetch_(this.buildSpecifiedFetch());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java
index a9971f664f..01da404cc9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java
@@ -40,8 +40,8 @@ public abstract class AbstractOrmSequenceGenerator
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedSequenceName_(this.xmlGenerator.getSequenceName());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java
index 6dc1d07d22..4a9d2e7b3a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java
@@ -44,10 +44,10 @@ public abstract class AbstractOrmSingleRelationshipMapping<X extends AbstractXml
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedOptional_(this.xmlAttributeMapping.getOptional());
- this.derivedIdentity.synchronizeWithResourceModel();
+ this.derivedIdentity.synchronizeWithResourceModel(monitor);
}
@Override
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 30839babc1..ea5d6a4a21 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
@@ -85,8 +85,8 @@ public abstract class AbstractOrmTable<P extends JpaContextModel, PA extends Tab
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedName_(this.buildSpecifiedName());
this.setSpecifiedSchema_(this.buildSpecifiedSchema());
this.setSpecifiedCatalog_(this.buildSpecifiedCatalog());
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 cf97654624..5d02248a2e 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
@@ -69,8 +69,8 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
setSpecifiedMetadataComplete_(xmlTypeMapping.getMetadataComplete());
setSpecifiedParentClass_(buildSpecifiedParentClass());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java
index ac684550a7..40904e02ee 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java
@@ -70,10 +70,10 @@ public abstract class AbstractOrmVersionMapping<X extends XmlVersion>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.column.synchronizeWithResourceModel();
- this.syncConverter();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.column.synchronizeWithResourceModel(monitor);
+ this.syncConverter(monitor);
}
@Override
@@ -148,7 +148,7 @@ public abstract class AbstractOrmVersionMapping<X extends XmlVersion>
return this.nullConverter;
}
- protected void syncConverter() {
+ protected void syncConverter(IProgressMonitor monitor) {
OrmConverter.Adapter adapter = this.getXmlConverterAdapter();
if (adapter == null) {
if (this.converter.getConverterType() != null) {
@@ -156,7 +156,7 @@ public abstract class AbstractOrmVersionMapping<X extends XmlVersion>
}
} else {
if (this.converter.getConverterType() == adapter.getConverterType()) {
- this.converter.synchronizeWithResourceModel();
+ this.converter.synchronizeWithResourceModel(monitor);
} else {
this.setConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java
index b8161b50ce..d5c8613761 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java
@@ -61,11 +61,11 @@ public class GenericOrmIdClassReference
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedIdClassName_(this.buildSpecifiedIdClassName());
// sync the id class *after* we have the specified name
- this.syncIdClass();
+ this.syncIdClass(monitor);
}
@Override
@@ -215,17 +215,18 @@ public class GenericOrmIdClassReference
* <code>sync</code> it. In some circumstances it will be obsolete
* since the name is changed during <em>update</em> (the id class name and
* the entity mapping's package affect the fully qualified name)
+ * @param monitor TODO
*
- * @see #updateIdClass()
+ * @see #updateIdClass(IProgressMonitor)
*/
- protected void syncIdClass() {
+ protected void syncIdClass(IProgressMonitor monitor) {
if (this.idClass != null) {
- this.idClass.synchronizeWithResourceModel();
+ this.idClass.synchronizeWithResourceModel(monitor);
}
}
/**
- * @see #syncIdClass()
+ * @see #syncIdClass(IProgressMonitor)
*/
protected void updateIdClass(IProgressMonitor monitor) {
if (this.fullyQualifiedIdClassName == null) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToManyRelationship.java
index 2f2212095b..b211300b42 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToManyRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToManyRelationship.java
@@ -47,10 +47,10 @@ public class GenericOrmManyToManyRelationship
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.mappedByStrategy.synchronizeWithResourceModel();
- this.joinTableStrategy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.mappedByStrategy.synchronizeWithResourceModel(monitor);
+ this.joinTableStrategy.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToOneRelationship.java
index 10e9e2ff02..32d20dcd28 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToOneRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToOneRelationship.java
@@ -46,10 +46,10 @@ public class GenericOrmManyToOneRelationship
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.joinColumnStrategy.synchronizeWithResourceModel();
- this.joinTableStrategy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.joinColumnStrategy.synchronizeWithResourceModel(monitor);
+ this.joinTableStrategy.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java
index 3066a4e661..16055047c4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.core.internal.context.orm;
import java.util.List;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.core.utility.ValidationMessage;
import org.eclipse.jpt.common.utility.internal.ArrayTools;
@@ -47,8 +48,8 @@ public class GenericOrmMappedByRelationshipStrategy
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setMappedByAttribute_(this.getXmlMappedByMapping().getMappedBy());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToManyRelationship.java
index 79b1f393dd..db31260644 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToManyRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToManyRelationship.java
@@ -58,11 +58,11 @@ public class GenericOrmOneToManyRelationship
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.mappedByStrategy.synchronizeWithResourceModel();
- this.joinColumnStrategy.synchronizeWithResourceModel();
- this.joinTableStrategy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.mappedByStrategy.synchronizeWithResourceModel(monitor);
+ this.joinColumnStrategy.synchronizeWithResourceModel(monitor);
+ this.joinTableStrategy.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToOneRelationship.java
index 773542763f..fb0e6bfd29 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToOneRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToOneRelationship.java
@@ -58,12 +58,12 @@ public class GenericOrmOneToOneRelationship
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.mappedByStrategy.synchronizeWithResourceModel();
- this.primaryKeyJoinColumnStrategy.synchronizeWithResourceModel();
- this.joinTableStrategy.synchronizeWithResourceModel();
- this.joinColumnStrategy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.mappedByStrategy.synchronizeWithResourceModel(monitor);
+ this.primaryKeyJoinColumnStrategy.synchronizeWithResourceModel(monitor);
+ this.joinTableStrategy.synchronizeWithResourceModel(monitor);
+ this.joinColumnStrategy.synchronizeWithResourceModel(monitor);
}
@Override
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 9432efad49..391e674ea5 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
@@ -58,8 +58,8 @@ public class GenericOrmPrimaryKeyJoinColumnRelationshipStrategy
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncPrimaryKeyJoinColumns();
}
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 5119619372..4d384a576c 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
@@ -116,12 +116,12 @@ public abstract class SpecifiedOrmPersistentType
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.mapping.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.mapping.synchronizeWithResourceModel(monitor);
this.setSpecifiedAccess_(this.buildSpecifiedAccess());
this.syncSpecifiedAttributes();
- this.synchronizeModelsWithResourceModel(this.getDefaultAttributes());
+ this.synchronizeModelsWithResourceModel(this.getDefaultAttributes(), monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/VirtualOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/VirtualOrmPersistentAttribute.java
index c5e785a7a1..f7fe7670fb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/VirtualOrmPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/VirtualOrmPersistentAttribute.java
@@ -12,14 +12,13 @@ package org.eclipse.jpt.jpa.core.internal.context.orm;
import java.util.Collection;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
import org.eclipse.jpt.common.core.resource.java.JavaResourceField;
import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.core.utility.jdt.TypeBinding;
import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
-import org.eclipse.jpt.common.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.common.utility.model.listener.StateChangeListener;
import org.eclipse.jpt.jpa.core.JpaFile;
import org.eclipse.jpt.jpa.core.JpaStructureNode;
import org.eclipse.jpt.jpa.core.context.AccessType;
@@ -107,9 +106,9 @@ public class VirtualOrmPersistentAttribute
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.syncLocalJavaAttributes();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.syncLocalJavaAttributes(monitor);
// 'mapping' belongs to one of the "local" Java persistent attributes
}
@@ -188,10 +187,10 @@ public class VirtualOrmPersistentAttribute
return this.javaAccessor.buildUnannotatedJavaAttribute(this.getDeclaringPersistentType());
}
- protected void syncLocalJavaAttributes() {
- this.annotatedJavaAttribute.synchronizeWithResourceModel();
+ protected void syncLocalJavaAttributes(IProgressMonitor monitor) {
+ this.annotatedJavaAttribute.synchronizeWithResourceModel(monitor);
if (this.unannotatedJavaAttribute != null) {
- this.unannotatedJavaAttribute.synchronizeWithResourceModel();
+ this.unannotatedJavaAttribute.synchronizeWithResourceModel(monitor);
}
}
@@ -218,7 +217,7 @@ public class VirtualOrmPersistentAttribute
*/
public void javaAttributeChanged(JavaSpecifiedPersistentAttribute attribute) {
if (this.originalJavaAttribute == attribute) {
- this.syncLocalJavaAttributes();
+ this.syncLocalJavaAttributes(new NullProgressMonitor());
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java
index 5301579d07..a0ca6bed45 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java
@@ -72,10 +72,10 @@ public abstract class AbstractJarFileRef
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setFileName_(this.xmlJarFileRef.getFileName());
- this.syncJarFile();
+ this.syncJarFile(monitor);
}
@Override
@@ -178,14 +178,14 @@ public abstract class AbstractJarFileRef
*
* @see #updateJarFile(IProgressMonitor)
*/
- protected void syncJarFile() {
+ protected void syncJarFile(IProgressMonitor monitor) {
if (this.jarFile != null) {
- this.jarFile.synchronizeWithResourceModel();
+ this.jarFile.synchronizeWithResourceModel(monitor);
}
}
/**
- * @see #syncJarFile()
+ * @see #syncJarFile(IProgressMonitor)
*/
protected void updateJarFile(IProgressMonitor monitor) {
JavaResourcePackageFragmentRoot jrpfr = this.resolveJavaResourcePackageFragmentRoot();
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 62c9902b5f..dff4acbdb7 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
@@ -69,8 +69,8 @@ public abstract class AbstractMappingFileRef<MF extends MappingFile>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncMappingFile();
}
@@ -137,7 +137,7 @@ public abstract class AbstractMappingFileRef<MF extends MappingFile>
} else {
if (this.mappingFile.getResourceMappingFile() == newResourceMappingFile) {
if (sync) {
- this.mappingFile.synchronizeWithResourceModel();
+ this.mappingFile.synchronizeWithResourceModel(monitor);
} else {
this.mappingFile.update(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 676ed19bc4..f2c46000c3 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
@@ -249,8 +249,8 @@ public abstract class AbstractPersistenceUnit
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.xmlPersistenceUnit.getName());
this.setSpecifiedExcludeUnlistedClasses_(this.xmlPersistenceUnit.getExcludeUnlistedClasses());
@@ -261,12 +261,12 @@ public abstract class AbstractPersistenceUnit
this.setNonJtaDataSource_(this.xmlPersistenceUnit.getNonJtaDataSource());
this.syncSpecifiedMappingFileRefs();
- this.syncImpliedMappingFileRef();
+ this.syncImpliedMappingFileRef(monitor);
this.syncJarFileRefs();
this.syncSpecifiedClassRefs();
- this.synchronizeModelsWithResourceModel(this.getImpliedClassRefs());
+ this.synchronizeModelsWithResourceModel(this.getImpliedClassRefs(), monitor);
this.syncProperties();
@@ -652,8 +652,8 @@ public abstract class AbstractPersistenceUnit
return this.getContextModelFactory().buildVirtualMappingFileRef(this);
}
- protected void syncImpliedMappingFileRef() {
- this.potentialImpliedMappingFileRef.synchronizeWithResourceModel();
+ protected void syncImpliedMappingFileRef(IProgressMonitor monitor) {
+ this.potentialImpliedMappingFileRef.synchronizeWithResourceModel(monitor);
}
protected void updateImpliedMappingFileRef(IProgressMonitor monitor) {
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 89bbf072fa..4d03605852 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
@@ -67,8 +67,8 @@ public class GenericContextRoot
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncPersistenceXml();
}
@@ -120,7 +120,7 @@ public class GenericContextRoot
this.setPersistenceXml(this.buildPersistenceXml(xmlResource));
} else {
if (sync) {
- this.persistenceXml.synchronizeWithResourceModel();
+ this.persistenceXml.synchronizeWithResourceModel(monitor);
} else {
this.persistenceXml.update(monitor);
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java
index a5155ee72a..be6d7f9c66 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java
@@ -96,9 +96,9 @@ public abstract class AbstractJavaOverrideContainer<
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.synchronizeModelsWithResourceModel(this.getSpecifiedOverrides());
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.synchronizeModelsWithResourceModel(this.getSpecifiedOverrides(), monitor);
// the virtual overrides do not need a sync
}
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 6580574560..28d6d4ad37 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
@@ -61,8 +61,8 @@ public class GenericJarFile
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncJavaManagedTypes();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseEnumeratedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseEnumeratedConverter.java
index d9cf2b504b..6be77720b0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseEnumeratedConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseEnumeratedConverter.java
@@ -37,8 +37,8 @@ public class GenericJavaBaseEnumeratedConverter
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedEnumType_(this.buildSpecifiedEnumType());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseTemporalConverter.java
index a6e5b8c7cf..481ac211fc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseTemporalConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBaseTemporalConverter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa1.context.java;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
import org.eclipse.jpt.jpa.core.context.Converter;
@@ -36,8 +37,8 @@ public class GenericJavaBaseTemporalConverter
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setTemporalType_(this.buildTemporalType());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaCascade.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaCascade.java
index 2929d7fe1a..53937431ed 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaCascade.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaCascade.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa1.context.java;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipMapping;
import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaContextModel;
@@ -54,8 +55,8 @@ public class GenericJavaCascade
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setAll_(this.buildAll());
this.setPersist_(this.buildPersist());
this.setMerge_(this.buildMerge());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEntity.java
index 70cce6ece8..773049344a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEntity.java
@@ -34,9 +34,9 @@ public class GenericJavaEntity
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.cacheable.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.cacheable.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java
index f51f0546a4..3d8bc6d6ee 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java
@@ -51,8 +51,8 @@ public class GenericJavaGeneratedValue
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedStrategy_(this.buildSpecifiedStrategy());
this.setSpecifiedGenerator_(this.generatedValueAnnotation.getGenerator());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java
index f03a23757f..d304291591 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java
@@ -42,10 +42,10 @@ public class GenericJavaGeneratorContainer
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.syncSequenceGenerator();
- this.syncTableGenerator();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.syncSequenceGenerator(monitor);
+ this.syncTableGenerator(monitor);
}
@Override
@@ -103,7 +103,7 @@ public class GenericJavaGeneratorContainer
null;
}
- protected void syncSequenceGenerator() {
+ protected void syncSequenceGenerator(IProgressMonitor monitor) {
SequenceGeneratorAnnotation annotation = this.getSequenceGeneratorAnnotation();
if (annotation == null) {
if (this.sequenceGenerator != null) {
@@ -111,7 +111,7 @@ public class GenericJavaGeneratorContainer
}
} else {
if ((this.sequenceGenerator != null) && (this.sequenceGenerator.getGeneratorAnnotation() == annotation)) {
- this.sequenceGenerator.synchronizeWithResourceModel();
+ this.sequenceGenerator.synchronizeWithResourceModel(monitor);
} else {
this.setSequenceGenerator(this.buildSequenceGenerator(annotation));
}
@@ -168,7 +168,7 @@ public class GenericJavaGeneratorContainer
null;
}
- protected void syncTableGenerator() {
+ protected void syncTableGenerator(IProgressMonitor monitor) {
TableGeneratorAnnotation annotation = this.getTableGeneratorAnnotation();
if (annotation == null) {
if (this.tableGenerator != null) {
@@ -176,7 +176,7 @@ public class GenericJavaGeneratorContainer
}
} else {
if ((this.tableGenerator != null) && (this.tableGenerator.getGeneratorAnnotation() == annotation)) {
- this.tableGenerator.synchronizeWithResourceModel();
+ this.tableGenerator.synchronizeWithResourceModel(monitor);
} else {
this.setTableGenerator(this.buildTableGenerator(annotation));
}
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 51221c6e8f..497870ab0f 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
@@ -71,8 +71,8 @@ public class GenericJavaJoinTable
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncSpecifiedInverseJoinColumns();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedNativeQuery.java
index 80ef6e1080..ddc71f941c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedNativeQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedNativeQuery.java
@@ -51,8 +51,8 @@ public class GenericJavaNamedNativeQuery
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setQuery_(this.queryAnnotation.getQuery());
this.setResultClass_(this.queryAnnotation.getResultClass());
this.setResultSetMapping_(this.queryAnnotation.getResultSetMapping());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedQuery.java
index 9b604fccc1..d743d3aed5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedQuery.java
@@ -50,8 +50,8 @@ public class GenericJavaNamedQuery
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setQuery_(this.queryAnnotation.getQuery());
this.setSpecifiedLockMode_(this.buildSpecifiedLockMode());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderBy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderBy.java
index 82062f52b8..e1102d5d5a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderBy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderBy.java
@@ -1,14 +1,15 @@
/*******************************************************************************
- * Copyright (c) 2013 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2013, 2015 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa1.context.java;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.StringTools;
import org.eclipse.jpt.jpa.core.context.JpaContextModel;
@@ -35,8 +36,8 @@ public class GenericJavaOrderBy
// ***** sync/update *****
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
synchKey();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java
index bb702a8c4c..ad351d8135 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java
@@ -83,11 +83,11 @@ public class GenericJavaOrderable
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
syncNoOrdering();
- syncOrderBy();
- syncOrderColumn();
+ syncOrderBy(monitor);
+ syncOrderColumn(monitor);
}
@Override
@@ -179,9 +179,9 @@ public class GenericJavaOrderable
this.orderBy = buildOrderBy();
}
- protected void syncOrderBy() {
+ protected void syncOrderBy(IProgressMonitor monitor) {
setOrderByOrdering_(buildOrderByOrdering());
- this.orderBy.synchronizeWithResourceModel();
+ this.orderBy.synchronizeWithResourceModel(monitor);
}
protected void updateOrderBy(IProgressMonitor monitor) {
@@ -273,9 +273,9 @@ public class GenericJavaOrderable
this.orderColumn = buildOrderColumn();
}
- protected void syncOrderColumn() {
+ protected void syncOrderColumn(IProgressMonitor monitor) {
setOrderColumnOrdering_(buildOrderColumnOrdering());
- this.orderColumn.synchronizeWithResourceModel();
+ this.orderColumn.synchronizeWithResourceModel(monitor);
}
protected void updateOrderColumn(IProgressMonitor monitor) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java
index 17836e1f04..671eabccb2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java
@@ -59,10 +59,10 @@ public class GenericJavaOverrideRelationship
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.joinColumnStrategy.synchronizeWithResourceModel();
- this.joinTableStrategy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.joinColumnStrategy.synchronizeWithResourceModel(monitor);
+ this.joinTableStrategy.synchronizeWithResourceModel(monitor);
}
@Override
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 7c5f949c0c..d8998ecd38 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
@@ -54,8 +54,8 @@ public class GenericJavaQueryContainer
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncNamedQueries();
this.syncNamedNativeQueries();
this.syncNamedStoredProcedureQueries();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryHint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryHint.java
index 2d9ad76481..f3bfc90a29 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryHint.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryHint.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa1.context.java;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.jpa.core.context.QueryHint;
@@ -41,8 +42,8 @@ public class GenericJavaQueryHint
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.queryHintAnnotation.getName());
this.setValue_(this.queryHintAnnotation.getValue());
}
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 a5749c1a3e..7f7484c16a 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
@@ -53,8 +53,8 @@ public abstract class GenericJavaReferenceTable<P extends JpaContextModel, PA ex
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncSpecifiedJoinColumns();
}
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 a2cff234d6..60edc8edcc 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
@@ -58,8 +58,8 @@ public class GenericJavaSecondaryTable
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncSpecifiedPrimaryKeyJoinColumns();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSpecifiedAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSpecifiedAssociationOverride.java
index 18c3b0ab7a..c95568dae4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSpecifiedAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSpecifiedAssociationOverride.java
@@ -44,9 +44,9 @@ public class GenericJavaSpecifiedAssociationOverride
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.relationship.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.relationship.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSpecifiedAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSpecifiedAttributeOverride.java
index e90d33ff57..7131564261 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSpecifiedAttributeOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSpecifiedAttributeOverride.java
@@ -45,9 +45,9 @@ public class GenericJavaSpecifiedAttributeOverride
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.column.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.column.synchronizeWithResourceModel(monitor);
}
@Override
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 900485b432..7d036bc233 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
@@ -79,8 +79,8 @@ public class GenericJavaTableGenerator
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedTableName_(this.generatorAnnotation.getTable());
this.setSpecifiedSchema_(this.generatorAnnotation.getSchema());
this.setSpecifiedCatalog_(this.generatorAnnotation.getCatalog());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java
index 5c05ec0075..ff798f169c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa1.context.java;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.common.utility.internal.StringTools;
@@ -36,8 +37,8 @@ public class GenericJavaUniqueConstraint
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncColumnNames();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java
index 4f924e4036..59f0932b75 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java
@@ -73,9 +73,9 @@ public abstract class AbstractOrmEmbeddedMapping<X extends XmlEmbedded>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.associationOverrideContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.associationOverrideContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedDiscriminatorColumn.java
index fd48bd668e..bd81d2dd0f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedDiscriminatorColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedDiscriminatorColumn.java
@@ -45,8 +45,8 @@ public abstract class AbstractOrmNamedDiscriminatorColumn<PA extends NamedDiscri
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedDiscriminatorType_(this.buildSpecifiedDiscriminatorType());
this.setSpecifiedLength_(this.buildSpecifiedLength());
}
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 9700a6a1e7..4229d1d868 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
@@ -74,8 +74,8 @@ public abstract class AbstractOrmOverrideContainer<
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncSpecifiedOverrides();
// the virtual overrides do not need a sync
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitDefaults.java
index 6c56ede7ae..c133c07e18 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitDefaults.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitDefaults.java
@@ -65,8 +65,8 @@ public abstract class AbstractOrmPersistenceUnitDefaults
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedAccess_(this.buildSpecifiedAccess());
this.setSpecifiedCatalog_(this.buildSpecifiedCatalog());
this.setSpecifiedSchema_(this.buildSpecifiedSchema());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitMetadata.java
index d79d003ab0..f023d105e9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitMetadata.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitMetadata.java
@@ -51,11 +51,11 @@ public abstract class AbstractOrmPersistenceUnitMetadata
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setXmlMappingMetadataComplete_(this.buildXmlMappingMetadataComplete());
this.setDescription_(this.buildDescription());
- this.persistenceUnitDefaults.synchronizeWithResourceModel();
+ this.persistenceUnitDefaults.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmSpecifiedOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmSpecifiedOverride.java
index 21802b496d..9298dc0a7d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmSpecifiedOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmSpecifiedOverride.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm;
import java.util.List;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.context.BaseColumn;
import org.eclipse.jpt.jpa.core.context.Override_;
@@ -47,8 +48,8 @@ public abstract class AbstractOrmSpecifiedOverride<P extends OrmOverrideContaine
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.xmlOverride.getName());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseEnumeratedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseEnumeratedConverter.java
index 8ff36690eb..21cd52564d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseEnumeratedConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseEnumeratedConverter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,9 +9,9 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter;
-import org.eclipse.jpt.jpa.core.context.Converter;
import org.eclipse.jpt.jpa.core.context.EnumType;
import org.eclipse.jpt.jpa.core.context.orm.OrmBaseEnumeratedConverter;
@@ -31,8 +31,8 @@ public class GenericOrmBaseEnumeratedConverter
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedEnumType_(this.buildSpecifiedEnumType());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseTemporalConverter.java
index 3c37dc76c1..cb17724511 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseTemporalConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseTemporalConverter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,9 +9,9 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter;
-import org.eclipse.jpt.jpa.core.context.Converter;
import org.eclipse.jpt.jpa.core.context.TemporalType;
import org.eclipse.jpt.jpa.core.context.orm.OrmBaseTemporalConverter;
@@ -30,8 +30,8 @@ public class GenericOrmBaseTemporalConverter
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setTemporalType_(this.buildTemporalType());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmCascade.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmCascade.java
index 773b660493..e95e8dbb83 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmCascade.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmCascade.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.context.Cascade;
import org.eclipse.jpt.jpa.core.context.orm.OrmRelationshipMapping;
@@ -57,8 +58,8 @@ public class GenericOrmCascade
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setAll_(this.buildAll());
this.setPersist_(this.buildPersist());
this.setMerge_(this.buildMerge());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmColumn.java
index 7eb534d9ca..f9173496fa 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmColumn.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the terms of
* the Eclipse Public License v1.0, which accompanies this distribution and is available at
* http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.jpa.core.context.VirtualColumn;
import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn;
@@ -41,8 +42,8 @@ public class GenericOrmColumn
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedLength_(this.buildSpecifiedLength());
this.setSpecifiedPrecision_(this.buildSpecifiedPrecision());
this.setSpecifiedScale_(this.buildSpecifiedScale());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEntity.java
index 9386207926..83fc28045a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEntity.java
@@ -35,9 +35,9 @@ public class GenericOrmEntity
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.cacheable.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.cacheable.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratedValue.java
index 8e7b245632..3b5dab50ac 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratedValue.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratedValue.java
@@ -49,8 +49,8 @@ public class GenericOrmGeneratedValue
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedStrategy_(this.buildSpecifiedStrategy());
this.setSpecifiedGenerator_(this.xmlGeneratedValue.getGenerator());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java
index da5751a1e0..f0fc29494b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java
@@ -48,10 +48,10 @@ public class GenericOrmGeneratorContainer
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.syncSequenceGenerator();
- this.syncTableGenerator();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.syncSequenceGenerator(monitor);
+ this.syncTableGenerator(monitor);
}
@Override
@@ -108,7 +108,7 @@ public class GenericOrmGeneratorContainer
return this.getContextModelFactory().buildOrmSequenceGenerator(this, xmlSequenceGenerator);
}
- protected void syncSequenceGenerator() {
+ protected void syncSequenceGenerator(IProgressMonitor monitor) {
XmlSequenceGenerator xmlGenerator = this.getXmlSequenceGenerator();
if (xmlGenerator == null) {
if (this.sequenceGenerator != null) {
@@ -116,7 +116,7 @@ public class GenericOrmGeneratorContainer
}
} else {
if ((this.sequenceGenerator != null) && (this.sequenceGenerator.getXmlGenerator() == xmlGenerator)) {
- this.sequenceGenerator.synchronizeWithResourceModel();
+ this.sequenceGenerator.synchronizeWithResourceModel(monitor);
} else {
this.setSequenceGenerator_(this.buildSequenceGenerator(xmlGenerator));
}
@@ -172,7 +172,7 @@ public class GenericOrmGeneratorContainer
return this.getContextModelFactory().buildOrmTableGenerator(this, xmlTableGenerator);
}
- protected void syncTableGenerator() {
+ protected void syncTableGenerator(IProgressMonitor monitor) {
XmlTableGenerator xmlGenerator = this.getXmlTableGenerator();
if (xmlGenerator == null) {
if (this.tableGenerator != null) {
@@ -180,7 +180,7 @@ public class GenericOrmGeneratorContainer
}
} else {
if ((this.tableGenerator != null) && (this.tableGenerator.getXmlGenerator() == xmlGenerator)) {
- this.tableGenerator.synchronizeWithResourceModel();
+ this.tableGenerator.synchronizeWithResourceModel(monitor);
} else {
this.setTableGenerator_(this.buildTableGenerator(xmlGenerator));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java
index 6c0d7cc306..b618bb2863 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java
@@ -48,8 +48,8 @@ public class GenericOrmJoinColumn
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedReferencedColumnName_(this.buildSpecifiedReferencedColumnName());
}
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 19fa4faee5..0c6676618e 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
@@ -67,11 +67,11 @@ public class GenericOrmJoinTable
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncSpecifiedInverseJoinColumns();
if (this.defaultInverseJoinColumn != null) {
- this.defaultInverseJoinColumn.synchronizeWithResourceModel();
+ this.defaultInverseJoinColumn.synchronizeWithResourceModel(monitor);
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedNativeQuery.java
index fc37280117..5e697b15df 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedNativeQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedNativeQuery.java
@@ -52,8 +52,8 @@ public class GenericOrmNamedNativeQuery
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setQuery_(this.xmlQuery.getQuery());
this.setResultClass_(this.xmlQuery.getResultClass());
this.setResultSetMapping_(this.xmlQuery.getResultSetMapping());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedQuery.java
index f36d473d00..98e11b1146 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedQuery.java
@@ -54,8 +54,8 @@ public final class GenericOrmNamedQuery
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setQuery_(this.xmlQuery.getQuery());
this.setSpecifiedLockMode_(this.buildSpecifiedLockMode());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderBy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderBy.java
index 980ace72c6..11012ba16c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderBy.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderBy.java
@@ -1,14 +1,15 @@
/*******************************************************************************
- * Copyright (c) 2013 Oracle. All rights reserved.
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0, which accompanies this distribution
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Oracle - initial API and implementation
- *******************************************************************************/
+ * Copyright (c) 2013, 2015 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.StringTools;
import org.eclipse.jpt.jpa.core.context.JpaContextModel;
@@ -35,8 +36,8 @@ public class GenericOrmOrderBy
// ***** sync/update *****
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
synchKey();
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java
index a69c09d1ca..fb91acf020 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java
@@ -78,12 +78,12 @@ public class GenericOrmOrderable
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
synchNoOrdering();
- synchOrderBy();
- synchOrderColumn();
+ syncOrderBy(monitor);
+ syncOrderColumn(monitor);
}
@Override
@@ -172,9 +172,9 @@ public class GenericOrmOrderable
this.orderBy = buildOrderBy();
}
- protected void synchOrderBy() {
+ protected void syncOrderBy(IProgressMonitor monitor) {
setOrderByOrdering_(buildOrderByOrdering());
- this.orderBy.synchronizeWithResourceModel();
+ this.orderBy.synchronizeWithResourceModel(monitor);
}
protected void updateOrderBy(IProgressMonitor monitor) {
@@ -247,10 +247,10 @@ public class GenericOrmOrderable
this.orderColumn = buildOrderColumn();
}
- protected void synchOrderColumn() {
+ protected void syncOrderColumn(IProgressMonitor monitor) {
setOrderColumnOrdering_(buildOrderColumnOrdering());
if (this.orderColumn != null) {
- this.orderColumn.synchronizeWithResourceModel();
+ this.orderColumn.synchronizeWithResourceModel(monitor);
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java
index 2310e23152..1baf0a4d83 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java
@@ -60,10 +60,10 @@ public class GenericOrmOverrideRelationship
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.joinColumnStrategy.synchronizeWithResourceModel();
- this.joinTableStrategy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.joinColumnStrategy.synchronizeWithResourceModel(monitor);
+ this.joinTableStrategy.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java
index aaceb6190a..2b3e9c8cbc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java
@@ -43,8 +43,8 @@ public class GenericOrmPrimaryKeyJoinColumn
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedReferencedColumnName_(this.buildSpecifiedReferencedColumnName());
}
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 45d82ccde9..d76773d3a7 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
@@ -60,8 +60,8 @@ public class GenericOrmQueryContainer
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncNamedQueries();
this.syncNamedNativeQueries();
this.syncNamedStoredProcedureQueries();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryHint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryHint.java
index c33596cf78..68fe350810 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryHint.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryHint.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.jpa.core.context.QueryHint;
@@ -42,8 +43,8 @@ public class GenericOrmQueryHint
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.xmlQueryHint.getName());
this.setValue_(this.xmlQueryHint.getValue());
}
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 10d31829d3..5b662ad922 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
@@ -54,8 +54,8 @@ public abstract class GenericOrmReferenceTable<P extends JpaContextModel, PA ext
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncSpecifiedJoinColumns();
}
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 666034c154..d4a609507c 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
@@ -62,11 +62,11 @@ public class GenericOrmSecondaryTable
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncSpecifiedPrimaryKeyJoinColumns();
if (this.defaultPrimaryKeyJoinColumn != null) {
- this.defaultPrimaryKeyJoinColumn.synchronizeWithResourceModel();
+ this.defaultPrimaryKeyJoinColumn.synchronizeWithResourceModel(monitor);
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSpecifiedAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSpecifiedAssociationOverride.java
index 1e692ca633..a45bddcda0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSpecifiedAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSpecifiedAssociationOverride.java
@@ -43,9 +43,9 @@ public class GenericOrmSpecifiedAssociationOverride
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.relationship.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.relationship.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSpecifiedAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSpecifiedAttributeOverride.java
index 631b03d5f6..ebcfa0e881 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSpecifiedAttributeOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSpecifiedAttributeOverride.java
@@ -45,9 +45,9 @@ public class GenericOrmSpecifiedAttributeOverride
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.column.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.column.synchronizeWithResourceModel(monitor);
}
@Override
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 83dfa4bc94..02df0bf32f 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
@@ -76,8 +76,8 @@ public class GenericOrmTableGenerator
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedTableName_(this.xmlGenerator.getTable());
this.setSpecifiedSchema_(this.xmlGenerator.getSchema());
this.setSpecifiedCatalog_(this.xmlGenerator.getCatalog());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmUniqueConstraint.java
index bcc15233f4..b91bebb4f4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmUniqueConstraint.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmUniqueConstraint.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.jpa.core.context.SpecifiedUniqueConstraint;
@@ -35,8 +36,8 @@ public class GenericOrmUniqueConstraint
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncColumnNames();
}
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 c1a5e9163c..0339260aa8 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
@@ -93,11 +93,11 @@ public class GenericOrmXml
// ********** synchronize/update **********
/**
- * @see org.eclipse.jpt.jpa.core.internal.jpa1.context.persistence.GenericPersistenceXml#synchronizeWithResourceModel()
+ * @see org.eclipse.jpt.jpa.core.internal.jpa1.context.persistence.GenericPersistenceXml#synchronizeWithResourceModel(IProgressMonitor)
*/
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncEntityMappings();
}
@@ -153,7 +153,7 @@ public class GenericOrmXml
} else {
// the context entity mappings already holds the XML entity mappings
if (sync) {
- this.root.synchronizeWithResourceModel();
+ this.root.synchronizeWithResourceModel(monitor);
}
else {
this.root.update(monitor);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java
index 492bc25d9f..03b176d9d0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java
@@ -107,15 +107,15 @@ public class GenericClassRef
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
// virtual class refs are matched by name in the persistence unit
// so no need to sync it here (also, 'xmlJavaClassRef' is null...)
if (this.isNotVirtual()) {
this.setClassName_(this.xmlJavaClassRef.getJavaClass());
}
if (this.javaManagedType != null) {
- this.javaManagedType.synchronizeWithResourceModel();
+ this.javaManagedType.synchronizeWithResourceModel(monitor);
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericOrmXmlRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericOrmXmlRef.java
index 9965f3a89c..2071579307 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericOrmXmlRef.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericOrmXmlRef.java
@@ -13,6 +13,7 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.resource.ProjectResourceLocator;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
@@ -43,10 +44,10 @@ public class GenericOrmXmlRef
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
// set the file name *before* calling super
this.setFileName_(this.xmlMappingFileRef.getFileName());
- super.synchronizeWithResourceModel();
+ super.synchronizeWithResourceModel(monitor);
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java
index 73870d867e..97ea34a065 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java
@@ -64,9 +64,9 @@ public class GenericPersistence
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.syncPersistenceUnits();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.syncPersistenceUnits(monitor);
}
@Override
@@ -153,7 +153,7 @@ public class GenericPersistence
}
}
- protected void syncPersistenceUnits() {
+ protected void syncPersistenceUnits(IProgressMonitor monitor) {
XmlPersistenceUnit xmlPersistenceUnit = this.getXmlPersistenceUnit();
if (this.persistenceUnit == null) {
if (xmlPersistenceUnit != null) {
@@ -164,7 +164,7 @@ public class GenericPersistence
this.removePersistenceUnit_();
} else {
if (this.persistenceUnit.getXmlPersistenceUnit() == xmlPersistenceUnit) {
- this.persistenceUnit.synchronizeWithResourceModel();
+ this.persistenceUnit.synchronizeWithResourceModel(monitor);
} else {
this.removePersistenceUnit_();
this.addPersistenceUnit_(this.buildPersistenceUnit(xmlPersistenceUnit));
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceUnitProperty.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceUnitProperty.java
index 221c81aed7..be20c03490 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceUnitProperty.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceUnitProperty.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
*******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa1.context.persistence;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IType;
import org.eclipse.jpt.common.core.utility.TextRange;
@@ -47,8 +48,8 @@ public class GenericPersistenceUnitProperty
// ********** synchronize **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.xmlProperty.getName());
this.setValue_(this.xmlProperty.getValue());
}
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 fdf3b56c48..d12dfac415 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
@@ -73,11 +73,11 @@ public class GenericPersistenceXml
// ********** synchronize/update **********
/**
- * @see org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmXml#synchronizeWithResourceModel()
+ * @see org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmXml#synchronizeWithResourceModel(IProgressMonitor)
*/
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncPersistence();
}
@@ -131,7 +131,7 @@ public class GenericPersistenceXml
} else {
// the context persistence already holds the XML persistence
if (sync) {
- this.root.synchronizeWithResourceModel();
+ this.root.synchronizeWithResourceModel(monitor);
}
else {
this.root.update(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 1c5f6ec9dc..8ac848dd4a 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
@@ -200,17 +200,17 @@ public abstract class AbstractJavaElementCollectionMapping2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedTargetClass_(this.buildSpecifiedTargetClass());
this.setSpecifiedFetch_(this.buildSpecifiedFetch());
- this.orderable.synchronizeWithResourceModel();
- this.collectionTable.synchronizeWithResourceModel();
+ this.orderable.synchronizeWithResourceModel(monitor);
+ this.collectionTable.synchronizeWithResourceModel(monitor);
- this.valueColumn.synchronizeWithResourceModel();
- this.syncConverter();
- this.valueAttributeOverrideContainer.synchronizeWithResourceModel();
- this.valueAssociationOverrideContainer.synchronizeWithResourceModel();
+ this.valueColumn.synchronizeWithResourceModel(monitor);
+ this.syncConverter(monitor);
+ this.valueAttributeOverrideContainer.synchronizeWithResourceModel(monitor);
+ this.valueAssociationOverrideContainer.synchronizeWithResourceModel(monitor);
this.setSpecifiedMapKey_(this.buildSpecifiedMapKey());
this.setNoMapKey_(this.buildNoMapKey());
@@ -218,9 +218,9 @@ public abstract class AbstractJavaElementCollectionMapping2_0
this.setCustomMapKey_(this.buildCustomMapKey());
this.setSpecifiedMapKeyClass_(this.buildSpecifiedMapKeyClass());
- this.mapKeyColumn.synchronizeWithResourceModel();
- this.syncMapKeyConverter();
- this.mapKeyAttributeOverrideContainer.synchronizeWithResourceModel();
+ this.mapKeyColumn.synchronizeWithResourceModel(monitor);
+ this.syncMapKeyConverter(monitor);
+ this.mapKeyAttributeOverrideContainer.synchronizeWithResourceModel(monitor);
this.syncSpecifiedMapKeyJoinColumns();
}
@@ -532,7 +532,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0
return this.buildNullConverter();
}
- protected void syncConverter() {
+ protected void syncConverter(IProgressMonitor monitor) {
Association<JavaConverter.Adapter, Annotation> assoc = this.getConverterAnnotation();
if (assoc == null) {
if (this.converter.getConverterType() != null) {
@@ -543,7 +543,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0
Annotation annotation = assoc.getValue();
if ((this.converter.getConverterType() == adapter.getConverterType()) &&
(this.converter.getConverterAnnotation() == annotation)) {
- this.converter.synchronizeWithResourceModel();
+ this.converter.synchronizeWithResourceModel(monitor);
} else {
this.setConverter_(adapter.buildConverter(annotation, this, this.getJpaFactory()));
}
@@ -985,7 +985,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0
return this.buildNullConverter();
}
- protected void syncMapKeyConverter() {
+ protected void syncMapKeyConverter(IProgressMonitor monitor) {
Association<JavaConverter.Adapter, Annotation> assoc = this.getMapKeyConverterAnnotation();
if (assoc == null) {
if (this.mapKeyConverter.getConverterType() != null) {
@@ -996,7 +996,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0
Annotation annotation = assoc.getValue();
if ((this.mapKeyConverter.getConverterType() == adapter.getConverterType()) &&
(this.mapKeyConverter.getConverterAnnotation() == annotation)) {
- this.mapKeyConverter.synchronizeWithResourceModel();
+ this.mapKeyConverter.synchronizeWithResourceModel(monitor);
} else {
this.setMapKeyConverter_(adapter.buildConverter(annotation, this, this.getJpaFactory()));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java
index 8404c0e9b5..e998f8403a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java
@@ -38,8 +38,8 @@ public class GenericJavaCacheable2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedCacheable_(this.buildSpecifiedCacheable());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java
index 04d188e3cc..01da8553ab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java
@@ -43,10 +43,10 @@ public class GenericJavaDerivedIdentity2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.idStrategy.synchronizeWithResourceModel();
- this.mapsIdStrategy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.idStrategy.synchronizeWithResourceModel(monitor);
+ this.mapsIdStrategy.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaIdDerivedIdentityStrategy2_0.java
index c57b1c939e..6d114afd57 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaIdDerivedIdentityStrategy2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaIdDerivedIdentityStrategy2_0.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.core.internal.jpa2.context.java;
import java.util.List;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaContextModel;
@@ -36,8 +37,8 @@ public class GenericJavaIdDerivedIdentityStrategy2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setValue_(this.buildValue());
}
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 a0daba9f1f..fc19d8d99f 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
@@ -57,8 +57,8 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
setSpecifiedIdAttributeName_(buildSpecifiedIdAttributeName());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java
index 9209fc21c3..1b0cbeb9cf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java
@@ -38,8 +38,8 @@ public class GenericJavaOrphanRemoval2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedOrphanRemoval_(this.buildSpecifiedOrphanRemoval());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaPersistentType2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaPersistentType2_0.java
index 1b4d952cf1..7ee6e24fca 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaPersistentType2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaPersistentType2_0.java
@@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java;
import java.util.Collection;
import java.util.Map;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
import org.eclipse.jpt.common.core.utility.BodySourceWriter;
import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
@@ -42,8 +43,8 @@ public class GenericJavaPersistentType2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setDeclaringTypeName(this.buildDeclaringTypeName());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0.java
index 294f316811..e47f4b7c4d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0.java
@@ -43,8 +43,8 @@ public class GenericJavaSequenceGenerator2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedCatalog_(this.generatorAnnotation.getCatalog());
this.setSpecifiedSchema_(this.generatorAnnotation.getSchema());
}
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 0f6009889a..5225ef4cfd 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
@@ -201,17 +201,17 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedTargetClass_(this.xmlAttributeMapping.getTargetClass());
this.setSpecifiedFetch_(this.buildSpecifiedFetch());
- this.orderable.synchronizeWithResourceModel();
- this.collectionTable.synchronizeWithResourceModel();
+ this.orderable.synchronizeWithResourceModel(monitor);
+ this.collectionTable.synchronizeWithResourceModel(monitor);
- this.valueColumn.synchronizeWithResourceModel();
- this.syncConverter();
- this.valueAttributeOverrideContainer.synchronizeWithResourceModel();
- this.valueAssociationOverrideContainer.synchronizeWithResourceModel();
+ this.valueColumn.synchronizeWithResourceModel(monitor);
+ this.syncConverter(monitor);
+ this.valueAttributeOverrideContainer.synchronizeWithResourceModel(monitor);
+ this.valueAssociationOverrideContainer.synchronizeWithResourceModel(monitor);
this.setSpecifiedMapKey_(this.buildSpecifiedMapKey());
this.setNoMapKey_(this.buildNoMapKey());
@@ -219,9 +219,9 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
this.setCustomMapKey_(this.buildCustomMapKey());
this.setSpecifiedMapKeyClass_(this.buildSpecifiedMapKeyClass());
- this.mapKeyColumn.synchronizeWithResourceModel();
- this.syncMapKeyConverter();
- this.mapKeyAttributeOverrideContainer.synchronizeWithResourceModel();
+ this.mapKeyColumn.synchronizeWithResourceModel(monitor);
+ this.syncMapKeyConverter(monitor);
+ this.mapKeyAttributeOverrideContainer.synchronizeWithResourceModel(monitor);
this.syncSpecifiedMapKeyJoinColumns();
}
@@ -536,7 +536,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
return this.nullConverter;
}
- protected void syncConverter() {
+ protected void syncConverter(IProgressMonitor monitor) {
OrmConverter.Adapter adapter = this.getXmlConverterAdapter();
if (adapter == null) {
if (this.converter.getConverterType() != null) {
@@ -544,7 +544,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
}
} else {
if (this.converter.getConverterType() == adapter.getConverterType()) {
- this.converter.synchronizeWithResourceModel();
+ this.converter.synchronizeWithResourceModel(monitor);
} else {
this.setConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
}
@@ -977,7 +977,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
return this.nullConverter;
}
- protected void syncMapKeyConverter() {
+ protected void syncMapKeyConverter(IProgressMonitor monitor) {
OrmConverter.Adapter adapter = this.getXmlMapKeyConverterAdapter();
if (adapter == null) {
if (this.mapKeyConverter.getConverterType() != null) {
@@ -985,7 +985,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen
}
} else {
if (this.mapKeyConverter.getConverterType() == adapter.getConverterType()) {
- this.mapKeyConverter.synchronizeWithResourceModel();
+ this.mapKeyConverter.synchronizeWithResourceModel(monitor);
} else {
this.setMapKeyConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java
index 5c59dc9f86..76406402e4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java
@@ -36,8 +36,8 @@ public class GenericOrmCacheable2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedCacheable_(this.getXmlCacheable().getCacheable());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmDerivedIdentity2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmDerivedIdentity2_0.java
index 02717f6101..2c8439954f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmDerivedIdentity2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmDerivedIdentity2_0.java
@@ -42,10 +42,10 @@ public class GenericOrmDerivedIdentity2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.idStrategy.synchronizeWithResourceModel();
- this.mapsIdStrategy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.idStrategy.synchronizeWithResourceModel(monitor);
+ this.mapsIdStrategy.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmIdDerivedIdentityStrategy2_0.java
index 59b0fde003..fbf595403d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmIdDerivedIdentityStrategy2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmIdDerivedIdentityStrategy2_0.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm;
import java.util.List;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextModel;
import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmDerivedIdentity2_0;
@@ -35,8 +36,8 @@ public class GenericOrmIdDerivedIdentityStrategy2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setValue_(this.buildValue());
}
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 474c4a9a50..b51b425f98 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm;
import java.util.List;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.core.utility.ValidationMessage;
import org.eclipse.jpt.common.utility.internal.ArrayTools;
@@ -55,8 +56,8 @@ public class GenericOrmMapsIdDerivedIdentityStrategy2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedIdAttributeName_(buildSpecifiedIdAttributeName());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrderColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrderColumn2_0.java
index 521ec0ca9b..6cb849bf90 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrderColumn2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrderColumn2_0.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmNamedColumn;
import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmSpecifiedOrderColumn2_0;
@@ -40,8 +41,8 @@ public class GenericOrmOrderColumn2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedNullable_(this.buildSpecifiedNullable());
this.setSpecifiedInsertable_(this.buildSpecifiedInsertable());
this.setSpecifiedUpdatable_(this.buildSpecifiedUpdatable());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java
index 0c88398fb4..1052aa9e20 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java
@@ -38,8 +38,8 @@ public class GenericOrmOrphanRemoval2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedOrphanRemoval_(this.buildSpecifiedOrphanRemoval());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmSequenceGenerator2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmSequenceGenerator2_0.java
index 879d1ba8e0..2d4fb5048b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmSequenceGenerator2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmSequenceGenerator2_0.java
@@ -45,8 +45,8 @@ public class GenericOrmSequenceGenerator2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedCatalog_(this.xmlGenerator.getCatalog());
this.setSpecifiedSchema_(this.xmlGenerator.getSchema());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaConverterType2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaConverterType2_1.java
index c1f71aedcb..813c21d09c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaConverterType2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaConverterType2_1.java
@@ -33,8 +33,8 @@ public class GenericJavaConverterType2_1
}
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedAutoApply_(this.buildSpecifiedAutoApply());
this.setAutoApply(this.buildAutoApply());
}
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 78bb94079c..7f2469a9bd 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
@@ -56,8 +56,8 @@ public class GenericJavaNamedStoredProcedureQuery2_1
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setProcedureName_(this.queryAnnotation.getProcedureName());
this.syncParameters();
this.syncResultClasses();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaStoredProcedureParameter2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaStoredProcedureParameter2_1.java
index 68f3eacef9..21636b2187 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaStoredProcedureParameter2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/java/GenericJavaStoredProcedureParameter2_1.java
@@ -49,8 +49,8 @@ public class GenericJavaStoredProcedureParameter2_1
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.parameterAnnotation.getName());
this.setSpecifiedMode_(this.buildSpecifiedMode());
this.setTypeName_(this.parameterAnnotation.getTypeName());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmConverterType2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmConverterType2_1.java
index 2cc684b103..a404f6223e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmConverterType2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmConverterType2_1.java
@@ -34,8 +34,8 @@ public class GenericOrmConverterType2_1
}
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedAutoApply_(this.buildSpecifiedAutoApply());
this.setAutoApply(this.buildAutoApply());
}
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 7b103c0a3f..a2b5d12acd 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
@@ -54,8 +54,8 @@ public class GenericOrmNamedStoredProcedureQuery2_1
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setProcedureName_(this.xmlQuery.getProcedureName());
this.syncParameters();
this.syncResultClasses();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmStoredProcedureParameter2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmStoredProcedureParameter2_1.java
index 5ce42387ea..ba2dd3256a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmStoredProcedureParameter2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2_1/context/orm/GenericOrmStoredProcedureParameter2_1.java
@@ -50,8 +50,8 @@ public class GenericOrmStoredProcedureParameter2_1
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.xmlStoredProcedureParameter.getName());
this.setSpecifiedMode_(this.buildSpecifiedMode());
this.setTypeName_(this.xmlStoredProcedureParameter.getClassName());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
index badd6a1045..ea9fc4bee1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
@@ -324,9 +324,9 @@ public class EclipseLinkPersistenceUnit
}
@Override
- protected void syncImpliedMappingFileRef() {
- super.syncImpliedMappingFileRef();
- this.potentialImpliedEclipseLinkMappingFileRef.synchronizeWithResourceModel();
+ protected void syncImpliedMappingFileRef(IProgressMonitor monitor) {
+ super.syncImpliedMappingFileRef(monitor);
+ this.potentialImpliedEclipseLinkMappingFileRef.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMapping2_3.java
index 28c882e5b1..16d9169e95 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMapping2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMapping2_3.java
@@ -79,11 +79,11 @@ public class EclipseLinkJavaArrayMapping2_3
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.column.synchronizeWithResourceModel();
- this.syncConverter();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.column.synchronizeWithResourceModel(monitor);
+ this.syncConverter(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
@@ -155,7 +155,7 @@ public class EclipseLinkJavaArrayMapping2_3
return this.buildNullConverter();
}
- protected void syncConverter() {
+ protected void syncConverter(IProgressMonitor monitor) {
Association<JavaConverter.Adapter, Annotation> assoc = this.getConverterAnnotation();
if (assoc == null) {
if (this.converter.getConverterType() != null) {
@@ -166,7 +166,7 @@ public class EclipseLinkJavaArrayMapping2_3
Annotation annotation = assoc.getValue();
if ((this.converter.getConverterType() == adapter.getConverterType()) &&
(this.converter.getConverterAnnotation() == annotation)) {
- this.converter.synchronizeWithResourceModel();
+ this.converter.synchronizeWithResourceModel(monitor);
} else {
this.setConverter_(adapter.buildConverter(annotation, this, this.getJpaFactory()));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicCollectionMapping.java
index 0843fc67ee..daa51b51df 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicCollectionMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicCollectionMapping.java
@@ -36,9 +36,9 @@ public class EclipseLinkJavaBasicCollectionMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapMapping.java
index 8f453f61ac..9a602a16fb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapMapping.java
@@ -38,9 +38,9 @@ public class EclipseLinkJavaBasicMapMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapping.java
index 32e6d51f89..65a13d3dc4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapping.java
@@ -58,12 +58,12 @@ public class EclipseLinkJavaBasicMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.mutable.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
- this.generatorContainer.synchronizeWithResourceModel();
- this.syncGeneratedValue();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.mutable.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
+ this.generatorContainer.synchronizeWithResourceModel(monitor);
+ this.syncGeneratedValue(monitor);
}
@Override
@@ -186,7 +186,7 @@ public class EclipseLinkJavaBasicMapping
return this.getJpaFactory().buildJavaGeneratedValue(this, generatedValueAnnotation);
}
- protected void syncGeneratedValue() {
+ protected void syncGeneratedValue(IProgressMonitor monitor) {
GeneratedValueAnnotation annotation = this.getGeneratedValueAnnotation();
if (annotation == null) {
if (this.generatedValue != null) {
@@ -195,7 +195,7 @@ public class EclipseLinkJavaBasicMapping
}
else {
if ((this.generatedValue != null) && (this.generatedValue.getGeneratedValueAnnotation() == annotation)) {
- this.generatedValue.synchronizeWithResourceModel();
+ this.generatedValue.synchronizeWithResourceModel(monitor);
} else {
this.setGeneratedValue(this.buildGeneratedValue(annotation));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCachingImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCachingImpl.java
index 0ec513ec70..9e73e31bff 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCachingImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCachingImpl.java
@@ -92,8 +92,8 @@ public class EclipseLinkJavaCachingImpl
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
CacheAnnotation cacheAnnotation = this.getCacheAnnotation();
this.setSpecifiedType_(EclipseLinkCacheType.fromJavaResourceModel(cacheAnnotation.getType()));
@@ -106,13 +106,13 @@ public class EclipseLinkJavaCachingImpl
this.setSpecifiedCoordinationType_(EclipseLinkCacheCoordinationType.fromJavaResourceModel(cacheAnnotation.getCoordinationType()));
this.setExpiry_(cacheAnnotation.getExpiry());
- this.syncExpiryTimeOfDay(cacheAnnotation.getExpiryTimeOfDay());
+ this.syncExpiryTimeOfDay(cacheAnnotation.getExpiryTimeOfDay(), monitor);
ExistenceCheckingAnnotation ecAnnotation = this.getExistenceCheckingAnnotation();
this.setExistenceChecking_(ecAnnotation != null);
this.setSpecifiedExistenceType_(this.buildSpecifiedExistenceType(ecAnnotation));
- this.cacheable.synchronizeWithResourceModel();
+ this.cacheable.synchronizeWithResourceModel(monitor);
this.setSpecifiedIsolation_(EclipseLinkCacheIsolationType2_2.fromJavaResourceModel(cacheAnnotation.getIsolation()));
}
@@ -428,14 +428,14 @@ public class EclipseLinkJavaCachingImpl
this.firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, old, timeOfDay);
}
- protected void syncExpiryTimeOfDay(TimeOfDayAnnotation timeOfDayAnnotation) {
+ protected void syncExpiryTimeOfDay(TimeOfDayAnnotation timeOfDayAnnotation, IProgressMonitor monitor) {
if (timeOfDayAnnotation == null) {
if (this.expiryTimeOfDay != null) {
this.setExpiryTimeOfDay(null);
}
} else {
if ((this.expiryTimeOfDay != null) && (this.expiryTimeOfDay.getTimeOfDayAnnotation() == timeOfDayAnnotation)) {
- this.expiryTimeOfDay.synchronizeWithResourceModel();
+ this.expiryTimeOfDay.synchronizeWithResourceModel(monitor);
} else {
this.setExpiryTimeOfDay(this.buildExpiryTimeOfDay(timeOfDayAnnotation));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaChangeTracking.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaChangeTracking.java
index e948e64308..b63fd442ab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaChangeTracking.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaChangeTracking.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
@@ -36,8 +37,8 @@ public class EclipseLinkJavaChangeTracking
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedType_(this.buildSpecifiedType());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConversionValue.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConversionValue.java
index 79d56021bd..524833b5df 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConversionValue.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConversionValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
import java.util.List;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaContextModel;
@@ -40,8 +41,8 @@ public class EclipseLinkJavaConversionValue
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setDataValue_(this.conversionValueAnnotation.getDataValue());
this.setObjectValue_(this.conversionValueAnnotation.getObjectValue());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConvert.java
index c26358d487..5fbcdf040b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConvert.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConvert.java
@@ -49,8 +49,8 @@ public class EclipseLinkJavaConvert
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedConverterName_(this.convertAnnotation.getValue());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverter.java
index ccd41cae44..540f6e1210 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverter.java
@@ -56,8 +56,8 @@ public abstract class EclipseLinkJavaConverter<A extends NamedConverterAnnotatio
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.converterAnnotation.getName());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterClassConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterClassConverter.java
index 86eb7b7e4f..b79e2cbbd2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterClassConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterClassConverter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
import java.util.List;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.internal.utility.JavaProjectTools;
import org.eclipse.jpt.common.core.internal.utility.TypeTools;
import org.eclipse.jpt.common.core.utility.TextRange;
@@ -48,8 +49,8 @@ public abstract class EclipseLinkJavaConverterClassConverter<A extends NamedConv
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setConverterClass_(this.getAnnotationConverterClass());
}
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 46f8fe918e..71784bf53a 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
@@ -54,8 +54,8 @@ public class EclipseLinkJavaConverterContainerImpl
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncCustomConverters();
this.syncObjectTypeConverters();
this.syncStructConverters();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCustomizer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCustomizer.java
index 5d2ca28dba..5b62017ca8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCustomizer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaCustomizer.java
@@ -43,8 +43,8 @@ public class EclipseLinkJavaCustomizer
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedCustomizerClass_(this.buildSpecifiedCustomizerClass());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaElementCollectionMapping2_0.java
index b162e29174..0b5a86a03a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaElementCollectionMapping2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaElementCollectionMapping2_0.java
@@ -41,10 +41,10 @@ public class EclipseLinkJavaElementCollectionMapping2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.joinFetch.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.joinFetch.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableImpl.java
index 71d216e00d..c7c57a4d80 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddableImpl.java
@@ -56,11 +56,11 @@ public class EclipseLinkJavaEmbeddableImpl
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
- this.changeTracking.synchronizeWithResourceModel();
- this.customizer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
+ this.changeTracking.synchronizeWithResourceModel(monitor);
+ this.customizer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddedIdMapping.java
index 562a288ebd..163da4c3bc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddedIdMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddedIdMapping.java
@@ -35,9 +35,9 @@ public class EclipseLinkJavaEmbeddedIdMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddedMapping.java
index c87512146f..e745efd511 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddedMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEmbeddedMapping.java
@@ -32,9 +32,9 @@ public class EclipseLinkJavaEmbeddedMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEntityImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEntityImpl.java
index bb1a38bceb..303ebf67c8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEntityImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaEntityImpl.java
@@ -72,14 +72,14 @@ public class EclipseLinkJavaEntityImpl
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.caching.synchronizeWithResourceModel();
- this.readOnly.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
- this.changeTracking.synchronizeWithResourceModel();
- this.customizer.synchronizeWithResourceModel();
- this.multitenancy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.caching.synchronizeWithResourceModel(monitor);
+ this.readOnly.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
+ this.changeTracking.synchronizeWithResourceModel(monitor);
+ this.customizer.synchronizeWithResourceModel(monitor);
+ this.multitenancy.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaGeneratorContainer.java
index 1a4225b845..cd7e00eecd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaGeneratorContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaGeneratorContainer.java
@@ -33,9 +33,9 @@ public class EclipseLinkJavaGeneratorContainer
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.syncUuidGenerator();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.syncUuidGenerator(monitor);
}
@Override
@@ -90,7 +90,7 @@ public class EclipseLinkJavaGeneratorContainer
null;
}
- protected void syncUuidGenerator() {
+ protected void syncUuidGenerator(IProgressMonitor monitor) {
UuidGeneratorAnnotation2_4 annotation = this.getUuidGeneratorAnnotation();
if (annotation == null) {
if (this.uuidGenerator != null) {
@@ -98,7 +98,7 @@ public class EclipseLinkJavaGeneratorContainer
}
} else {
if ((this.uuidGenerator != null) && (this.uuidGenerator.getGeneratorAnnotation() == annotation)) {
- this.uuidGenerator.synchronizeWithResourceModel();
+ this.uuidGenerator.synchronizeWithResourceModel(monitor);
} else {
this.setUuidGenerator(this.buildUuidGenerator(annotation));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaIdMapping.java
index 85b21e89a0..7c9d30b98a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaIdMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaIdMapping.java
@@ -44,10 +44,10 @@ public class EclipseLinkJavaIdMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.mutable.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.mutable.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaJoinFetch.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaJoinFetch.java
index f5b8f900da..3284b0ec98 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaJoinFetch.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaJoinFetch.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
@@ -35,8 +36,8 @@ public class EclipseLinkJavaJoinFetch
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setValue_(this.buildValue());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMapping.java
index 1dbae2a5aa..e28964257c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToManyMapping.java
@@ -40,10 +40,10 @@ public class EclipseLinkJavaManyToManyMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.joinFetch.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.joinFetch.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMapping.java
index d816cc80cb..9edb3d2487 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaManyToOneMapping.java
@@ -40,10 +40,10 @@ public class EclipseLinkJavaManyToOneMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.joinFetch.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.joinFetch.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMappedSuperclassImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMappedSuperclassImpl.java
index ae68cf06a9..5b4663ea5c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMappedSuperclassImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMappedSuperclassImpl.java
@@ -80,15 +80,15 @@ public class EclipseLinkJavaMappedSuperclassImpl
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.caching.synchronizeWithResourceModel();
- this.readOnly.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
- this.changeTracking.synchronizeWithResourceModel();
- this.customizer.synchronizeWithResourceModel();
- this.generatorContainer.synchronizeWithResourceModel();
- this.multitenancy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.caching.synchronizeWithResourceModel(monitor);
+ this.readOnly.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
+ this.changeTracking.synchronizeWithResourceModel(monitor);
+ this.customizer.synchronizeWithResourceModel(monitor);
+ this.generatorContainer.synchronizeWithResourceModel(monitor);
+ this.multitenancy.synchronizeWithResourceModel(monitor);
}
@Override
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 be2680eafd..9cd31e6b0c 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
@@ -92,8 +92,8 @@ public class EclipseLinkJavaMultitenancyImpl2_3
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
MultitenantAnnotation2_3 multitenantAnnotation = this.getMultitenantAnnotation();
this.setSpecifiedType_(EclipseLinkMultitenantType2_3.fromJavaResourceModel(multitenantAnnotation.getValue()));
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMutable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMutable.java
index fcc8b6ea8f..fae7ca70ed 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMutable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMutable.java
@@ -39,8 +39,8 @@ public class EclipseLinkJavaMutable
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedMutable_(this.buildSpecifiedMutable());
}
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 683774e41e..5220c43a98 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
@@ -58,8 +58,8 @@ public class EclipseLinkJavaObjectTypeConverter
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setDataType_(this.converterAnnotation.getDataType());
this.setObjectType_(this.converterAnnotation.getObjectType());
this.syncConversionValues();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMapping.java
index b2daed86aa..6c15886611 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMapping.java
@@ -46,11 +46,11 @@ public class EclipseLinkJavaOneToManyMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.privateOwned.synchronizeWithResourceModel();
- this.joinFetch.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.privateOwned.synchronizeWithResourceModel(monitor);
+ this.joinFetch.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMapping.java
index 5f78d8e051..f715ee8f90 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMapping.java
@@ -43,11 +43,11 @@ public class EclipseLinkJavaOneToOneMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.privateOwned.synchronizeWithResourceModel();
- this.joinFetch.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.privateOwned.synchronizeWithResourceModel(monitor);
+ this.joinFetch.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaPrivateOwned.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaPrivateOwned.java
index d75050687b..606ae28c57 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaPrivateOwned.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaPrivateOwned.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
@@ -32,8 +33,8 @@ public class EclipseLinkJavaPrivateOwned
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setPrivateOwned_(this.buildPrivateOwned());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaReadOnly.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaReadOnly.java
index 903cca49ef..8abda9fab4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaReadOnly.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaReadOnly.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
@@ -34,8 +35,8 @@ public class EclipseLinkJavaReadOnly
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedReadOnly_(this.buildSpecifiedReadOnly());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java
index 641ab06535..512bc449d5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTenantDiscriminatorColumn2_3.java
@@ -50,8 +50,8 @@ public class EclipseLinkJavaTenantDiscriminatorColumn2_3
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedTableName_(this.buildSpecifiedTableName());
this.setSpecifiedContextProperty_(this.buildSpecifiedContextProperty());
this.setSpecifiedPrimaryKey_(this.buildSpecifiedPrimaryKey());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTimeOfDay.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTimeOfDay.java
index 10d16d0dfc..d6fb095258 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTimeOfDay.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTimeOfDay.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaContextModel;
import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTimeOfDay;
@@ -40,8 +41,8 @@ public class EclipseLinkJavaTimeOfDay
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setHour_(this.todAnnotation.getHour());
this.setMinute_(this.todAnnotation.getMinute());
this.setSecond_(this.todAnnotation.getSecond());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTransformationMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTransformationMapping.java
index 06da9f8c11..385f67b9c5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTransformationMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTransformationMapping.java
@@ -35,9 +35,9 @@ public class EclipseLinkJavaTransformationMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTypeConverter.java
index ec9d6a4e96..e866c7abf3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTypeConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTypeConverter.java
@@ -41,8 +41,8 @@ public class EclipseLinkJavaTypeConverter
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setDataType_(this.converterAnnotation.getDataType());
this.setObjectType_(this.converterAnnotation.getObjectType());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVariableOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVariableOneToOneMapping.java
index a106c8741c..f958ac80dd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVariableOneToOneMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVariableOneToOneMapping.java
@@ -35,9 +35,9 @@ public class EclipseLinkJavaVariableOneToOneMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMapping.java
index 0d8df962d9..964476b529 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVersionMapping.java
@@ -44,10 +44,10 @@ public class EclipseLinkJavaVersionMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.mutable.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.mutable.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
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 aa54d73bd5..5e97222172 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
@@ -60,8 +60,8 @@ public abstract class EclipseLinkAbstractOrmConverterContainer
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncCustomConverters();
this.syncObjectTypeConverters();
this.syncStructConverters();
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 a6afc7f9d9..8edfcc892e 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
@@ -89,9 +89,9 @@ public class EclipseLinkEntityMappingsImpl
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
this.syncSpecifiedTenantDiscriminatorColumns();
this.setSpecifiedGetMethod_(this.buildSpecifiedGetMethod());
this.setSpecifiedSetMethod_(this.buildSpecifiedSetMethod());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmArrayMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmArrayMapping2_3.java
index 28da9d1d8b..5170bf5e86 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmArrayMapping2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmArrayMapping2_3.java
@@ -82,11 +82,11 @@ public class EclipseLinkOrmArrayMapping2_3
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.column.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
- this.syncConverter();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.column.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
+ this.syncConverter(monitor);
}
@Override
@@ -175,7 +175,7 @@ public class EclipseLinkOrmArrayMapping2_3
return this.nullConverter;
}
- protected void syncConverter() {
+ protected void syncConverter(IProgressMonitor monitor) {
OrmConverter.Adapter adapter = this.getXmlConverterAdapter();
if (adapter == null) {
if (this.converter.getConverterType() != null) {
@@ -183,7 +183,7 @@ public class EclipseLinkOrmArrayMapping2_3
}
} else {
if (this.converter.getConverterType() == adapter.getConverterType()) {
- this.converter.synchronizeWithResourceModel();
+ this.converter.synchronizeWithResourceModel(monitor);
} else {
this.setConverter_(adapter.buildNewConverter(this, this.getContextModelFactory()));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMapping.java
index f0f69ae3f1..332763e463 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmBasicMapping.java
@@ -62,12 +62,12 @@ public class EclipseLinkOrmBasicMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.mutable.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
- this.generatorContainer.synchronizeWithResourceModel();
- this.syncGeneratedValue();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.mutable.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
+ this.generatorContainer.synchronizeWithResourceModel(monitor);
+ this.syncGeneratedValue(monitor);
}
@Override
@@ -180,7 +180,7 @@ public class EclipseLinkOrmBasicMapping
return this.getContextModelFactory().buildOrmGeneratedValue(this, xmlGeneratedValue);
}
- protected void syncGeneratedValue() {
+ protected void syncGeneratedValue(IProgressMonitor monitor) {
XmlGeneratedValue xmlGeneratedValue = this.xmlAttributeMapping.getGeneratedValue();
if (xmlGeneratedValue == null) {
if (this.generatedValue != null) {
@@ -188,7 +188,7 @@ public class EclipseLinkOrmBasicMapping
}
} else {
if ((this.generatedValue != null) && (this.generatedValue.getXmlGeneratedValue() == xmlGeneratedValue)) {
- this.generatedValue.synchronizeWithResourceModel();
+ this.generatedValue.synchronizeWithResourceModel(monitor);
} else {
this.setGeneratedValue(this.buildGeneratedValue(xmlGeneratedValue));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCachingImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCachingImpl.java
index 2514d84b19..fc06957aac 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCachingImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCachingImpl.java
@@ -102,8 +102,8 @@ public class EclipseLinkOrmCachingImpl
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedType_(this.buildSpecifiedType());
this.setSpecifiedSize_(this.buildSpecifiedSize());
@@ -115,11 +115,11 @@ public class EclipseLinkOrmCachingImpl
this.setSpecifiedCoordinationType_(this.buildSpecifiedCoordinationType());
this.setExpiry_(this.buildExpiry());
- this.syncExpiryTimeOfDay();
+ this.syncExpiryTimeOfDay(monitor);
this.setSpecifiedExistenceType_(this.buildSpecifiedExistenceType());
- this.cacheable.synchronizeWithResourceModel();
+ this.cacheable.synchronizeWithResourceModel(monitor);
this.setSpecifiedIsolation_(this.buildSpecifiedIsolation());
}
@@ -578,7 +578,7 @@ public class EclipseLinkOrmCachingImpl
this.firePropertyChanged(EXPIRY_TIME_OF_DAY_PROPERTY, old, timeOfDay);
}
- protected void syncExpiryTimeOfDay() {
+ protected void syncExpiryTimeOfDay(IProgressMonitor monitor) {
XmlTimeOfDay xmlTimeOfDay = this.getXmlExpiryTimeOfDay();
if (xmlTimeOfDay == null) {
if (this.expiryTimeOfDay != null) {
@@ -586,7 +586,7 @@ public class EclipseLinkOrmCachingImpl
}
} else {
if ((this.expiryTimeOfDay != null) && (this.expiryTimeOfDay.getXmlTimeOfDay() == xmlTimeOfDay)) {
- this.expiryTimeOfDay.synchronizeWithResourceModel();
+ this.expiryTimeOfDay.synchronizeWithResourceModel(monitor);
} else {
this.setExpiryTimeOfDay(this.buildExpiryTimeOfDay(xmlTimeOfDay));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmChangeTracking.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmChangeTracking.java
index f54e0e342b..c0bacf2612 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmChangeTracking.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmChangeTracking.java
@@ -38,8 +38,8 @@ public class EclipseLinkOrmChangeTracking
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedType_(this.buildSpecifiedType());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConversionValue.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConversionValue.java
index 1314c13907..2f0c12efdb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConversionValue.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConversionValue.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
import java.util.List;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextModel;
@@ -41,8 +42,8 @@ public class EclipseLinkOrmConversionValue
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setDataValue_(this.xmlConversionValue.getDataValue());
this.setObjectValue_(this.xmlConversionValue.getObjectValue());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java
index 7d6b36f5d5..2aa6665a55 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConvert.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,6 +10,7 @@
package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
import java.util.Arrays;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
import org.eclipse.jpt.jpa.core.context.Converter;
@@ -46,8 +47,8 @@ public class EclipseLinkOrmConvert
}
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedConverterName_(this.getXmlConvert() != null ? this.getXmlConvert().getConvert() : null);
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverter.java
index 66863c5770..bb1d325cce 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverter.java
@@ -46,8 +46,8 @@ public abstract class EclipseLinkOrmConverter<X extends XmlNamedConverter>
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setName_(this.xmlConverter.getName());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterClassConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterClassConverter.java
index 1fe7c02c0c..67445474b6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterClassConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmConverterClassConverter.java
@@ -47,8 +47,8 @@ public abstract class EclipseLinkOrmConverterClassConverter<X extends XmlNamedCo
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setConverterClass_(this.getXmlConverterClass());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomizer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomizer.java
index 525ad9f8a6..2cfa3378e9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomizer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmCustomizer.java
@@ -54,8 +54,8 @@ public class EclipseLinkOrmCustomizer
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedCustomizerClass_(this.buildSpecifiedCustomizerClass());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java
index 7514103cf2..6dfa0480f6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java
@@ -54,10 +54,10 @@ public class EclipseLinkOrmElementCollectionMapping2_0
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.joinFetch.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.joinFetch.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableImpl.java
index b621627289..1c3ccf049e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmEmbeddableImpl.java
@@ -63,11 +63,11 @@ public class EclipseLinkOrmEmbeddableImpl
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
- this.changeTracking.synchronizeWithResourceModel();
- this.customizer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
+ this.changeTracking.synchronizeWithResourceModel(monitor);
+ this.customizer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityImpl.java
index a56b821654..f75e56f90d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmEntityImpl.java
@@ -83,14 +83,14 @@ public class EclipseLinkOrmEntityImpl
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.caching.synchronizeWithResourceModel();
- this.readOnly.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
- this.changeTracking.synchronizeWithResourceModel();
- this.customizer.synchronizeWithResourceModel();
- this.multitenancy.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.caching.synchronizeWithResourceModel(monitor);
+ this.readOnly.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
+ this.changeTracking.synchronizeWithResourceModel(monitor);
+ this.customizer.synchronizeWithResourceModel(monitor);
+ this.multitenancy.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmGeneratorContainer.java
index c70795911e..f9818de92f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmGeneratorContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmGeneratorContainer.java
@@ -41,9 +41,9 @@ public class EclipseLinkOrmGeneratorContainer
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.syncUuidGenerator();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.syncUuidGenerator(monitor);
}
@Override
@@ -97,7 +97,7 @@ public class EclipseLinkOrmGeneratorContainer
return new EclipseLinkOrmUuidGeneratorImpl(this, xmlUuidGenerator);
}
- protected void syncUuidGenerator() {
+ protected void syncUuidGenerator(IProgressMonitor monitor) {
XmlUuidGenerator_2_4 xmlGenerator = this.getXmlUuidGenerator();
if (xmlGenerator == null) {
if (this.uuidGenerator != null) {
@@ -105,7 +105,7 @@ public class EclipseLinkOrmGeneratorContainer
}
} else {
if ((this.uuidGenerator != null) && (this.uuidGenerator.getXmlGenerator() == xmlGenerator)) {
- this.uuidGenerator.synchronizeWithResourceModel();
+ this.uuidGenerator.synchronizeWithResourceModel(monitor);
} else {
this.setUuidGenerator_(this.buildUuidGenerator(xmlGenerator));
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMapping.java
index af08cf3d00..4b9764c554 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmIdMapping.java
@@ -51,10 +51,10 @@ public class EclipseLinkOrmIdMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.mutable.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.mutable.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmJoinFetch.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmJoinFetch.java
index 90d3b84904..8b77431529 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmJoinFetch.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmJoinFetch.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextModel;
@@ -33,8 +34,8 @@ public class EclipseLinkOrmJoinFetch
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setValue_(this.buildValue());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMapping.java
index eface42580..a9d473c31a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToManyMapping.java
@@ -51,10 +51,10 @@ public class EclipseLinkOrmManyToManyMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.joinFetch.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.joinFetch.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMapping.java
index 76f6ff0437..4a35f8e6a2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmManyToOneMapping.java
@@ -37,9 +37,9 @@ public class EclipseLinkOrmManyToOneMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.joinFetch.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.joinFetch.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassImpl.java
index 21c09a8462..fdb8e07795 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMappedSuperclassImpl.java
@@ -87,16 +87,16 @@ public class EclipseLinkOrmMappedSuperclassImpl
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.caching.synchronizeWithResourceModel();
- this.readOnly.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
- this.changeTracking.synchronizeWithResourceModel();
- this.customizer.synchronizeWithResourceModel();
- this.multitenancy.synchronizeWithResourceModel();
- this.queryContainer.synchronizeWithResourceModel();
- this.generatorContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.caching.synchronizeWithResourceModel(monitor);
+ this.readOnly.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
+ this.changeTracking.synchronizeWithResourceModel(monitor);
+ this.customizer.synchronizeWithResourceModel(monitor);
+ this.multitenancy.synchronizeWithResourceModel(monitor);
+ this.queryContainer.synchronizeWithResourceModel(monitor);
+ this.generatorContainer.synchronizeWithResourceModel(monitor);
}
@Override
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 8c750d5534..335c95dfa8 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
@@ -94,8 +94,8 @@ public class EclipseLinkOrmMultitenancyImpl2_3
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedMultitenant_(isMultitenantElementSpecified());
this.setSpecifiedType_(this.buildSpecifiedType());
this.setSpecifiedIncludeCriteria_(this.buildSpecifiedIncludeCriteria());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMutable.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMutable.java
index 0eafca4ece..923b37b517 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMutable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMutable.java
@@ -35,8 +35,8 @@ public class EclipseLinkOrmMutable
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedMutable_(this.buildSpecifiedMutable());
}
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 4128e41c32..b397373788 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
@@ -64,8 +64,8 @@ public class EclipseLinkOrmObjectTypeConverter
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setDataType_(this.xmlConverter.getDataType());
this.setObjectType_(this.xmlConverter.getObjectType());
this.syncConversionValues();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMapping.java
index 19d8f58eb1..6c0accbcc6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToManyMapping.java
@@ -57,11 +57,11 @@ public class EclipseLinkOrmOneToManyMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.privateOwned.synchronizeWithResourceModel();
- this.joinFetch.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.privateOwned.synchronizeWithResourceModel(monitor);
+ this.joinFetch.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMapping.java
index ba2fcfeca0..d1f4244f1c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmOneToOneMapping.java
@@ -41,10 +41,10 @@ public class EclipseLinkOrmOneToOneMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.privateOwned.synchronizeWithResourceModel();
- this.joinFetch.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.privateOwned.synchronizeWithResourceModel(monitor);
+ this.joinFetch.synchronizeWithResourceModel(monitor);
}
@Override
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 953e0b5386..d7ecf9e0da 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
@@ -77,8 +77,8 @@ public class EclipseLinkOrmPersistenceUnitDefaults
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.syncTenantDiscriminatorColumns();
this.setSpecifiedGetMethod_(this.buildSpecifiedGetMethod());
this.setSpecifiedSetMethod_(this.buildSpecifiedSetMethod());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentAttribute.java
index b06a872819..ef0a332b1d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentAttribute.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute;
import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
import org.eclipse.jpt.jpa.core.internal.context.JpaValidator;
@@ -42,8 +43,8 @@ public class EclipseLinkOrmPersistentAttribute
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedGetMethod_(this.buildSpecifiedGetMethod());
this.setSpecifiedSetMethod_(this.buildSpecifiedSetMethod());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java
index 6abdf122a0..71661d4d3d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java
@@ -80,8 +80,8 @@ public class EclipseLinkOrmPersistentTypeImpl
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedGetMethod_(this.buildSpecifiedGetMethod());
this.setSpecifiedSetMethod_(this.buildSpecifiedSetMethod());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPrivateOwned.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPrivateOwned.java
index 6551e6a00e..9871cbbe65 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPrivateOwned.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPrivateOwned.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping;
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextModel;
@@ -32,8 +33,8 @@ public class EclipseLinkOrmPrivateOwned
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setPrivateOwned_(this.buildPrivateOwned());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmReadOnly.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmReadOnly.java
index f267f03369..021104cc81 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmReadOnly.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmReadOnly.java
@@ -35,8 +35,8 @@ public class EclipseLinkOrmReadOnly
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedReadOnly_(this.buildSpecifiedReadOnly());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java
index efc7c7b0af..aa1314e79e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTenantDiscriminatorColumn2_3.java
@@ -49,8 +49,8 @@ public class EclipseLinkOrmTenantDiscriminatorColumn2_3
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setSpecifiedTableName_(this.buildSpecifiedTableName());
this.setSpecifiedContextProperty_(this.buildSpecifiedContextProperty());
this.setSpecifiedPrimaryKey_(this.buildSpecifiedPrimaryKey());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTimeOfDay.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTimeOfDay.java
index 65f1da8b25..472f21d93c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTimeOfDay.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTimeOfDay.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -9,6 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextModel;
import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCaching;
@@ -40,8 +41,8 @@ public class EclipseLinkOrmTimeOfDay
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setHour_(this.xmlTimeOfDay.getHour());
this.setMinute_(this.xmlTimeOfDay.getMinute());
this.setSecond_(this.xmlTimeOfDay.getSecond());
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTypeConverter.java
index 714471a7ee..dcd8873cc2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTypeConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmTypeConverter.java
@@ -45,8 +45,8 @@ public class EclipseLinkOrmTypeConverter
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
this.setDataType_(this.xmlConverter.getDataType());
this.setObjectType_(this.xmlConverter.getObjectType());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMapping.java
index 742a6ec617..432571c34a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmVersionMapping.java
@@ -54,10 +54,10 @@ public class EclipseLinkOrmVersionMapping
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
- this.mutable.synchronizeWithResourceModel();
- this.converterContainer.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
+ this.mutable.synchronizeWithResourceModel(monitor);
+ this.converterContainer.synchronizeWithResourceModel(monitor);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkVirtualJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkVirtualJavaPersistentType.java
index 248c129130..0032bffe3f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkVirtualJavaPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkVirtualJavaPersistentType.java
@@ -66,8 +66,8 @@ public class EclipseLinkVirtualJavaPersistentType
// ********** synchronize/update **********
@Override
- public void synchronizeWithResourceModel() {
- super.synchronizeWithResourceModel();
+ public void synchronizeWithResourceModel(IProgressMonitor monitor) {
+ super.synchronizeWithResourceModel(monitor);
}
@Override

Back to the top