diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context')
71 files changed, 274 insertions, 261 deletions
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 |