From 12e6334bf5f77d7c3bc2e66eeefa105f0507334a Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Wed, 5 Oct 2005 12:23:52 +0000
Subject: Let the bug floodgates open, reweavable is now default (pr91417)

---
 .../org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java    | 2 +-
 loadtime/src/org/aspectj/weaver/loadtime/Options.java             | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'loadtime')

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
index 208c2b508..7e1d9f05a 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java
@@ -183,7 +183,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor {
         world.setXlazyTjp(weaverOption.lazyTjp);
         world.setXHasMemberSupportEnabled(weaverOption.hasMember);
         world.setPinpointMode(weaverOption.pinpoint);
-        weaver.setReweavableMode(weaverOption.reWeavable, false);
+        weaver.setReweavableMode(weaverOption.notReWeavable);
         world.setXnoInline(weaverOption.noInline);
         world.setBehaveInJava5Way(weaverOption.java5);//TODO should be autodetected ?
         //-Xlintfile: first so that lint wins
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/Options.java b/loadtime/src/org/aspectj/weaver/loadtime/Options.java
index 9c15c5711..705c585dd 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/Options.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/Options.java
@@ -35,7 +35,7 @@ public class Options {
     private final static String OPTION_noWarnNone = "-warn:none";
     private final static String OPTION_proceedOnError = "-proceedOnError";
     private final static String OPTION_verbose = "-verbose";
-    private final static String OPTION_reweavable = "-Xreweavable";
+    private final static String OPTION_notReweavable = "-XNotReweavable";
     private final static String OPTION_noinline = "-Xnoinline";
     private final static String OPTION_hasMember = "-XhasMember";
     private final static String OPTION_pinpoint = "-Xdev:pinpoint";
@@ -91,8 +91,8 @@ public class Options {
                 weaverOption.noWarn = true;
             } else if (arg.equalsIgnoreCase(OPTION_proceedOnError)) {
                 weaverOption.proceedOnError = true;
-            } else if (arg.equalsIgnoreCase(OPTION_reweavable)) {
-                weaverOption.reWeavable = true;
+            } else if (arg.equalsIgnoreCase(OPTION_notReweavable)) {
+                weaverOption.notReWeavable = true;
             } else if (arg.equalsIgnoreCase(OPTION_showWeaveInfo)) {
                 weaverOption.showWeaveInfo = true;
             } else if (arg.equalsIgnoreCase(OPTION_hasMember)) {
@@ -144,7 +144,7 @@ public class Options {
         boolean noWarn;
         boolean proceedOnError;
         boolean verbose;
-        boolean reWeavable;
+        boolean notReWeavable;
         boolean noInline;
         boolean showWeaveInfo;
         boolean pinpoint;
-- 
cgit v1.2.3