diff options
| author | Jesse N. Glick <jglick@apache.org> | 2009-08-26 19:42:25 +0000 |
|---|---|---|
| committer | Jesse N. Glick <jglick@apache.org> | 2009-08-26 19:42:25 +0000 |
| commit | efd287b871106edf3efb9e1b96aeea16b85f0549 (patch) | |
| tree | e1659e393fb08708f619e1505c1dd5cab78a7d81 /src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java | |
| parent | 028ba47c8246f510012ef061d879d05240b90c71 (diff) | |
| download | ant-efd287b871106edf3efb9e1b96aeea16b85f0549.tar.gz | |
More cleanup of pre-1.4 code and docs.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@808163 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java')
| -rw-r--r-- | src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index c587f90be..c43204fa0 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -554,11 +554,7 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter { * @since Ant 1.5 */ protected boolean assumeJava12() { - return "javac1.2".equals(attributes.getCompilerVersion()) - || ("classic".equals(attributes.getCompilerVersion()) - && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2)) - || ("extJavac".equals(attributes.getCompilerVersion()) - && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2)); + return "javac1.2".equals(attributes.getCompilerVersion()); } /** @@ -567,13 +563,7 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter { * @since Ant 1.5 */ protected boolean assumeJava13() { - return "javac1.3".equals(attributes.getCompilerVersion()) - || ("classic".equals(attributes.getCompilerVersion()) - && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_3)) - || ("modern".equals(attributes.getCompilerVersion()) - && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_3)) - || ("extJavac".equals(attributes.getCompilerVersion()) - && JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_3)); + return "javac1.3".equals(attributes.getCompilerVersion()); } /** |