AspectJ6: allow for 1.6 option

diff --git a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java b/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
index 750b93f25cf5fcb0cf4b4bcad5e3b32f90d67525..d16d2eadf7c391a25fc70007c9ea176707bb997a 100644 (file)
--- a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
+++ b/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
@@ -273,7 +273,6 @@ public class AjdeCoreBuildManager {
         * @param config
         */
        private void configureCompilerOptions(AjBuildConfig config) {
-               checkNotAskedForJava6Compliance();
                
         String propcp = compiler.getCompilerConfiguration().getClasspath();
         if (!LangUtil.isEmpty(propcp)) {
@@ -318,7 +317,7 @@ public class AjdeCoreBuildManager {
                Map jom = compiler.getCompilerConfiguration().getJavaOptionsMap();
                if (jom!=null) {
                        String version = (String)jom.get(CompilerOptions.OPTION_Compliance);
-                       if (version!=null && version.equals(CompilerOptions.VERSION_1_5)) {
+                       if (version!=null && ( version.equals(CompilerOptions.VERSION_1_5) || version.equals(CompilerOptions.VERSION_1_6))) {
                                config.setBehaveInJava5Way(true);
                        }
                        config.getOptions().set(jom);