diff options
| author | aclement <aclement> | 2008-01-16 23:42:45 +0000 |
|---|---|---|
| committer | aclement <aclement> | 2008-01-16 23:42:45 +0000 |
| commit | dcc82aeb8a70b73a73fc21ba93c9ed1a35c638a6 (patch) | |
| tree | 9cfc0156a7f59f9b92b9e777d4ee5af6559dbe48 /ajde.core | |
| parent | b50c23b0a214e315791677a5bfef990db271ecd9 (diff) | |
| download | aspectj-dcc82aeb8a70b73a73fc21ba93c9ed1a35c638a6.tar.gz aspectj-dcc82aeb8a70b73a73fc21ba93c9ed1a35c638a6.zip | |
AspectJ6: allow for 1.6 option
Diffstat (limited to 'ajde.core')
| -rw-r--r-- | ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java | 3 |
1 files changed, 1 insertions, 2 deletions
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 750b93f25..d16d2eadf 100644 --- 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); |