From 6d9e7cb56e1c3e3ffeedabf92486c9ff25054c9c Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sun, 29 Jan 2012 19:58:16 +0000 Subject: [PATCH] another readablilty tweak git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1237442 13f79535-47bb-0310-9956-ffa450edef68 --- .../compilers/DefaultCompilerAdapter.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 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 dad66610a..88a74f775 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -338,16 +338,15 @@ public abstract class DefaultCompilerAdapter */ protected Commandline setupModernJavacCommandlineSwitches(Commandline cmd) { setupJavacCommandlineSwitches(cmd, true); - if (attributes.getSource() != null && !assumeJava13()) { - cmd.createArgument().setValue("-source"); - String source = attributes.getSource(); - cmd.createArgument().setValue(adjustSourceValue(source)); - } else if (!assumeJava13() && !assumeJava14() - && attributes.getTarget() != null) { - String t = attributes.getTarget(); - String s = adjustSourceValue(t); - if (mustSetSourceForTarget(t)) { - setImplicitSourceSwitch(cmd, t, s); + if (!assumeJava13()) { // -source added with JDK 1.4 + final String t = attributes.getTarget(); + if (attributes.getSource() != null) { + cmd.createArgument().setValue("-source"); + cmd.createArgument() + .setValue(adjustSourceValue(attributes.getSource())); + + } else if (t != null && mustSetSourceForTarget(t)) { + setImplicitSourceSwitch(cmd, t, adjustSourceValue(t)); } } return cmd; @@ -694,6 +693,9 @@ public abstract class DefaultCompilerAdapter * @param t the -target value, must not be null */ private boolean mustSetSourceForTarget(String t) { + if (assumeJava14()) { + return false; + } if (t.startsWith("1.")) { t = t.substring(2); }