diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java')
-rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java index bbe4f25943..a5749c1a3e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2013 Oracle. All rights reserved. + * Copyright (c) 2007, 2015 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,6 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; import org.eclipse.jpt.common.utility.iterable.ListIterable; @@ -58,10 +59,10 @@ public abstract class GenericJavaReferenceTable<P extends JpaContextModel, PA ex } @Override - public void update() { - super.update(); - this.updateModels(this.getSpecifiedJoinColumns()); - this.updateDefaultJoinColumn(); + public void update(IProgressMonitor monitor) { + super.update(monitor); + this.updateModels(this.getSpecifiedJoinColumns(), monitor); + this.updateDefaultJoinColumn(monitor); } @@ -185,12 +186,12 @@ public abstract class GenericJavaReferenceTable<P extends JpaContextModel, PA ex return (this.defaultJoinColumn == null) ? 0 : 1; } - protected void updateDefaultJoinColumn() { + protected void updateDefaultJoinColumn(IProgressMonitor monitor) { if (this.buildsDefaultJoinColumn()) { if (this.defaultJoinColumn == null) { this.setDefaultJoinColumn(this.buildJoinColumn(new NullJoinColumnAnnotation(this.getTableAnnotation()))); } else { - this.defaultJoinColumn.update(); + this.defaultJoinColumn.update(monitor); } } else { this.setDefaultJoinColumn(null); |