Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2015-12-23 13:06:35 -0500
committerBrian Vosburgh2015-12-23 13:06:35 -0500
commitc7a8134e9bc01bc61fb9bc4290342cab4b1346b1 (patch)
treecbd543fcbe00c5af05467fec9b52bcf123148962
parent1d6126f4b364a7e6529a79c131f624a6e38805a0 (diff)
downloadwebtools.dali-c7a8134e9bc01bc61fb9bc4290342cab4b1346b1.tar.gz
webtools.dali-c7a8134e9bc01bc61fb9bc4290342cab4b1346b1.tar.xz
webtools.dali-c7a8134e9bc01bc61fb9bc4290342cab4b1346b1.zip
tweak AbstractJpaProject.update(...)
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
index 9dbe47adda..0054a07ee2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
@@ -1989,16 +1989,21 @@ public abstract class AbstractJpaProject
/**
* Called by the {@link UpdateJobCommand#execute(IProgressMonitor)}.
*/
- // TODO pass the monitor down
protected IStatus update(IProgressMonitor monitor) {
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
}
+
this.contextRoot.update(monitor);
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
}
+
this.updateRootStructureNodes(monitor);
+ if (monitor.isCanceled()) {
+ return Status.CANCEL_STATUS;
+ }
+
return Status.OK_STATUS;
}

Back to the top