235384 - update on classpath changes

1 files changed, 16 insertions, 1 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModelImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModelImpl.java
index edef877013..72a535074d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModelImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModelImpl.java
@@ -85,8 +85,11 @@ public class JavaResourceModelImpl
 	
 	private void synchWithJavaDelta(IJavaElementDelta delta) {
 		switch (delta.getElement().getElementType()) {
-			case IJavaElement.JAVA_MODEL :
 			case IJavaElement.JAVA_PROJECT :
+				if (this.updateOnClasspathChanges(delta)) {
+					break;
+				}
+			case IJavaElement.JAVA_MODEL :
 			case IJavaElement.PACKAGE_FRAGMENT_ROOT :
 			case IJavaElement.PACKAGE_FRAGMENT :
 				this.synchChildrenWithJavaDelta(delta);
@@ -123,6 +126,18 @@ public class JavaResourceModelImpl
 		}
 	}
 
+	//bug 235384 - we need to update all compilation units when a classpath change occurs.
+	//The persistence.jar could have been added/removed from the classpath which affects
+	//whether we know about the jpa annotations or not.
+	private boolean updateOnClasspathChanges(IJavaElementDelta delta) {
+		if (BitTools.flagIsSet(delta.getFlags(), IJavaElementDelta.F_RESOLVED_CLASSPATH_CHANGED) ||
+			BitTools.flagIsSet(delta.getFlags(), IJavaElementDelta.F_CLASSPATH_CHANGED)) {
+				this.jpaCompilationUnit.updateFromJava();
+				return true;
+		}
+		return false;
+	}
+
 	public void updateFromResource() {
 		this.jpaCompilationUnit.updateFromJava();
 	}