From: aclement <aclement>
Date: Wed, 16 Jan 2008 23:42:45 +0000 (+0000)
Subject: AspectJ6: allow for 1.6 option
X-Git-Tag: V1_6_0M1~63
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dcc82aeb8a70b73a73fc21ba93c9ed1a35c638a6;p=aspectj.git

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 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);