Configure weaver to behave in 1.5 way if Java compiler is configured that way in...

diff --git a/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java b/ajde/src/org/aspectj/ajde/internal/CompilerAdapter.java
index 1d2221bb8d756d8a87aecc960a81755740e2a814..8bb83599e2501ee326ad335d1a89ff5a6051d1d4 100644 (file)
--- 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)