diff options
| author | aclement <aclement> | 2006-08-08 13:50:57 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2006-08-08 13:50:57 +0000 |
| commit | 039be6888f9ec674a0bbb0f5fc37486f8565fece (patch) | |
| tree | a867ef7e3b451da5fa14a5977410b47f8f97fb93 /loadtime | |
| parent | a38edd39a8e998a22b41a0cf1928493aa0755e65 (diff) | |
| download | aspectj-039be6888f9ec674a0bbb0f5fc37486f8565fece.tar.gz aspectj-039be6888f9ec674a0bbb0f5fc37486f8565fece.zip | |
patches from 152161
Diffstat (limited to 'loadtime')
| -rw-r--r-- | loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java | 1 | ||||
| -rw-r--r-- | loadtime/src/org/aspectj/weaver/loadtime/Options.java | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java index 75775e5ea..47b9368c6 100644 --- a/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java +++ b/loadtime/src/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java @@ -251,6 +251,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor { world.setOptionalJoinpoints(weaverOption.optionalJoinpoints); world.setPinpointMode(weaverOption.pinpoint); weaver.setReweavableMode(weaverOption.notReWeavable); + world.performExtraConfiguration(weaverOption.xSet); world.setXnoInline(weaverOption.noInline); // AMC - autodetect as per line below, needed for AtAjLTWTests.testLTWUnweavable world.setBehaveInJava5Way(LangUtil.is15VMOrGreater()); diff --git a/loadtime/src/org/aspectj/weaver/loadtime/Options.java b/loadtime/src/org/aspectj/weaver/loadtime/Options.java index 0c1a99b54..67265343f 100644 --- a/loadtime/src/org/aspectj/weaver/loadtime/Options.java +++ b/loadtime/src/org/aspectj/weaver/loadtime/Options.java @@ -45,7 +45,7 @@ public class Options { private static final String OPTIONVALUED_Xlintfile = "-Xlintfile:"; private static final String OPTIONVALUED_Xlint = "-Xlint:"; private static final String OPTIONVALUED_joinpoints = "-Xjoinpoints:"; - + private static final String OPTIONVALUED_Xset = "-Xset:"; public static WeaverOption parse(String options, ClassLoader laoder, IMessageHandler imh) { WeaverOption weaverOption = new WeaverOption(imh); @@ -118,6 +118,10 @@ public class Options { if (arg.length() > OPTIONVALUED_Xlint.length()) { weaverOption.lint = arg.substring(OPTIONVALUED_Xlint.length()).trim(); } + } else if (arg.startsWith(OPTIONVALUED_Xset)) { + if (arg.length() > OPTIONVALUED_Xlint.length()) { + weaverOption.xSet = arg.substring(OPTIONVALUED_Xset.length()).trim(); + } } else { weaverOption.messageHandler.handleMessage( new Message( @@ -145,7 +149,7 @@ public class Options { } public static class WeaverOption { - boolean java5; + boolean java5; boolean lazyTjp; boolean hasMember; String optionalJoinpoints; @@ -160,6 +164,7 @@ public class Options { IMessageHandler messageHandler; String lint; String lintFile; + String xSet; public WeaverOption(IMessageHandler imh) { // messageHandler = new DefaultMessageHandler();//default |