Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortle2012-02-28 17:29:25 +0000
committertle2012-02-28 17:29:25 +0000
commit85cf7a388aa7f7f9c5cd3c035e59e085ae1bd0ef (patch)
tree89bd465460115ef31f20421dd6515a1bdacca35b
parentf5db5af04de6b77fdd37ad18d748a5b2d5540643 (diff)
downloadwebtools.dali-85cf7a388aa7f7f9c5cd3c035e59e085ae1bd0ef.tar.gz
webtools.dali-85cf7a388aa7f7f9c5cd3c035e59e085ae1bd0ef.tar.xz
webtools.dali-85cf7a388aa7f7f9c5cd3c035e59e085ae1bd0ef.zip
370895 - Static weaving results in infinite builder loop when enabled
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/gen/AbstractJptGenerator.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/weave/StaticWeave.java6
2 files changed, 12 insertions, 2 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/gen/AbstractJptGenerator.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/gen/AbstractJptGenerator.java
index e6b352d550..a5f75fa8ae 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/gen/AbstractJptGenerator.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/gen/AbstractJptGenerator.java
@@ -134,19 +134,23 @@ public abstract class AbstractJptGenerator
}
protected abstract void preGenerate(IProgressMonitor monitor);
-
+
protected void postGenerate() {
try {
if( ! this.isDebug) {
this.removeLaunchConfiguration();
}
- this.getProject().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ this.refreshProject();
}
catch(CoreException e) {
throw new RuntimeException(e);
}
}
+ protected void refreshProject() throws CoreException {
+ this.getProject().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
+ }
+
private ILaunchesListener2 buildLaunchListener() {
return new ILaunchesListener2() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/weave/StaticWeave.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/weave/StaticWeave.java
index 718022ea59..84f9531c63 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/weave/StaticWeave.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/weave/StaticWeave.java
@@ -98,6 +98,12 @@ public class StaticWeave extends AbstractJptGenerator
// do nothing
}
+ @Override
+ protected void refreshProject() throws CoreException {
+ // do nothing
+ // 370895 - Static weaving results in infinite builder loop when enabled
+ }
+
// ********** behavior **********
@Override

Back to the top