Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2016-01-04 19:34:03 +0000
committerBrian Vosburgh2016-01-04 19:34:03 +0000
commit23a1a420e7a2c0d5c5c4d20fc1b9a91da9dd6052 (patch)
tree71da4ab68368ac16d885bb99b04b2f3b9e0e3513 /jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core
parentc582b135623b25302aa21c299bca01e97cd44e1a (diff)
downloadwebtools.dali-23a1a420e7a2c0d5c5c4d20fc1b9a91da9dd6052.tar.gz
webtools.dali-23a1a420e7a2c0d5c5c4d20fc1b9a91da9dd6052.tar.xz
webtools.dali-23a1a420e7a2c0d5c5c4d20fc1b9a91da9dd6052.zip
clean up JpaContextModel.synchronizeWithResourceModel(...)
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core')
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterContainerImpl.java24
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkAbstractOrmConverterContainer.java24
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistenceUnitDefaults.java6
8 files changed, 45 insertions, 45 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterContainerImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterContainerImpl.java
index 71784bf53a..cb3d13112c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterContainerImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaConverterContainerImpl.java
@@ -56,10 +56,10 @@ public class EclipseLinkJavaConverterContainerImpl
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncCustomConverters();
- this.syncObjectTypeConverters();
- this.syncStructConverters();
- this.syncTypeConverters();
+ this.syncCustomConverters(monitor);
+ this.syncObjectTypeConverters(monitor);
+ this.syncStructConverters(monitor);
+ this.syncTypeConverters(monitor);
}
@Override
@@ -115,8 +115,8 @@ public class EclipseLinkJavaConverterContainerImpl
return new EclipseLinkJavaCustomConverter(this, converterAnnotation);
}
- protected void syncCustomConverters() {
- this.customConverterContainer.synchronizeWithResourceModel();
+ protected void syncCustomConverters(IProgressMonitor monitor) {
+ this.customConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<ConverterAnnotation> getCustomConverterAnnotations() {
@@ -193,8 +193,8 @@ public class EclipseLinkJavaConverterContainerImpl
return new EclipseLinkJavaObjectTypeConverter(this, converterAnnotation);
}
- protected void syncObjectTypeConverters() {
- this.objectTypeConverterContainer.synchronizeWithResourceModel();
+ protected void syncObjectTypeConverters(IProgressMonitor monitor) {
+ this.objectTypeConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<ObjectTypeConverterAnnotation> getObjectTypeConverterAnnotations() {
@@ -271,8 +271,8 @@ public class EclipseLinkJavaConverterContainerImpl
return new EclipseLinkJavaStructConverter(this, converterAnnotation);
}
- protected void syncStructConverters() {
- this.structConverterContainer.synchronizeWithResourceModel();
+ protected void syncStructConverters(IProgressMonitor monitor) {
+ this.structConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<StructConverterAnnotation> getStructConverterAnnotations() {
@@ -350,8 +350,8 @@ public class EclipseLinkJavaConverterContainerImpl
return new EclipseLinkJavaTypeConverter(this, converterAnnotation);
}
- protected void syncTypeConverters() {
- this.typeConverterContainer.synchronizeWithResourceModel();
+ protected void syncTypeConverters(IProgressMonitor monitor) {
+ this.typeConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<TypeConverterAnnotation> getTypeConverterAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java
index 9cd31e6b0c..afbc94b134 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaMultitenancyImpl2_3.java
@@ -98,7 +98,7 @@ public class EclipseLinkJavaMultitenancyImpl2_3
MultitenantAnnotation2_3 multitenantAnnotation = this.getMultitenantAnnotation();
this.setSpecifiedType_(EclipseLinkMultitenantType2_3.fromJavaResourceModel(multitenantAnnotation.getValue()));
this.setSpecifiedIncludeCriteria_(multitenantAnnotation.getIncludeCriteria());
- this.syncSpecifiedTenantDiscriminatorColumns();
+ this.syncSpecifiedTenantDiscriminatorColumns(monitor);
}
@Override
@@ -314,8 +314,8 @@ public class EclipseLinkJavaMultitenancyImpl2_3
return new EclipseLinkNullTenantDiscriminatorColumnAnnotation2_3(this.getJavaResourceType());
}
- protected void syncSpecifiedTenantDiscriminatorColumns() {
- this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel();
+ protected void syncSpecifiedTenantDiscriminatorColumns(IProgressMonitor monitor) {
+ this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel(monitor);
}
protected ContextListContainer<EclipseLinkJavaSpecifiedTenantDiscriminatorColumn2_3, TenantDiscriminatorColumnAnnotation2_3> buildSpecifiedTenantDiscriminatorColumnContainer() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java
index 5220c43a98..7b0909d303 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java
@@ -62,7 +62,7 @@ public class EclipseLinkJavaObjectTypeConverter
super.synchronizeWithResourceModel(monitor);
this.setDataType_(this.converterAnnotation.getDataType());
this.setObjectType_(this.converterAnnotation.getObjectType());
- this.syncConversionValues();
+ this.syncConversionValues(monitor);
this.setDefaultObjectValue_(this.converterAnnotation.getDefaultObjectValue());
}
@@ -178,8 +178,8 @@ public class EclipseLinkJavaObjectTypeConverter
return new EclipseLinkJavaConversionValue(this, conversionValueAnnotation);
}
- protected void syncConversionValues() {
- this.conversionValueContainer.synchronizeWithResourceModel();
+ protected void syncConversionValues(IProgressMonitor monitor) {
+ this.conversionValueContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<ConversionValueAnnotation> getConversionValueAnnotations() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkAbstractOrmConverterContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkAbstractOrmConverterContainer.java
index 5e97222172..f53c05f896 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkAbstractOrmConverterContainer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkAbstractOrmConverterContainer.java
@@ -62,10 +62,10 @@ public abstract class EclipseLinkAbstractOrmConverterContainer
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncCustomConverters();
- this.syncObjectTypeConverters();
- this.syncStructConverters();
- this.syncTypeConverters();
+ this.syncCustomConverters(monitor);
+ this.syncObjectTypeConverters(monitor);
+ this.syncStructConverters(monitor);
+ this.syncTypeConverters(monitor);
}
@Override
@@ -123,8 +123,8 @@ public abstract class EclipseLinkAbstractOrmConverterContainer
return new EclipseLinkOrmCustomConverter(this, xmlConverter);
}
- protected void syncCustomConverters() {
- this.customConverterContainer.synchronizeWithResourceModel();
+ protected void syncCustomConverters(IProgressMonitor monitor) {
+ this.customConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlConverter> getXmlCustomConverters() {
@@ -203,8 +203,8 @@ public abstract class EclipseLinkAbstractOrmConverterContainer
return new EclipseLinkOrmObjectTypeConverter(this, xmlConverter);
}
- protected void syncObjectTypeConverters() {
- this.objectTypeConverterContainer.synchronizeWithResourceModel();
+ protected void syncObjectTypeConverters(IProgressMonitor monitor) {
+ this.objectTypeConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlObjectTypeConverter> getXmlObjectTypeConverters() {
@@ -278,8 +278,8 @@ public abstract class EclipseLinkAbstractOrmConverterContainer
return new EclipseLinkOrmStructConverter(this, xmlConverter);
}
- protected void syncStructConverters() {
- this.structConverterContainer.synchronizeWithResourceModel();
+ protected void syncStructConverters(IProgressMonitor monitor) {
+ this.structConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlStructConverter> getXmlStructConverters() {
@@ -354,8 +354,8 @@ public abstract class EclipseLinkAbstractOrmConverterContainer
return new EclipseLinkOrmTypeConverter(this, xmlConverter);
}
- protected void syncTypeConverters() {
- this.typeConverterContainer.synchronizeWithResourceModel();
+ protected void syncTypeConverters(IProgressMonitor monitor) {
+ this.typeConverterContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlTypeConverter> getXmlTypeConverters() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
index 8edfcc892e..3c487151ae 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkEntityMappingsImpl.java
@@ -92,10 +92,10 @@ public class EclipseLinkEntityMappingsImpl
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
this.converterContainer.synchronizeWithResourceModel(monitor);
- this.syncSpecifiedTenantDiscriminatorColumns();
+ this.syncSpecifiedTenantDiscriminatorColumns(monitor);
this.setSpecifiedGetMethod_(this.buildSpecifiedGetMethod());
this.setSpecifiedSetMethod_(this.buildSpecifiedSetMethod());
- this.syncUuidGenerators();
+ this.syncUuidGenerators(monitor);
}
@Override
@@ -244,8 +244,8 @@ public class EclipseLinkEntityMappingsImpl
this.getXmlEntityMappings().getTenantDiscriminatorColumns().move(targetIndex, sourceIndex);
}
- protected void syncSpecifiedTenantDiscriminatorColumns() {
- this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel();
+ protected void syncSpecifiedTenantDiscriminatorColumns(IProgressMonitor monitor) {
+ this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlTenantDiscriminatorColumn> getXmlTenantDiscriminatorColumns() {
@@ -591,8 +591,8 @@ public class EclipseLinkEntityMappingsImpl
this.xmlEntityMappings.getSequenceGenerators().move(targetIndex, sourceIndex);
}
- protected void syncUuidGenerators() {
- this.uuidGeneratorContainer.synchronizeWithResourceModel();
+ protected void syncUuidGenerators(IProgressMonitor monitor) {
+ this.uuidGeneratorContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlUuidGenerator_2_4> getXmlUuidGenerators() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java
index 335c95dfa8..ba703df21e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java
@@ -99,7 +99,7 @@ public class EclipseLinkOrmMultitenancyImpl2_3
this.setSpecifiedMultitenant_(isMultitenantElementSpecified());
this.setSpecifiedType_(this.buildSpecifiedType());
this.setSpecifiedIncludeCriteria_(this.buildSpecifiedIncludeCriteria());
- this.syncSpecifiedTenantDiscriminatorColumns();
+ this.syncSpecifiedTenantDiscriminatorColumns(monitor);
}
@Override
@@ -335,8 +335,8 @@ public class EclipseLinkOrmMultitenancyImpl2_3
}
- protected void syncSpecifiedTenantDiscriminatorColumns() {
- this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel();
+ protected void syncSpecifiedTenantDiscriminatorColumns(IProgressMonitor monitor) {
+ this.specifiedTenantDiscriminatorColumnContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlTenantDiscriminatorColumn> getXmlTenantDiscriminatorColumns() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java
index b397373788..115bdf1c11 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java
@@ -68,7 +68,7 @@ public class EclipseLinkOrmObjectTypeConverter
super.synchronizeWithResourceModel(monitor);
this.setDataType_(this.xmlConverter.getDataType());
this.setObjectType_(this.xmlConverter.getObjectType());
- this.syncConversionValues();
+ this.syncConversionValues(monitor);
this.setDefaultObjectValue_(this.xmlConverter.getDefaultObjectValue());
}
@@ -223,8 +223,8 @@ public class EclipseLinkOrmObjectTypeConverter
return new EclipseLinkOrmConversionValue(this, xmlConversionValue);
}
- protected void syncConversionValues() {
- this.conversionValueContainer.synchronizeWithResourceModel();
+ protected void syncConversionValues(IProgressMonitor monitor) {
+ this.conversionValueContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlConversionValue> getXmlConversionValues() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistenceUnitDefaults.java
index d7ecf9e0da..bffe8a7bb4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistenceUnitDefaults.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistenceUnitDefaults.java
@@ -79,7 +79,7 @@ public class EclipseLinkOrmPersistenceUnitDefaults
@Override
public void synchronizeWithResourceModel(IProgressMonitor monitor) {
super.synchronizeWithResourceModel(monitor);
- this.syncTenantDiscriminatorColumns();
+ this.syncTenantDiscriminatorColumns(monitor);
this.setSpecifiedGetMethod_(this.buildSpecifiedGetMethod());
this.setSpecifiedSetMethod_(this.buildSpecifiedSetMethod());
}
@@ -138,8 +138,8 @@ public class EclipseLinkOrmPersistenceUnitDefaults
this.getXmlDefaults().getTenantDiscriminatorColumns().move(targetIndex, sourceIndex);
}
- protected void syncTenantDiscriminatorColumns() {
- this.tenantDiscriminatorColumnContainer.synchronizeWithResourceModel();
+ protected void syncTenantDiscriminatorColumns(IProgressMonitor monitor) {
+ this.tenantDiscriminatorColumnContainer.synchronizeWithResourceModel(monitor);
}
protected ListIterable<XmlTenantDiscriminatorColumn> getXmlTenantDiscriminatorColumns() {

Back to the top