diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java')
| -rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmMultitenancyImpl2_3.java | 15 |
1 files changed, 8 insertions, 7 deletions
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 0272d03b9d..8c750d5534 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2013 Oracle. All rights reserved. + * Copyright (c) 2012, 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.common.utility.internal.iterable.EmptyListIterable; @@ -102,9 +103,9 @@ public class EclipseLinkOrmMultitenancyImpl2_3 } @Override - public void update() { - super.update(); - this.updateModels(this.getSpecifiedTenantDiscriminatorColumns()); + public void update(IProgressMonitor monitor) { + super.update(monitor); + this.updateModels(this.getSpecifiedTenantDiscriminatorColumns(), monitor); boolean xmlMultitenantNotSpecified = (this.getXmlMultitenant() == null); EclipseLinkJavaMultitenancy2_3 javaMultitenantPolicy = this.getJavaMultitenancyPolicyForDefaults(); @@ -115,7 +116,7 @@ public class EclipseLinkOrmMultitenancyImpl2_3 this.setDefaultType(useJavaValue ? javaMultitenantPolicy.getType() : this.buildDefaultType()); this.setDefaultIncludeCriteria(useJavaValue ? javaMultitenantPolicy.isIncludeCriteria() : this.buildDefaultIncludeCriteria()); this.setSpecifiedTenantDiscriminatorColumnsAllowed(this.buildSpecifiedTenantDiscriminatorColumnsAllowed()); - this.updateDefaultTenantDiscriminatorColumns(); + this.updateDefaultTenantDiscriminatorColumns(monitor); } @@ -401,8 +402,8 @@ public class EclipseLinkOrmMultitenancyImpl2_3 * tenant discriminator columns. * @see #getTenantDiscriminatorColumnsForDefaults() */ - protected void updateDefaultTenantDiscriminatorColumns() { - this.defaultTenantDiscriminatorColumnContainer.update(); + protected void updateDefaultTenantDiscriminatorColumns(IProgressMonitor monitor) { + this.defaultTenantDiscriminatorColumnContainer.update(monitor); } protected ListIterable<EclipseLinkTenantDiscriminatorColumn2_3> getTenantDiscriminatorColumnsForDefaults() { |