summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2005-04-07 10:03:59 +0000
committeraclement <aclement>2005-04-07 10:03:59 +0000
commitd3a9088bfc312ce744551b1e89831fde0a681bcb (patch)
tree66cb5d11d3d083c507b864b8aeb09bcf603ce2ed
parent883af3699cbeed252af34f8c8586379e5c192f53 (diff)
downloadaspectj-d3a9088bfc312ce744551b1e89831fde0a681bcb.tar.gz
aspectj-d3a9088bfc312ce744551b1e89831fde0a681bcb.zip
Configure weaver to behave in 1.5 way if Java compiler is configured that way in AJDT.
-rw-r--r--ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
index 1d2221bb8..8bb83599e 100644
--- a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
+++ b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
@@ -355,6 +355,14 @@ public class CompilerAdapter {
config.setIncrementalMode(true);
}
+ Map jom = options.getJavaOptionsMap();
+ if (jom!=null) {
+ String version = (String)jom.get(CompilerOptions.OPTION_Compliance);
+ if (version!=null && version.equals(CompilerOptions.VERSION_1_5)) {
+ config.setBehaveInJava5Way(true);
+ }
+ }
+
config.getOptions().set(optionsToSet);
String toAdd = options.getNonStandardOptions();
return LangUtil.isEmpty(toAdd)