pr93253: lazytjp the default

2 files changed, 5 insertions, 2 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
index bbfb8faf9..84498d494 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/BuildArgParser.java
@@ -383,6 +383,7 @@ public class BuildArgParser extends Main {
         public void parseOption(String arg, LinkedList args) { // XXX use ListIterator.remove()
 			int nextArgIndex = args.indexOf(arg)+1; // XXX assumes unique
             // trim arg?
+			buildConfig.setXlazyTjp(true); // now default - MINOR could be pushed down and made default at a lower level
             if (LangUtil.isEmpty(arg)) {
                 showWarning("empty arg found");
             } else if (arg.equals("-inpath")) {;
@@ -523,7 +524,8 @@ public class BuildArgParser extends Main {
 			} else if (arg.equals("-XserializableAspects")) {
 				buildConfig.setXserializableAspects(true);
 			} else if (arg.equals("-XlazyTjp")) {
-				buildConfig.setXlazyTjp(true);
+				// do nothing as this is now on by default
+				showWarning("-XlazyTjp should no longer be used, build tjps lazily is now the default");
             } else if (arg.startsWith("-Xreweavable")) {
             	showWarning("-Xreweavable is on by default");
             	if (arg.endsWith(":compress")) {
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java
index bbbe9c58b..1565332d2 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/PerformanceTestCase.java
@@ -40,7 +40,8 @@ public class PerformanceTestCase extends CommandTestCase {
 		//   joinpoint method-execution(int LazyTjp.doit3(int)) because around advice is used [Xlint:canNotImplementLazyTjp]'
 		// into an error so that we can use checkCompiles() ability to check errors occur.
 		// Pass -proceedOnError to ensure even though we get that message, we still get the class file on disk
-		checkCompile("src1/LazyTjp.aj", new String[] {"-XlazyTjp","-Xlint:error","-proceedOnError"}, new int[] {96});
+		checkCompile("src1/LazyTjp.aj", new String[] {"-Xlint:error","-proceedOnError"}, new int[] {96});
 		TestUtil.runMain("out", "LazyTjp");
 	}
+	
 }