Let the bug floodgates open, reweavable is now default (pr91417)

7 files changed, 31 insertions, 38 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 929619c00..bbfb8faf9 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
@@ -525,10 +525,12 @@ public class BuildArgParser extends Main {
 			} else if (arg.equals("-XlazyTjp")) {
 				buildConfig.setXlazyTjp(true);
             } else if (arg.startsWith("-Xreweavable")) {
-            	buildConfig.setXreweavable(true);
+            	showWarning("-Xreweavable is on by default");
             	if (arg.endsWith(":compress")) {
-            		buildConfig.setXreweavableCompressClasses(true);
+            		showWarning("-Xreweavable:compress is no longer available - reweavable is now default");
             	}
+			} else if (arg.startsWith("-XnotReweavable")) {
+            	buildConfig.setXnotReweavable(true);
 			} else if (arg.equals("-XnoInline")) {
 				buildConfig.setXnoInline(true);
             } else if (arg.equals("-XhasMember")) {
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
index ce6874f42..9a9029e97 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
@@ -123,8 +123,10 @@ xoption.usage = {0} non-standard options:\n\
 \t-XnoInline          don't inline advice\n\
 \t-XlazyTjp           create thisJoinPoint objects lazily\n\
 \t-Xreweavable        create class files that can be subsequently rewoven\n\
-\t                    by AspectJ\n\
-\t-Xreweavable:compress as above, but also compress the reweaving information\n\
+\t                    by AspectJ. Deprecated, this is now on by default.\n\
+\t-Xreweavable:compress deprecated, reweavable is now default.\n\
+\t-XnotReweavable     create class files that can't be subsequently rewoven\n\
+\t                    by AspectJ.\n\
 \t-XserializableAspects allows aspects to implement serializable\n\
 \t-XnoWeave           compile classes but do not weave. Deprecated, use\n\
 \t                    reweavable instead.\n\
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java
index f5a8a4a9e..5f23ed8b5 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/core/AspectJCore.java
@@ -34,8 +34,7 @@ public class AspectJCore extends JavaCore {
 	public static final String COMPILER_SERIALIZABLE_ASPECTS = AjCompilerOptions.OPTION_XSerializableAspects;
 	public static final String COMPILER_LAZY_TJP             = AjCompilerOptions.OPTION_XLazyThisJoinPoint;
 	public static final String COMPILER_NO_ADVICE_INLINE     = AjCompilerOptions.OPTION_XNoInline;
-	public static final String COMPILER_REWEAVABLE           = AjCompilerOptions.OPTION_XReweavable;
-	public static final String COMPILER_REWEAVABLE_COMPRESS  = AjCompilerOptions.OPTION_XReweavableCompress;
+	public static final String COMPILER_NOT_REWEAVABLE       = AjCompilerOptions.OPTION_XNotReweavable;
 	
 	public AspectJCore() {
 		super();
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
index 6a0b0e228..5ef08ee2a 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
@@ -366,11 +366,8 @@ public class AjBuildConfig {
         if (!isXlazyTjp() && global.isXlazyTjp()) {
         	setXlazyTjp(true);
         }
-        if (!isXreweavable() && global.isXreweavable()) {
-        	setXreweavable(true);
-        }
-        if (!getXreweavableCompressClasses() && global.getXreweavableCompressClasses()) {
-        	setXreweavableCompressClasses(true);
+        if (!isXNotReweavable() && global.isXNotReweavable()) {
+        	setXnotReweavable(true);
         }
     }
 
@@ -473,8 +470,8 @@ public class AjBuildConfig {
 		options.xLazyThisJoinPoint = b;
 	}
 
-	public void setXreweavable(boolean b) {
-		options.xReweavable = b;
+	public void setXnotReweavable(boolean b) {
+		options.xNotReweavable = b;
 	}
 	
 	public void setXHasMemberSupport(boolean enabled) {
@@ -492,17 +489,10 @@ public class AjBuildConfig {
 	public boolean isXdevPinpoint() {
 		return options.xdevPinpoint;
 	}
-	
-	public boolean isXreweavable() {
-		return options.xReweavable;
-	}
-	
-	public void setXreweavableCompressClasses(boolean b) {
-		options.xReweavableCompress = b;
-	}
-	
-	public boolean getXreweavableCompressClasses() {
-		return options.xReweavableCompress;
+		
+
+	public boolean isXNotReweavable() {
+		return options.xNotReweavable;
 	}
 
 	public boolean isGenerateJavadocsInModelMode() {
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 2373f0456..bbcb8ea9b 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -612,8 +612,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider,IBinarySourc
 			}
 		}
 		
-		
-		bcelWeaver.setReweavableMode(buildConfig.isXreweavable(),buildConfig.getXreweavableCompressClasses());
+		bcelWeaver.setReweavableMode(buildConfig.isXNotReweavable());
 
 		//check for org.aspectj.runtime.JoinPoint
 		ResolvedType joinPoint = bcelWorld.resolve("org.aspectj.lang.JoinPoint");
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
index ce206580d..2e1196b3a 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
@@ -40,8 +40,7 @@ public class AjCompilerOptions extends CompilerOptions {
 	public static final String OPTION_XSerializableAspects    = "org.aspectj.ajdt.core.compiler.weaver.XSerializableAspects";
 	public static final String OPTION_XLazyThisJoinPoint      = "org.aspectj.ajdt.core.compiler.weaver.XLazyThisJoinPoint";
 	public static final String OPTION_XNoInline               = "org.aspectj.ajdt.core.compiler.weaver.XNoInline";
-	public static final String OPTION_XReweavable             = "org.aspectj.ajdt.core.compiler.weaver.XReweavable";
-	public static final String OPTION_XReweavableCompress     = "org.aspectj.ajdt.core.compiler.weaver.XReweavableCompress";
+	public static final String OPTION_XNotReweavable          = "org.aspectj.ajdt.core.compiler.weaver.XNotReweavable";
 	public static final String OPTION_XHasMember              = "org.aspectj.ajdt.core.compiler.weaver.XHasMember";
 	public static final String OPTION_XdevPinpoint            = "org.aspectj.ajdt.core.compiler.weaver.XdevPinpoint";
 	
@@ -66,8 +65,7 @@ public class AjCompilerOptions extends CompilerOptions {
 	public boolean xSerializableAspects = false;
 	public boolean xLazyThisJoinPoint = false;
 	public boolean xNoInline = false;
-	public boolean xReweavable = false;
-	public boolean xReweavableCompress = false;
+	public boolean xNotReweavable = false;
 	public boolean xHasMember = false;
 	public boolean xdevPinpoint = false;
 	public boolean showWeavingInformation = false;
@@ -121,8 +119,7 @@ public class AjCompilerOptions extends CompilerOptions {
 		map.put(OPTION_XSerializableAspects,this.xSerializableAspects ? ENABLED : DISABLED);
 		map.put(OPTION_XLazyThisJoinPoint,this.xLazyThisJoinPoint ? ENABLED : DISABLED);
 		map.put(OPTION_XNoInline,this.xNoInline ? ENABLED : DISABLED);
-		map.put(OPTION_XReweavable,this.xReweavable ? ENABLED : DISABLED);
-		map.put(OPTION_XReweavableCompress,this.xReweavableCompress ? ENABLED : DISABLED);
+		map.put(OPTION_XNotReweavable,this.xNotReweavable ? ENABLED : DISABLED);
 		map.put(OPTION_XHasMember, this.xHasMember ? ENABLED : DISABLED);
 		map.put(OPTION_XdevPinpoint, this.xdevPinpoint ? ENABLED : DISABLED);
 
@@ -178,13 +175,14 @@ public class AjCompilerOptions extends CompilerOptions {
 				this.xNoInline = false;
 			}
 		}
-		if ((optionValue = optionsMap.get(OPTION_XReweavable)) != null) {
+		if ((optionValue = optionsMap.get(OPTION_XNotReweavable)) != null) {
 			if (ENABLED.equals(optionValue)) {
-				this.xReweavable = true;
+				this.xNotReweavable = true;
 			} else if (DISABLED.equals(optionValue)) {
-				this.xReweavable = false;
+				this.xNotReweavable = false;
 			}
 		}
+		/*
 		if ((optionValue = optionsMap.get(OPTION_XReweavableCompress)) != null) {
 			if (ENABLED.equals(optionValue)) {
 				this.xReweavableCompress = true;
@@ -192,6 +190,10 @@ public class AjCompilerOptions extends CompilerOptions {
 				this.xReweavableCompress = false;
 			}
 		}
+*/
+		
+		
+		
 		if ((optionValue = optionsMap.get(OPTION_XHasMember)) != null) {
 			if (ENABLED.equals(optionValue)) {
 				this.xHasMember = true;
@@ -263,8 +265,7 @@ public class AjCompilerOptions extends CompilerOptions {
 		buf.append("\n\t- no inline (X option): ").append(this.xNoInline ? ENABLED : DISABLED); //$NON-NLS-1$
 		buf.append("\n\t- generate serializable aspects (X option): ").append(this.xSerializableAspects ? ENABLED : DISABLED); //$NON-NLS-1$
 		buf.append("\n\t- lazy thisJoinPoint (X option): ").append(this.xLazyThisJoinPoint ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- generate reweavable class files (X option): ").append(this.xReweavable ? ENABLED : DISABLED); //$NON-NLS-1$
-		buf.append("\n\t- compress reweavable class files (X option): ").append(this.xReweavableCompress ? ENABLED : DISABLED); //$NON-NLS-1$		
+		buf.append("\n\t- generate non-reweavable class files (X option): ").append(this.xNotReweavable ? ENABLED : DISABLED); //$NON-NLS-1$	
 		buf.append("\n\t- has member support (X option): ").append(this.xHasMember ? ENABLED : DISABLED); //$NON-NLS-1$
 
 		buf.append("\n\t- generate AJDE model: ").append(this.generateModel ? ENABLED : DISABLED); //$NON-NLS-1$		
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java
index c8b7b2e2f..8bfa9b9d6 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AspectJBuilder.java
@@ -162,7 +162,7 @@ public class AspectJBuilder extends JavaBuilder implements ICompilerAdapterFacto
 		myBcelWorld.setPinpointMode(options.xdevPinpoint);
 		setLintProperties(myBcelWorld,options);
 		myWeaver = new BcelWeaver(myBcelWorld);
-		myWeaver.setReweavableMode(options.xReweavable,options.xReweavableCompress);
+		myWeaver.setReweavableMode(options.xNotReweavable);
 		// TODO deal with injars, inpath, and aspectpath here...
 	}