From b20b41c2dbe41b189b4bd78fbe460b2be1c8fc02 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Wed, 26 May 2010 00:16:12 +0000
Subject: [PATCH] 309710: unnecessary full builds

---
 .../ajdt/internal/core/builder/AjState.java   | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
index e0b101eab..f1869c306 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjState.java
@@ -513,12 +513,14 @@ public class AjState implements CompilerConfigurationChangeFlags {
 				if (state.isAspect(classFile)) {
 					if (state.hasStructuralChangedSince(classFile, lastSuccessfulBuildTime) || isTypeWeReferTo(classFile)) {
 						// further improvements possible
-						if (listenerDefined()) {
-							getListener().recordDecision(
-									"ClassFileChangeChecking: aspect found that has structurally changed or that this project depends upon : "
-											+ classFile);
+						if (pathid != PATHID_CLASSPATH) {
+							if (listenerDefined()) {
+								getListener().recordDecision(
+										"ClassFileChangeChecking: aspect found that has structurally changed or that this project depends upon : "
+												+ classFile);
+							}
+							return CLASS_FILE_CHANGED_THAT_NEEDS_FULL_BUILD;
 						}
-						return CLASS_FILE_CHANGED_THAT_NEEDS_FULL_BUILD;
 					} else {
 						// it is an aspect but we don't refer to it:
 						// - for CLASSPATH I think this is OK, we can continue and try an
@@ -564,12 +566,14 @@ public class AjState implements CompilerConfigurationChangeFlags {
 						if (state.isAspect(classFile)) {
 							if (state.hasStructuralChangedSince(classFile, lastSuccessfulBuildTime) || isTypeWeReferTo(classFile)) {
 								// further improvements possible
-								if (listenerDefined()) {
-									getListener().recordDecision(
-											"ClassFileChangeChecking: aspect found that has structurally changed or that this project depends upon : "
-													+ classFile);
+								if (pathid != PATHID_CLASSPATH) {
+									if (listenerDefined()) {
+										getListener().recordDecision(
+												"ClassFileChangeChecking: aspect found that has structurally changed or that this project depends upon : "
+														+ classFile);
+									}
+									return CLASS_FILE_CHANGED_THAT_NEEDS_FULL_BUILD;
 								}
-								return CLASS_FILE_CHANGED_THAT_NEEDS_FULL_BUILD;
 							} else {
 								// it is an aspect but we don't refer to it:
 								// - for CLASSPATH I think this is OK, we can continue and try an
@@ -2057,10 +2061,10 @@ public class AjState implements CompilerConfigurationChangeFlags {
 	}
 
 	public void write(CompressingDataOutputStream dos) throws IOException {
+		// model
 		// weaver
 		weaver.write(dos);
 		// world
-		// model
 		// local state
 	}
 }
-- 
2.39.5