diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java index d26628db0..0a4b1d10c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Execute.java +++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java @@ -307,11 +307,13 @@ public class Execute { try { return bos.toString("Cp1047"); } catch (java.io.UnsupportedEncodingException e) { + //noop default encoding used } } else if (Os.isFamily("os/400")) { try { return bos.toString("Cp500"); } catch (java.io.UnsupportedEncodingException e) { + //noop default encoding used } } return bos.toString(); @@ -1151,4 +1153,4 @@ public class Execute { } } -} +} \ No newline at end of file diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java index 7e8e8bde5..0cc8109e4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java @@ -104,7 +104,7 @@ public class ExecuteJava implements Runnable, TimeoutObserver { public void setSystemProperties(CommandlineJava.SysProperties s) { sysProperties = s; } - + /** * Permissions for the application run. * @since Ant 1.6 @@ -220,7 +220,7 @@ public class ExecuteJava implements Runnable, TimeoutObserver { public void run() { final Object[] argument = {javaCommand.getArguments()}; try { - if(perm != null) { + if (perm != null) { perm.setSecurityManager(); } main.invoke(null, argument); @@ -232,7 +232,7 @@ public class ExecuteJava implements Runnable, TimeoutObserver { } catch (Throwable t) { caught = t; } finally { - if(perm != null) { + if (perm != null) { perm.restoreSecurityManager(); } synchronized (this) { @@ -258,4 +258,4 @@ public class ExecuteJava implements Runnable, TimeoutObserver { public synchronized boolean killedProcess() { return timedOut; } -} +} \ No newline at end of file diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java index 0c55a9886..556088a1d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -311,7 +311,7 @@ public class ExecuteOn extends ExecTask { } if (!"file".equals(currentType)) { - String[] s = getDirs(base, ds);; + String[] s = getDirs(base, ds); for (int j = 0; j < s.length; j++) { totalDirs++; fileNames.addElement(s[j]); @@ -615,4 +615,4 @@ public class ExecuteOn extends ExecTask { return new String[] {"file", "dir", "both"}; } } -} +} \ No newline at end of file diff --git a/src/main/org/apache/tools/ant/taskdefs/Exit.java b/src/main/org/apache/tools/ant/taskdefs/Exit.java index 546623196..b85f80edd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Exit.java +++ b/src/main/org/apache/tools/ant/taskdefs/Exit.java @@ -98,6 +98,9 @@ public class Exit extends Task { unlessCondition = c; } + /** + * Exits the actual build. + */ public void execute() throws BuildException { if (testIfCondition() && testUnlessCondition()) { if (message != null && message.length() > 0) { @@ -110,6 +113,7 @@ public class Exit extends Task { /** * Set a multiline message. + * @param msg the message to display */ public void addText(String msg) { if (message == null) { @@ -133,4 +137,4 @@ public class Exit extends Task { return getProject().getProperty(unlessCondition) == null; } -} +} \ No newline at end of file diff --git a/src/main/org/apache/tools/ant/taskdefs/Input.java b/src/main/org/apache/tools/ant/taskdefs/Input.java index 9837af7f4..e6b61536f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Input.java +++ b/src/main/org/apache/tools/ant/taskdefs/Input.java @@ -121,6 +121,7 @@ public class Input extends Task { /** * Set a multiline message. + * @param msg The message to be displayed. */ public void addText(String msg) { message += getProject().replaceProperties(msg); @@ -133,8 +134,8 @@ public class Input extends Task { } /** - * Actual method executed by jakarta-ant. - * @exception BuildException + * Actual method executed by ant. + * @throws BuildException */ public void execute () throws BuildException { if (addproperty != null @@ -163,4 +164,4 @@ public class Input extends Task { } } -} +} \ No newline at end of file