From 80080d456c543d039426db35bcf35d90694bbd96 Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Mon, 15 Apr 2002 15:33:11 +0000 Subject: [PATCH] Reduce a small number of long lines git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272443 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tools/ant/ProjectHelper.java | 15 ++++++---- .../apache/tools/ant/listener/MailLogger.java | 3 +- .../tools/ant/taskdefs/AbstractCvsTask.java | 17 ++++++----- .../org/apache/tools/ant/taskdefs/Ant.java | 3 +- .../apache/tools/ant/taskdefs/Available.java | 6 ++-- .../apache/tools/ant/taskdefs/Checksum.java | 15 +++++----- .../org/apache/tools/ant/taskdefs/Chmod.java | 12 +++++--- .../tools/ant/taskdefs/ConditionTask.java | 6 ++-- .../org/apache/tools/ant/taskdefs/Copy.java | 3 +- .../org/apache/tools/ant/taskdefs/Cvs.java | 6 ++-- .../org/apache/tools/ant/taskdefs/Delete.java | 6 ++-- .../apache/tools/ant/taskdefs/DependSet.java | 21 +++++++------- .../org/apache/tools/ant/taskdefs/Echo.java | 3 +- .../org/apache/tools/ant/taskdefs/Exec.java | 15 ++++++---- .../apache/tools/ant/taskdefs/Execute.java | 28 ++++++++++++------- .../tools/ant/taskdefs/ExecuteJava.java | 3 +- .../apache/tools/ant/taskdefs/ExecuteOn.java | 14 +++++----- .../tools/ant/taskdefs/ExecuteWatchdog.java | 26 +++++++++-------- .../org/apache/tools/ant/taskdefs/Filter.java | 3 +- .../org/apache/tools/ant/taskdefs/Jar.java | 10 ++++--- .../org/apache/tools/ant/taskdefs/Java.java | 3 +- .../org/apache/tools/ant/taskdefs/Javac.java | 3 +- .../apache/tools/ant/taskdefs/Javadoc.java | 9 ++++-- .../org/apache/tools/ant/taskdefs/Jikes.java | 9 ++++-- .../tools/ant/taskdefs/JikesOutputParser.java | 6 ++-- .../tools/ant/taskdefs/MatchingTask.java | 6 ++-- .../org/apache/tools/ant/taskdefs/Move.java | 3 +- .../apache/tools/ant/taskdefs/Replace.java | 3 +- .../apache/tools/ant/taskdefs/SignJar.java | 6 ++-- .../org/apache/tools/ant/taskdefs/Tar.java | 4 +-- .../org/apache/tools/ant/taskdefs/Tstamp.java | 3 +- .../apache/tools/ant/taskdefs/UpToDate.java | 6 ++-- .../org/apache/tools/ant/taskdefs/Zip.java | 4 +-- .../taskdefs/compilers/CompilerAdapter.java | 3 +- .../compilers/CompilerAdapterFactory.java | 6 ++-- .../compilers/DefaultCompilerAdapter.java | 6 ++-- .../tools/ant/taskdefs/compilers/Javac12.java | 3 +- .../tools/ant/taskdefs/compilers/Javac13.java | 3 +- .../tools/ant/taskdefs/compilers/Jikes.java | 3 +- .../tools/ant/taskdefs/compilers/Jvc.java | 3 +- .../ant/taskdefs/cvslib/ChangeLogParser.java | 6 ++-- .../ant/taskdefs/cvslib/ChangeLogWriter.java | 21 +++++++++----- .../tools/ant/taskdefs/cvslib/CvsTagDiff.java | 3 +- .../cvslib/RedirectingStreamHandler.java | 3 +- 44 files changed, 210 insertions(+), 130 deletions(-) diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java index 4ab0a46ee..493355968 100644 --- a/src/main/org/apache/tools/ant/ProjectHelper.java +++ b/src/main/org/apache/tools/ant/ProjectHelper.java @@ -185,12 +185,13 @@ public class ProjectHelper { if (is != null) { // This code is needed by EBCDIC and other strange systems. // It's a fix for bugs reported in xerces - BufferedReader rd; + InputStreamReader isr; try { - rd = new BufferedReader(new InputStreamReader(is, "UTF-8")); + isr = new InputStreamReader(is, "UTF-8"); } catch (java.io.UnsupportedEncodingException e) { - rd = new BufferedReader(new InputStreamReader(is)); + isr = new InputStreamReader(is); } + BufferedReader rd = new BufferedReader(isr); String helperClassName = rd.readLine(); rd.close(); @@ -435,8 +436,9 @@ public class ProjectHelper { project.log("Property ${" + propertyName + "} has not been set", Project.MSG_VERBOSE); } - fragment = (keys.containsKey(propertyName)) ? (String) keys.get(propertyName) - : "${" + propertyName + "}"; + fragment = (keys.containsKey(propertyName)) + ? (String) keys.get(propertyName) + : "${" + propertyName + "}"; } sb.append(fragment); } @@ -461,7 +463,8 @@ public class ProjectHelper { * ${ without a closing * } */ - public static void parsePropertyString(String value, Vector fragments, Vector propertyRefs) + public static void parsePropertyString(String value, Vector fragments, + Vector propertyRefs) throws BuildException { int prev = 0; int pos; diff --git a/src/main/org/apache/tools/ant/listener/MailLogger.java b/src/main/org/apache/tools/ant/listener/MailLogger.java index 0a9d3fb21..0c9ade8a1 100644 --- a/src/main/org/apache/tools/ant/listener/MailLogger.java +++ b/src/main/org/apache/tools/ant/listener/MailLogger.java @@ -94,7 +94,8 @@ import org.apache.tools.mail.MailMessage; * MailLogger.properties.file property . Any properties defined in that * file will override Ant properties. * - * @author Erik Hatcher ehatcher@apache.org + * @author Erik Hatcher + * ehatcher@apache.org */ public class MailLogger extends DefaultLogger { /** Buffer in which the message is constructed prior to sending */ diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java index 16723e6fb..943967766 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java @@ -77,8 +77,10 @@ import org.apache.tools.ant.util.StringUtils; * * @author costin@dnt.ro * @author stefano@apache.org - * @author Wolfgang Werner wwerner@picturesafe.de - * @author Kevin Ross kevin.ross@bredex.com + * @author Wolfgang Werner + * wwerner@picturesafe.de + * @author Kevin Ross + * kevin.ross@bredex.com * * @since Ant 1.5 */ @@ -180,8 +182,8 @@ public abstract class AbstractCvsTask extends Task { super(); } - public void setExecuteStreamHandler(ExecuteStreamHandler executeStreamHandler){ - this.executeStreamHandler = executeStreamHandler; + public void setExecuteStreamHandler(ExecuteStreamHandler handler){ + this.executeStreamHandler = handler; } protected ExecuteStreamHandler getExecuteStreamHandler(){ @@ -278,7 +280,8 @@ public abstract class AbstractCvsTask extends Task { * with a pass file. if(passFile == null){ - File defaultPassFile = new File(System.getProperty("user.home") + File.separatorChar + ".cvspass"); + File defaultPassFile = new File(System.getProperty("user.home") + + File.separatorChar + ".cvspass"); if(defaultPassFile.exists()) this.setPassfile(defaultPassFile); @@ -353,10 +356,6 @@ public abstract class AbstractCvsTask extends Task { log("Caught exception: " + e.getMessage(), Project.MSG_WARN); } } finally { - // - // condition used to be if(output == null) outputStream.close(). This is - // not appropriate. Check if the stream itself is not null, then close(). - // if (outputStream != null) { try { outputStream.close(); diff --git a/src/main/org/apache/tools/ant/taskdefs/Ant.java b/src/main/org/apache/tools/ant/taskdefs/Ant.java index e0157254c..b608996ff 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Ant.java +++ b/src/main/org/apache/tools/ant/taskdefs/Ant.java @@ -348,7 +348,8 @@ public class Ant extends Task { getOwningTarget() != null && target.equals(this.getOwningTarget().getName())) { - throw new BuildException("ant task calling its own parent target"); + throw new BuildException("ant task calling its own parent " + + "target"); } newProject.executeTarget(target); diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java index 1e71e312f..3da8b8d92 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Available.java +++ b/src/main/org/apache/tools/ant/taskdefs/Available.java @@ -68,9 +68,11 @@ import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.StringUtils; /** - * Will set the given property if the requested resource is available at runtime. + * Will set the given property if the requested resource is available at + * runtime. * - * @author Stefano Mazzocchi stefano@apache.org + * @author Stefano Mazzocchi + * stefano@apache.org * @author Magesh Umasankar * * @since Ant 1.1 diff --git a/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/src/main/org/apache/tools/ant/taskdefs/Checksum.java index 67074aa99..c34924e0e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Checksum.java +++ b/src/main/org/apache/tools/ant/taskdefs/Checksum.java @@ -244,13 +244,13 @@ public class Checksum extends MatchingTask implements Condition { if (file != null) { if (filesets.size() > 0) { - throw new BuildException( - "Multiple files cannot be used when Property is specified"); + throw new BuildException("Multiple files cannot be used " + + "when Property is specified"); } } else { if (filesets.size() > 1) { - throw new BuildException( - "Multiple files cannot be used when Property is specified"); + throw new BuildException("Multiple files cannot be used " + + "when Property is specified"); } } } @@ -265,8 +265,8 @@ public class Checksum extends MatchingTask implements Condition { } if (isCondition && forceOverwrite) { - throw new BuildException( - "ForceOverwrite cannot be used when conditions are being used."); + throw new BuildException("ForceOverwrite cannot be used when " + + "conditions are being used."); } messageDigest = null; @@ -327,7 +327,8 @@ public class Checksum extends MatchingTask implements Condition { if (file != null) { if (file.exists()) { if (property == null) { - File dest = new File(file.getParent(), file.getName() + fileext); + File dest + = new File(file.getParent(), file.getName() + fileext); if (forceOverwrite || isCondition || (file.lastModified() > dest.lastModified())) { includeFileMap.put(file, dest); diff --git a/src/main/org/apache/tools/ant/taskdefs/Chmod.java b/src/main/org/apache/tools/ant/taskdefs/Chmod.java index 33e901ae4..59f035e52 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Chmod.java +++ b/src/main/org/apache/tools/ant/taskdefs/Chmod.java @@ -68,7 +68,8 @@ import org.apache.tools.ant.types.PatternSet; * Chmod equivalent for unix-like environments. * * @author costin@eng.sun.com - * @author Mariusz Nowostawski (Marni) mnowostawski@infoscience.otago.ac.nz + * @author Mariusz Nowostawski (Marni) + * mnowostawski@infoscience.otago.ac.nz * @author Stefan Bodewig * * @since Ant 1.1 @@ -216,15 +217,18 @@ public class Chmod extends ExecuteOn { public void setExecutable(String e) { - throw new BuildException(taskType + " doesn\'t support the executable attribute", location); + throw new BuildException(taskType + + " doesn\'t support the executable attribute", location); } public void setCommand(Commandline cmdl) { - throw new BuildException(taskType + " doesn\'t support the command attribute", location); + throw new BuildException(taskType + + " doesn\'t support the command attribute", location); } public void setSkipEmptyFilesets(boolean skip) { - throw new BuildException(taskType + " doesn\'t support the skipemptyfileset attribute", location); + throw new BuildException(taskType + + " doesn\'t support the skipemptyfileset attribute", location); } protected boolean isValidOs() { diff --git a/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java b/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java index 3d2c04ac6..8cc405009 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java @@ -101,10 +101,12 @@ public class ConditionTask extends ConditionBase { */ public void execute() throws BuildException { if (countConditions() > 1) { - throw new BuildException("You must not nest more than one condition into "); + throw new BuildException("You must not nest more than one " + + "condition into "); } if (countConditions() < 1) { - throw new BuildException("You must nest a condition into "); + throw new BuildException("You must nest a condition into " + + ""); } if (property == null) { throw new BuildException("The property attribute is required."); diff --git a/src/main/org/apache/tools/ant/taskdefs/Copy.java b/src/main/org/apache/tools/ant/taskdefs/Copy.java index be905d0e1..8f8129b69 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Copy.java +++ b/src/main/org/apache/tools/ant/taskdefs/Copy.java @@ -85,7 +85,8 @@ import java.util.Enumeration; * document, the following mailing list discussions, and the * copyfile/copydir tasks.

* - * @author Glenn McAllister glennm@ca.ibm.com + * @author Glenn McAllister + * glennm@ca.ibm.com * @author Stefan Bodewig * @author Michael McCallum * @author Magesh Umasankar diff --git a/src/main/org/apache/tools/ant/taskdefs/Cvs.java b/src/main/org/apache/tools/ant/taskdefs/Cvs.java index b0eb86190..46b5587c2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Cvs.java +++ b/src/main/org/apache/tools/ant/taskdefs/Cvs.java @@ -63,8 +63,10 @@ package org.apache.tools.ant.taskdefs; * * @author costin@dnt.ro * @author stefano@apache.org - * @author Wolfgang Werner wwerner@picturesafe.de - * @author Kevin Ross kevin.ross@bredex.com + * @author Wolfgang Werner + * wwerner@picturesafe.de + * @author Kevin Ross + * kevin.ross@bredex.com * * @since Ant 1.1 * diff --git a/src/main/org/apache/tools/ant/taskdefs/Delete.java b/src/main/org/apache/tools/ant/taskdefs/Delete.java index e3fcfd4dc..6e250d1bd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Delete.java +++ b/src/main/org/apache/tools/ant/taskdefs/Delete.java @@ -72,9 +72,11 @@ import java.util.Vector; * to provide backwards compatibility for a release. The future position * is to use nested filesets exclusively.

* - * @author Stefano Mazzocchi stefano@apache.org + * @author Stefano Mazzocchi + * stefano@apache.org * @author Tom Dimock tad1@cornell.edu - * @author Glenn McAllister glennm@ca.ibm.com + * @author Glenn McAllister + * glennm@ca.ibm.com * @author Jon S. Stevens jon@latchkey.com * * @since Ant 1.2 diff --git a/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/src/main/org/apache/tools/ant/taskdefs/DependSet.java index 95f5ca71d..873c6db65 100644 --- a/src/main/org/apache/tools/ant/taskdefs/DependSet.java +++ b/src/main/org/apache/tools/ant/taskdefs/DependSet.java @@ -81,18 +81,19 @@ import org.apache.tools.ant.types.FileList; *
  • targetfileset (fileset describing the target files to examine) *
  • targetfilelist (filelist describing the target files to examine) * - * At least one instance of either a fileset or filelist for both source and target - * are required. + * At least one instance of either a fileset or filelist for both source and + * target are required. *

    - * This task will examine each of the source files against each of the target files. - * If any target files are out of date with respect to any of the source files, all targets are removed. - * If any files named in a (src or target) filelist do not exist, all targets are removed. - * Hint: If missing files should be ignored, specify them as include patterns in filesets, - * rather than using filelists. + * This task will examine each of the source files against each of the target + * files. If any target files are out of date with respect to any of the source + * files, all targets are removed. If any files named in a (src or target) + * filelist do not exist, all targets are removed. + * Hint: If missing files should be ignored, specify them as include patterns + * in filesets, rather than using filelists. *

    - * This task attempts to optimize speed of dependency checking. It will stop after the first - * out of date file is found and remove all targets, rather than exhaustively checking every - * source vs target combination unnecessarily. + * This task attempts to optimize speed of dependency checking. It will stop + * after the first out of date file is found and remove all targets, rather + * than exhaustively checking every source vs target combination unnecessarily. *

    * Example uses: *

    • diff --git a/src/main/org/apache/tools/ant/taskdefs/Echo.java b/src/main/org/apache/tools/ant/taskdefs/Echo.java index 47bb9a2b3..300e5f2e5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Echo.java +++ b/src/main/org/apache/tools/ant/taskdefs/Echo.java @@ -164,7 +164,8 @@ public class Echo extends Task { public static class EchoLevel extends EnumeratedAttribute { public String[] getValues() { - return new String[] {"error", "warning", "info", "verbose", "debug"}; + return new String[] {"error", "warning", "info", + "verbose", "debug"}; } } } diff --git a/src/main/org/apache/tools/ant/taskdefs/Exec.java b/src/main/org/apache/tools/ant/taskdefs/Exec.java index 3f6231389..1e264da16 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Exec.java +++ b/src/main/org/apache/tools/ant/taskdefs/Exec.java @@ -76,7 +76,8 @@ import java.io.InputStreamReader; * @author duncan@x180.com * @author rubys@us.ibm.com * - * @deprecated delegate to {@link org.apache.tools.ant.taskdefs.Execute Execute} instead. + * @deprecated delegate to {@link org.apache.tools.ant.taskdefs.Execute Execute} + * instead. */ public class Exec extends Task { private String os; @@ -89,8 +90,10 @@ public class Exec extends Task { private static final int BUFFER_SIZE = 512; public Exec() { - System.err.println("As of Ant 1.2 released in October 2000, the Exec class"); - System.err.println("is considered to be dead code by the Ant developers and is unmaintained."); + System.err.println("As of Ant 1.2 released in October 2000, " + + "the Exec class"); + System.err.println("is considered to be dead code by the Ant " + + "developers and is unmaintained."); System.err.println("Don\'t use it!"); } @@ -123,7 +126,8 @@ public class Exec extends Task { } else { String ant = project.getProperty("ant.home"); if (ant == null) { - throw new BuildException("Property 'ant.home' not found", location); + throw new BuildException("Property 'ant.home' not " + + "found", location); } String antRun = project.resolveFile(ant + "/bin/antRun.bat").toString(); @@ -133,7 +137,8 @@ public class Exec extends Task { } else { String ant = project.getProperty("ant.home"); if (ant == null) { - throw new BuildException("Property 'ant.home' not found", location); + throw new BuildException("Property 'ant.home' not found", + location); } String antRun = project.resolveFile(ant + "/bin/antRun").toString(); diff --git a/src/main/org/apache/tools/ant/taskdefs/Execute.java b/src/main/org/apache/tools/ant/taskdefs/Execute.java index 24e21d8c3..86e2016ae 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Execute.java +++ b/src/main/org/apache/tools/ant/taskdefs/Execute.java @@ -140,7 +140,8 @@ public class Execute { shellLauncher = new WinNTCommandLauncher(baseLauncher); } else { // Windows 98/95 - need to use an auxiliary script - shellLauncher = new ScriptCommandLauncher("bin/antRun.bat", baseLauncher); + shellLauncher + = new ScriptCommandLauncher("bin/antRun.bat", baseLauncher); } } else if (Os.isFamily("netware")) { // NetWare. Need to determine which JDK we're running in @@ -153,10 +154,12 @@ public class Execute { baseLauncher = new CommandLauncher(); } - shellLauncher = new PerlScriptCommandLauncher("bin/antRun.pl", baseLauncher); + shellLauncher + = new PerlScriptCommandLauncher("bin/antRun.pl", baseLauncher); } else { // Generic - shellLauncher = new ScriptCommandLauncher("bin/antRun", new CommandLauncher()); + shellLauncher = new ScriptCommandLauncher("bin/antRun", + new CommandLauncher()); } } @@ -272,7 +275,8 @@ public class Execute { * @param watchdog a watchdog for the subprocess or null to * to disable a timeout for the subprocess. */ - public Execute(ExecuteStreamHandler streamHandler, ExecuteWatchdog watchdog) { + public Execute(ExecuteStreamHandler streamHandler, + ExecuteWatchdog watchdog) { this.streamHandler = streamHandler; this.watchdog = watchdog; } @@ -363,7 +367,8 @@ public class Execute { * executable with a script, etc * * @param vmLauncher true if exec should launch through thge VM, - * false if the shell should be used to launch the command. + * false if the shell should be used to launch the + * command. */ public void setVMLauncher(boolean useVMLauncher) { this.useVMLauncher = useVMLauncher; @@ -383,7 +388,8 @@ public class Execute { public static Process launch(Project project, String[] command, String[] env, File dir, boolean useVM) throws IOException { - CommandLauncher launcher = vmLauncher != null ? vmLauncher : shellLauncher; + CommandLauncher launcher + = vmLauncher != null ? vmLauncher : shellLauncher; if (!useVM) { launcher = shellLauncher; } @@ -498,8 +504,8 @@ public class Execute { * * @throws BuildException if the command does not return 0. */ - public static void runCommand(Task task, String[] cmdline) throws BuildException - { + public static void runCommand(Task task, String[] cmdline) + throws BuildException { try { task.log(Commandline.toString(cmdline), Project.MSG_VERBOSE); Execute exe = new Execute(new LogStreamHandler(task, @@ -621,7 +627,8 @@ public class Execute { } else if (realexc instanceof IOException) { throw (IOException) realexc; } else { - throw new BuildException("Unable to execute command", realexc); + throw new BuildException("Unable to execute command", + realexc); } } catch (Exception exc) { // IllegalAccess, IllegalArgument, ClassCast @@ -743,7 +750,8 @@ public class Execute { if (workingDir == null) { return exec(project, cmd, env); } - throw new IOException("Cannot locate antRun script: No project provided"); + throw new IOException("Cannot locate antRun script: " + + "No project provided"); } // Locate the auxiliary script diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java index 04e1384ab..91da32552 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java @@ -128,7 +128,8 @@ public class ExecuteJava implements Runnable, TimeoutObserver { if (classpath == null) { target = Class.forName(classname); } else { - loader = new AntClassLoader(project.getCoreLoader(), project, classpath, false); + loader = new AntClassLoader(project.getCoreLoader(), project, + classpath, false); loader.setIsolated(true); loader.setThreadContextLoader(); target = loader.forceLoadClass(classname); diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java index fb538ff36..8768a277f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java @@ -286,8 +286,7 @@ public class ExecuteOn extends ExecTask { for (int j = 0; j < subTargets.length; j++) { String name = null; if (!relative) { - name = - (new File(destDir, subTargets[j])).getAbsolutePath(); + name = (new File(destDir, subTargets[j])).getAbsolutePath(); } else { name = subTargets[j]; } @@ -303,7 +302,8 @@ public class ExecuteOn extends ExecTask { targets.copyInto(targetFiles); String[] orig = cmdl.getCommandline(); - String[] result = new String[orig.length + srcFiles.length + targetFiles.length]; + String[] result + = new String[orig.length + srcFiles.length + targetFiles.length]; int srcIndex = orig.length; if (srcFilePos != null) { @@ -331,8 +331,8 @@ public class ExecuteOn extends ExecTask { // targetIndex --> end System.arraycopy(orig, targetIndex, result, - targetIndex + srcFiles.length + targetFiles.length, - orig.length - targetIndex); + targetIndex + srcFiles.length + targetFiles.length, + orig.length - targetIndex); } else { // 0 --> targetIndex System.arraycopy(orig, 0, result, 0, targetIndex); @@ -349,8 +349,8 @@ public class ExecuteOn extends ExecTask { // srcIndex --> end System.arraycopy(orig, srcIndex, result, - srcIndex + srcFiles.length + targetFiles.length, - orig.length - srcIndex); + srcIndex + srcFiles.length + targetFiles.length, + orig.length - srcIndex); srcIndex += targetFiles.length; } diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java index ef8c5e9cd..f6c81db61 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java @@ -97,7 +97,8 @@ public class ExecuteWatchdog implements TimeoutObserver { /** * Creates a new watchdog with a given timeout. * - * @param timeout the timeout for the process in milliseconds. It must be greather than 0. + * @param timeout the timeout for the process in milliseconds. + * It must be greather than 0. */ public ExecuteWatchdog(long timeout) { watchdog = new Watchdog(timeout); @@ -108,7 +109,7 @@ public class ExecuteWatchdog implements TimeoutObserver { * Watches the given process and terminates it, if it runs for too long. * All information from the previous run are reset. * @param process the process to monitor. It cannot be null - * @throws IllegalStateException thrown if a process is still being monitored. + * @throws IllegalStateException if a process is still being monitored. */ public synchronized void start(Process process) { if (process == null) { @@ -125,7 +126,8 @@ public class ExecuteWatchdog implements TimeoutObserver { } /** - * Stops the watcher. It will notify all threads possibly waiting on this object. + * Stops the watcher. It will notify all threads possibly waiting + * on this object. */ public synchronized void stop() { watchdog.stop(); @@ -166,12 +168,12 @@ public class ExecuteWatchdog implements TimeoutObserver { } /** - * This method will rethrow the exception that was possibly caught during the - * run of the process. It will only remains valid once the process has been - * terminated either by 'error', timeout or manual intervention. Information - * will be discarded once a new process is ran. - * @throws BuildException a wrapped exception over the one that was silently - * swallowed and stored during the process run. + * This method will rethrow the exception that was possibly caught during + * the run of the process. It will only remains valid once the process has + * been terminated either by 'error', timeout or manual intervention. + * Information will be discarded once a new process is ran. + * @throws BuildException a wrapped exception over the one that was + * silently swallowed and stored during the process run. */ public void checkException() throws BuildException { if (caught != null) { @@ -182,7 +184,8 @@ public class ExecuteWatchdog implements TimeoutObserver { /** * Indicates whether or not the watchdog is still monitoring the process. - * @return true if the process is still running, otherwise false. + * @return true if the process is still running, otherwise + * false. */ public boolean isWatching(){ return watch; @@ -190,7 +193,8 @@ public class ExecuteWatchdog implements TimeoutObserver { /** * Indicates whether the last process run was killed on timeout or not. - * @return true if the process was killed otherwise false. + * @return true if the process was killed otherwise + * false. */ public boolean killedProcess(){ return killedProcess; diff --git a/src/main/org/apache/tools/ant/taskdefs/Filter.java b/src/main/org/apache/tools/ant/taskdefs/Filter.java index e413f8d58..38556c85f 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Filter.java +++ b/src/main/org/apache/tools/ant/taskdefs/Filter.java @@ -65,7 +65,8 @@ import org.apache.tools.ant.Project; * of the project to do token substitution, or sets mutiple tokens by * reading these from a file. * - * @author Stefano Mazzocchi stefano@apache.org + * @author Stefano Mazzocchi + * stefano@apache.org * @author Gero Vermaas gero@xs4all.nl * @author Michael McCallum * diff --git a/src/main/org/apache/tools/ant/taskdefs/Jar.java b/src/main/org/apache/tools/ant/taskdefs/Jar.java index 76a68eec9..b887eb7c1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Jar.java @@ -78,7 +78,8 @@ import java.util.Enumeration; * Creates a JAR archive. * * @author James Davidson duncan@x180.com - * @author Brian Deitte bdeitte@macromedia.com + * @author Brian Deitte + * bdeitte@macromedia.com * * @since Ant 1.1 * @@ -291,8 +292,8 @@ public class Jar extends Zip { /** * Create the index list to speed up classloading. * This is a JDK 1.3+ specific feature and is enabled by default. See - * the - * JAR index specification for more details. + * + * the JAR index specification for more details. * * @param zOut the zip stream representing the jar being built. * @throws IOException thrown if there is an error while creating the @@ -390,7 +391,8 @@ public class Jar extends Zip { filesetManifest.merge(newManifest); } } catch (ManifestException e) { - log("Manifest in file " + file + " is invalid: " + e.getMessage(), Project.MSG_ERR); + log("Manifest in file " + file + " is invalid: " + + e.getMessage(), Project.MSG_ERR); throw new BuildException("Invalid Manifest", e, getLocation()); } } else { diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java index 331bf343f..ad44f83c2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Java.java +++ b/src/main/org/apache/tools/ant/taskdefs/Java.java @@ -76,7 +76,8 @@ import java.util.Vector; * the same JVM for the called application thus resulting in much * faster operation. * - * @author Stefano Mazzocchi stefano@apache.org + * @author Stefano Mazzocchi + * stefano@apache.org * @author Stefan Bodewig * * @since Ant 1.1 diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java index 683cb1635..499701acd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -100,7 +100,8 @@ import java.util.Vector; * compile decision based on timestamp. * * @author James Davidson duncan@x180.com - * @author Robin Green greenrd@hotmail.com + * @author Robin Green + * greenrd@hotmail.com * @author Stefan Bodewig * @author J D Glanville * diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index c8700e0d6..06a4bfbb9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -97,8 +97,10 @@ import org.apache.tools.ant.util.JavaEnvUtils; * System.exit() which would break Ant functionality. * * @author Jon S. Stevens jon@clearink.com - * @author Stefano Mazzocchi stefano@apache.org - * @author Patrick Chanezon chanezon@netscape.com + * @author Stefano Mazzocchi + * stefano@apache.org + * @author Patrick Chanezon + * chanezon@netscape.com * @author Ernst de Haan ernst@jollem.com * @author Stefan Bodewig * @@ -1077,7 +1079,8 @@ public class Javadoc extends Task { // Ant javadoc task rules for group attribute: // Args are comma-delimited. // Each arg is 2 space-delimited strings. - // E.g., group="XSLT_Packages org.apache.xalan.xslt*,XPath_Packages org.apache.xalan.xpath*" + // E.g., group="XSLT_Packages org.apache.xalan.xslt*, + // XPath_Packages org.apache.xalan.xpath*" if (group != null) { StringTokenizer tok = new StringTokenizer(group, ",", false); while (tok.hasMoreTokens()) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Jikes.java b/src/main/org/apache/tools/ant/taskdefs/Jikes.java index 8681a7c1f..6cc322132 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Jikes.java +++ b/src/main/org/apache/tools/ant/taskdefs/Jikes.java @@ -87,8 +87,10 @@ public class Jikes { protected Jikes(JikesOutputParser jop, String command, Project project) { super(); - System.err.println("As of Ant 1.2 released in October 2000, the Jikes class"); - System.err.println("is considered to be dead code by the Ant developers and is unmaintained."); + System.err.println("As of Ant 1.2 released in October 2000, " + + "the Jikes class"); + System.err.println("is considered to be dead code by the Ant " + + "developers and is unmaintained."); System.err.println("Don\'t use it!"); this.jop = jop; @@ -125,7 +127,8 @@ public class Jikes { commandArray = new String[] { command, "@" + tmpFile.getAbsolutePath()}; } catch (IOException e) { - throw new BuildException("Error creating temporary file", e); + throw new BuildException("Error creating temporary file", + e); } finally { if (out != null) { try {out.close();} catch (Throwable t) {} diff --git a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java index 2c06a62ea..f80c04ddf 100644 --- a/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java +++ b/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java @@ -120,8 +120,10 @@ public class JikesOutputParser implements ExecuteStreamHandler { protected JikesOutputParser(Task task, boolean emacsMode) { super(); - System.err.println("As of Ant 1.2 released in October 2000, the JikesOutputParser class"); - System.err.println("is considered to be dead code by the Ant developers and is unmaintained."); + System.err.println("As of Ant 1.2 released in October 2000, the " + + "JikesOutputParser class"); + System.err.println("is considered to be dead code by the Ant " + + "developers and is unmaintained."); System.err.println("Don\'t use it!"); this.task = task; diff --git a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java index 0639813dd..805348a4e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java @@ -67,8 +67,10 @@ import java.util.StringTokenizer; * This is an abstract task that should be used by all those tasks that * require to include or exclude files based on pattern matching. * - * @author Arnout J. Kuiper ajkuiper@wxs.nl - * @author Stefano Mazzocchi stefano@apache.org + * @author Arnout J. Kuiper + * ajkuiper@wxs.nl + * @author Stefano Mazzocchi + * stefano@apache.org * @author Sam Ruby rubys@us.ibm.com * @author Jon S. Stevens jon@clearink.com * @author Stefan Bodewig diff --git a/src/main/org/apache/tools/ant/taskdefs/Move.java b/src/main/org/apache/tools/ant/taskdefs/Move.java index 86b600612..0a0b3af9b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Move.java +++ b/src/main/org/apache/tools/ant/taskdefs/Move.java @@ -79,7 +79,8 @@ import java.util.Enumeration; * document, the following mailing list discussions, and the * copyfile/copydir tasks.

      * - * @author Glenn McAllister glennm@ca.ibm.com + * @author Glenn McAllister + * glennm@ca.ibm.com * @author Magesh Umasankar * @version $Revision$ * diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java index b7aa9cd2a..29f371efd 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java @@ -82,7 +82,8 @@ import java.util.Vector; * values in the indicated files. Each value can be either a string * or the value of a property available in a designated property file. * - * @author Stefano Mazzocchi stefano@apache.org + * @author Stefano Mazzocchi + * stefano@apache.org * @author Erik Langenbach * * @since Ant 1.1 diff --git a/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/src/main/org/apache/tools/ant/taskdefs/SignJar.java index 147fb4639..ef6422801 100644 --- a/src/main/org/apache/tools/ant/taskdefs/SignJar.java +++ b/src/main/org/apache/tools/ant/taskdefs/SignJar.java @@ -69,8 +69,10 @@ import org.apache.tools.ant.types.FileSet; /** * Sign a archive. * - * @author Peter Donald donaldp@apache.org - * @author Nick Fortescue nick@ox.compsoc.net + * @author Peter Donald + * donaldp@apache.org + * @author Nick Fortescue + * nick@ox.compsoc.net * @since Ant 1.1 * @ant.task category="java" */ diff --git a/src/main/org/apache/tools/ant/taskdefs/Tar.java b/src/main/org/apache/tools/ant/taskdefs/Tar.java index c6b71da67..597951fa9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Tar.java +++ b/src/main/org/apache/tools/ant/taskdefs/Tar.java @@ -74,7 +74,8 @@ import org.apache.tools.tar.TarEntry; /** * Creates a TAR archive. * - * @author Stefano Mazzocchi stefano@apache.org + * @author Stefano Mazzocchi + * stefano@apache.org * @author Stefan Bodewig * @author Magesh Umasankar * @@ -136,7 +137,6 @@ public class Tar extends MatchingTask { * @deprecated for consistency with other tasks, please use setDestFile() */ public void setTarfile(File tarFile) { - //log("DEPRECATED - The tarfile attribute is deprecated. Please use the destfile attribute instead."); this.tarFile = tarFile; } diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java index 915661540..d9fe5e01a 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java +++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java @@ -107,7 +107,8 @@ public class Tstamp extends Task { SimpleDateFormat tstamp = new SimpleDateFormat ("HHmm"); project.setNewProperty(prefix + "TSTAMP", tstamp.format(d)); - SimpleDateFormat today = new SimpleDateFormat ("MMMM d yyyy", Locale.US); + SimpleDateFormat today + = new SimpleDateFormat ("MMMM d yyyy", Locale.US); project.setNewProperty(prefix + "TODAY", today.format(d)); Enumeration i = customFormats.elements(); diff --git a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java index 688ced635..59dd30c34 100644 --- a/src/main/org/apache/tools/ant/taskdefs/UpToDate.java +++ b/src/main/org/apache/tools/ant/taskdefs/UpToDate.java @@ -73,8 +73,10 @@ import java.util.Vector; * Will set the given property if the specified target has a timestamp * greater than all of the source files. * - * @author William Ferguson williamf@mincom.com - * @author Hiroaki Nakamura hnakamur@mc.neweb.ne.jp + * @author William Ferguson + * williamf@mincom.com + * @author Hiroaki Nakamura + * hnakamur@mc.neweb.ne.jp * @author Stefan Bodewig * * @since Ant 1.2 diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index 0b368ff86..d7f8be153 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -611,8 +611,8 @@ public class Zip extends MatchingTask { } else { for (int i = 0; i < files.length; ++i) { if (files[i].equals(zipFile)) { - throw new BuildException("A zip file cannot include itself", - location); + throw new BuildException("A zip file cannot include " + + "itself", location); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java index 05e0d0944..2ef55762e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java @@ -67,7 +67,8 @@ import org.apache.tools.ant.taskdefs.Javac; * task, the execute command and a parameterless constructor (for * reflection).

      * - * @author Jay Dickon Glanville jayglanville@home.com + * @author Jay Dickon Glanville + * jayglanville@home.com * @since Ant 1.3 */ diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java index 47d5a082f..cb9bc8e64 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java @@ -131,8 +131,10 @@ public class CompilerAdapterFactory { + "classic compiler", Project.MSG_WARN); return new Javac12(); } else { - throw new BuildException("Unable to find a javac compiler;\n" - + "com.sun.tools.javac.Main is not on the classpath.\n" + throw new BuildException("Unable to find a javac " + + "compiler;\n" + + "com.sun.tools.javac.Main is not on the " + + "classpath.\n" + "Perhaps JAVA_HOME does not point to the JDK"); } } 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 425b28bcd..8401e76d5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -75,7 +75,8 @@ import java.io.IOException; * Currently, this is a cut-and-paste of the original javac task. * * @author James Davidson duncan@x180.com - * @author Robin Green greenrd@hotmail.com + * @author Robin Green + * greenrd@hotmail.com * @author Stefan Bodewig * @author J D Glanville * @@ -202,7 +203,8 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter { // we cannot be using Java 1.0 when forking, so we only have to // distinguish between Java 1.1, and Java 1.2 and higher, as Java 1.1 // has its own parameter format - boolean usingJava1_1 = Project.getJavaVersion().equals(Project.JAVA_1_1); + boolean usingJava1_1 + = Project.getJavaVersion().equals(Project.JAVA_1_1); String memoryParameterPrefix = usingJava1_1 ? "-J-" : "-J-X"; if (memoryInitialSize != null) { if (!attributes.isForkedJavac()) { diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java index c20c74e84..2d23c5475 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java @@ -70,7 +70,8 @@ import java.lang.reflect.Method; * was refactored. * * @author James Davidson duncan@x180.com - * @author Robin Green greenrd@hotmail.com + * @author Robin Green + * greenrd@hotmail.com * @author Stefan Bodewig * @author J D Glanville * diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java index c8c4cfaa4..d5efb7960 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java @@ -68,7 +68,8 @@ import java.lang.reflect.Method; * was refactored. * * @author James Davidson duncan@x180.com - * @author Robin Green greenrd@hotmail.com + * @author Robin Green + * greenrd@hotmail.com * @author Stefan Bodewig * @author J D Glanville * diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java index 921324c6e..be438380d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java @@ -65,7 +65,8 @@ import org.apache.tools.ant.types.Commandline; * was refactored. * * @author James Davidson duncan@x180.com - * @author Robin Green greenrd@hotmail.com + * @author Robin Green + * greenrd@hotmail.com * @author Stefan Bodewig * @author J D Glanville * @since Ant 1.3 diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java b/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java index 0c6fa8ca9..d782807ce 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java @@ -65,7 +65,8 @@ import org.apache.tools.ant.types.Commandline; * was refactored. * * @author James Davidson duncan@x180.com - * @author Robin Green greenrd@hotmail.com + * @author Robin Green + * greenrd@hotmail.com * @author Stefan Bodewig * @author J D Glanville * @since Ant 1.3 diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java index 55fc44ab0..d1c50c60c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java @@ -143,12 +143,14 @@ class ChangeLogParser { if (line.startsWith("======")) { //We have ended changelog for that particular file //so we can save it - final int end = m_comment.length() - lineSeparator.length(); //was -1 + final int end + = m_comment.length() - lineSeparator.length(); //was -1 m_comment = m_comment.substring(0, end); saveEntry(); m_status = GET_FILE; } else if (line.startsWith("----------------------------")) { - final int end = m_comment.length() - lineSeparator.length(); //was -1 + final int end + = m_comment.length() - lineSeparator.length(); //was -1 m_comment = m_comment.substring(0, end); m_status = GET_PREVIOUS_REV; } else { diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java index 6ccbd9dd3..b3715482b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java @@ -65,9 +65,11 @@ import java.util.Enumeration; */ class ChangeLogWriter { /** output format for dates writtn to xml file */ - private static final SimpleDateFormat c_outputDate = new SimpleDateFormat("yyyy-MM-dd"); + private static final SimpleDateFormat c_outputDate + = new SimpleDateFormat("yyyy-MM-dd"); /** output format for times writtn to xml file */ - private static final SimpleDateFormat c_outputTime = new SimpleDateFormat("hh:mm"); + private static final SimpleDateFormat c_outputTime + = new SimpleDateFormat("hh:mm"); /** @@ -99,9 +101,12 @@ class ChangeLogWriter { */ private void printEntry(final PrintWriter output, final CVSEntry entry) { output.println("\t"); - output.println("\t\t" + c_outputDate.format(entry.getDate()) + ""); - output.println("\t\t"); - output.println("\t\t"); + output.println("\t\t" + c_outputDate.format(entry.getDate()) + + ""); + output.println("\t\t"); + output.println("\t\t"); final Enumeration enumeration = entry.getFiles().elements(); @@ -110,12 +115,14 @@ class ChangeLogWriter { output.println("\t\t"); output.println("\t\t\t" + file.getName() + ""); - output.println("\t\t\t" + file.getRevision() + ""); + output.println("\t\t\t" + file.getRevision() + + ""); final String previousRevision = file.getPreviousRevision(); if (previousRevision != null) { - output.println("\t\t\t" + previousRevision + ""); + output.println("\t\t\t" + previousRevision + + ""); } output.println("\t\t"); diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java index 42dc87a5c..53d7184a9 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java @@ -161,7 +161,8 @@ public class CvsTagDiff extends Task { /** * Initialize this task. - * CvsTagDiff initializes a member cvs task in init() to perform the rdiff in execute(). + * CvsTagDiff initializes a member cvs task in init() to perform the + * rdiff in execute(). * * @exception BuildException if an error occurs */ diff --git a/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java b/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java index 10294c051..26acf9112 100644 --- a/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java +++ b/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java @@ -74,7 +74,8 @@ class RedirectingStreamHandler String getErrors() { try { - final ByteArrayOutputStream error = (ByteArrayOutputStream) getErr(); + final ByteArrayOutputStream error + = (ByteArrayOutputStream) getErr(); return error.toString("ASCII"); } catch (final Exception e) {