ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib ChangeLogParser.java ChangeLogWriter.java CvsTagDiff.java RedirectingStreamHandler.java
Date Mon, 15 Apr 2002 15:33:12 GMT
conor       02/04/15 08:33:12

  Modified:    src/main/org/apache/tools/ant ProjectHelper.java
               src/main/org/apache/tools/ant/listener MailLogger.java
               src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java
                        Ant.java Available.java Checksum.java Chmod.java
                        ConditionTask.java Copy.java Cvs.java Delete.java
                        DependSet.java Echo.java Exec.java Execute.java
                        ExecuteJava.java ExecuteOn.java
                        ExecuteWatchdog.java Filter.java Jar.java Java.java
                        Javac.java Javadoc.java Jikes.java
                        JikesOutputParser.java MatchingTask.java Move.java
                        Replace.java SignJar.java Tar.java Tstamp.java
                        UpToDate.java Zip.java
               src/main/org/apache/tools/ant/taskdefs/compilers
                        CompilerAdapter.java CompilerAdapterFactory.java
                        DefaultCompilerAdapter.java Javac12.java
                        Javac13.java Jikes.java Jvc.java
               src/main/org/apache/tools/ant/taskdefs/cvslib
                        ChangeLogParser.java ChangeLogWriter.java
                        CvsTagDiff.java RedirectingStreamHandler.java
  Log:
  Reduce a small number of long lines
  
  Revision  Changes    Path
  1.83      +9 -6      jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java
  
  Index: ProjectHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -w -u -r1.82 -r1.83
  --- ProjectHelper.java	9 Apr 2002 15:27:07 -0000	1.82
  +++ ProjectHelper.java	15 Apr 2002 15:33:08 -0000	1.83
  @@ -185,12 +185,13 @@
                   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,7 +436,8 @@
                       project.log("Property ${" + propertyName 
                           + "} has not been set", Project.MSG_VERBOSE);
                   }
  -                fragment = (keys.containsKey(propertyName)) ? (String) keys.get(propertyName) 
  +                fragment = (keys.containsKey(propertyName)) 
  +                    ? (String) keys.get(propertyName) 
                                                               : "${" + propertyName + "}"; 
               }
               sb.append(fragment);
  @@ -461,7 +463,8 @@
        *                           <code>${</code> without a closing 
        *                           <code>}</code>
        */
  -    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;
  
  
  
  1.9       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/listener/MailLogger.java
  
  Index: MailLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/listener/MailLogger.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -w -u -r1.8 -r1.9
  --- MailLogger.java	9 Apr 2002 06:18:35 -0000	1.8
  +++ MailLogger.java	15 Apr 2002 15:33:08 -0000	1.9
  @@ -94,7 +94,8 @@
    *  MailLogger.properties.file property</i> . Any properties defined in that
    *  file will override Ant properties.
    *
  - * @author Erik Hatcher <a href="mailto:ehatcher@apache.org">ehatcher@apache.org</a>
  + * @author Erik Hatcher 
  + *         <a href="mailto:ehatcher@apache.org">ehatcher@apache.org</a>
    */
   public class MailLogger extends DefaultLogger {
       /** Buffer in which the message is constructed prior to sending */
  
  
  
  1.10      +8 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
  
  Index: AbstractCvsTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -u -r1.9 -r1.10
  --- AbstractCvsTask.java	15 Apr 2002 13:36:17 -0000	1.9
  +++ AbstractCvsTask.java	15 Apr 2002 15:33:08 -0000	1.10
  @@ -77,8 +77,10 @@
    *
    * @author costin@dnt.ro
    * @author stefano@apache.org
  - * @author Wolfgang Werner <a href="mailto:wwerner@picturesafe.de">wwerner@picturesafe.de</a>
  - * @author Kevin Ross <a href="mailto:kevin.ross@bredex.com">kevin.ross@bredex.com</a>
  + * @author Wolfgang Werner 
  + *         <a href="mailto:wwerner@picturesafe.de">wwerner@picturesafe.de</a>
  + * @author Kevin Ross 
  + *         <a href="mailto:kevin.ross@bredex.com">kevin.ross@bredex.com</a>
    *
    * @since Ant 1.5
    */
  @@ -180,8 +182,8 @@
           super();
       }
   
  -    public void setExecuteStreamHandler(ExecuteStreamHandler executeStreamHandler){
  -        this.executeStreamHandler = executeStreamHandler;
  +    public void setExecuteStreamHandler(ExecuteStreamHandler handler){
  +        this.executeStreamHandler = handler;
       }
   
       protected ExecuteStreamHandler getExecuteStreamHandler(){
  @@ -278,7 +280,8 @@
            * 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 @@
                   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();
  
  
  
  1.53      +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
  
  Index: Ant.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -w -u -r1.52 -r1.53
  --- Ant.java	15 Apr 2002 13:36:17 -0000	1.52
  +++ Ant.java	15 Apr 2002 15:33:08 -0000	1.53
  @@ -348,7 +348,8 @@
                   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);
  
  
  
  1.43      +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java
  
  Index: Available.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -w -u -r1.42 -r1.43
  --- Available.java	15 Apr 2002 14:56:29 -0000	1.42
  +++ Available.java	15 Apr 2002 15:33:08 -0000	1.43
  @@ -68,9 +68,11 @@
   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 <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  + * @author Stefano Mazzocchi 
  + *         <a href="mailto:stefano@apache.org">stefano@apache.org</a>
    * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
    *
    * @since Ant 1.1
  
  
  
  1.22      +8 -7      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java
  
  Index: Checksum.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -w -u -r1.21 -r1.22
  --- Checksum.java	12 Apr 2002 14:46:44 -0000	1.21
  +++ Checksum.java	15 Apr 2002 15:33:08 -0000	1.22
  @@ -244,13 +244,13 @@
   
               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 @@
           }
   
           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 @@
           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);
  
  
  
  1.25      +8 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java
  
  Index: Chmod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -w -u -r1.24 -r1.25
  --- Chmod.java	11 Apr 2002 07:38:15 -0000	1.24
  +++ Chmod.java	15 Apr 2002 15:33:08 -0000	1.25
  @@ -68,7 +68,8 @@
    * Chmod equivalent for unix-like environments.
    *
    * @author costin@eng.sun.com
  - * @author Mariusz Nowostawski (Marni) <a href="mailto:mnowostawski@infoscience.otago.ac.nz">mnowostawski@infoscience.otago.ac.nz</a>
  + * @author Mariusz Nowostawski (Marni) 
  + *         <a href="mailto:mnowostawski@infoscience.otago.ac.nz">mnowostawski@infoscience.otago.ac.nz</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    *
    * @since Ant 1.1
  @@ -216,15 +217,18 @@
   
   
       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() {
  
  
  
  1.10      +5 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java
  
  Index: ConditionTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -u -r1.9 -r1.10
  --- ConditionTask.java	15 Apr 2002 08:39:18 -0000	1.9
  +++ ConditionTask.java	15 Apr 2002 15:33:08 -0000	1.10
  @@ -69,7 +69,7 @@
    * ConditionBase.</p>
    *
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    *
    * @since Ant 1.4
    *
  @@ -101,10 +101,12 @@
        */
       public void execute() throws BuildException {
           if (countConditions() > 1) {
  -            throw new BuildException("You must not nest more than one condition into <condition>");
  +            throw new BuildException("You must not nest more than one " 
  +                + "condition into <condition>");
           }
           if (countConditions() < 1) {
  -            throw new BuildException("You must nest a condition into <condition>");
  +            throw new BuildException("You must nest a condition into " 
  +                + "<condition>");
           }
           if (property == null) {
               throw new BuildException("The property attribute is required.");
  
  
  
  1.41      +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
  
  Index: Copy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -w -u -r1.40 -r1.41
  --- Copy.java	12 Apr 2002 14:46:44 -0000	1.40
  +++ Copy.java	15 Apr 2002 15:33:08 -0000	1.41
  @@ -85,12 +85,13 @@
    * document, the following mailing list discussions, and the
    * copyfile/copydir tasks.</p>
    *
  - * @author Glenn McAllister <a href="mailto:glennm@ca.ibm.com">glennm@ca.ibm.com</a>
  + * @author Glenn McAllister 
  + *         <a href="mailto:glennm@ca.ibm.com">glennm@ca.ibm.com</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    * @author <A href="gholam@xtra.co.nz">Michael McCallum</A>
    * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
    *
  - * @version $Revision: 1.40 $
  + * @version $Revision: 1.41 $
    *
    * @since Ant 1.2
    *
  
  
  
  1.26      +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Cvs.java
  
  Index: Cvs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Cvs.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -w -u -r1.25 -r1.26
  --- Cvs.java	11 Apr 2002 09:52:48 -0000	1.25
  +++ Cvs.java	15 Apr 2002 15:33:08 -0000	1.26
  @@ -63,8 +63,10 @@
    *
    * @author costin@dnt.ro
    * @author stefano@apache.org
  - * @author Wolfgang Werner <a href="mailto:wwerner@picturesafe.de">wwerner@picturesafe.de</a>
  - * @author Kevin Ross <a href="mailto:kevin.ross@bredex.com">kevin.ross@bredex.com</a>
  + * @author Wolfgang Werner 
  + *         <a href="mailto:wwerner@picturesafe.de">wwerner@picturesafe.de</a>
  + * @author Kevin Ross 
  + *         <a href="mailto:kevin.ross@bredex.com">kevin.ross@bredex.com</a>
    *
    * @since Ant 1.1
    * 
  
  
  
  1.31      +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java
  
  Index: Delete.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -w -u -r1.30 -r1.31
  --- Delete.java	15 Apr 2002 08:39:18 -0000	1.30
  +++ Delete.java	15 Apr 2002 15:33:08 -0000	1.31
  @@ -72,9 +72,11 @@
    * to provide backwards compatibility for a release.  The future position
    * is to use nested filesets exclusively.</p>
    * 
  - * @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  + * @author Stefano Mazzocchi 
  + *         <a href="mailto:stefano@apache.org">stefano@apache.org</a>
    * @author Tom Dimock <a href="mailto:tad1@cornell.edu">tad1@cornell.edu</a>
  - * @author Glenn McAllister <a href="mailto:glennm@ca.ibm.com">glennm@ca.ibm.com</a>
  + * @author Glenn McAllister 
  + *         <a href="mailto:glennm@ca.ibm.com">glennm@ca.ibm.com</a>
    * @author Jon S. Stevens <a href="mailto:jon@latchkey.com">jon@latchkey.com</a>
    *
    * @since Ant 1.2
  
  
  
  1.15      +12 -11    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/DependSet.java
  
  Index: DependSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/DependSet.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -w -u -r1.14 -r1.15
  --- DependSet.java	15 Apr 2002 13:36:17 -0000	1.14
  +++ DependSet.java	15 Apr 2002 15:33:08 -0000	1.15
  @@ -81,18 +81,19 @@
    * <li>targetfileset  (fileset describing the target files to examine)
    * <li>targetfilelist (filelist describing the target files to examine)
    * </ul>
  - * 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.
    * <p>
  - * 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.
    * </p><p>
  - * 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.
    * </p><p>
    * Example uses: 
    * <ul><li>
  @@ -109,7 +110,7 @@
    * 
    * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
    * @ant.task category="filesystem"
  - * @version $Revision: 1.14 $ $Date: 2002/04/15 13:36:17 $
  + * @version $Revision: 1.15 $ $Date: 2002/04/15 15:33:08 $
    * @since Ant 1.4
    */
   public class DependSet extends MatchingTask {
  
  
  
  1.19      +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java
  
  Index: Echo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Echo.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -w -u -r1.18 -r1.19
  --- Echo.java	12 Apr 2002 13:26:50 -0000	1.18
  +++ Echo.java	15 Apr 2002 15:33:08 -0000	1.19
  @@ -164,7 +164,8 @@
   
       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"};
           }
       }
   }
  
  
  
  1.29      +10 -5     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java
  
  Index: Exec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Exec.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -w -u -r1.28 -r1.29
  --- Exec.java	15 Apr 2002 14:56:29 -0000	1.28
  +++ Exec.java	15 Apr 2002 15:33:08 -0000	1.29
  @@ -76,7 +76,8 @@
    * @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 @@
       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 @@
                   } 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 @@
           } 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();
   
  
  
  
  1.42      +19 -11    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
  
  Index: Execute.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -w -u -r1.41 -r1.42
  --- Execute.java	15 Apr 2002 14:56:29 -0000	1.41
  +++ Execute.java	15 Apr 2002 15:33:08 -0000	1.42
  @@ -79,7 +79,7 @@
    *
    * @since Ant 1.2
    *
  - * @version $Revision: 1.41 $
  + * @version $Revision: 1.42 $
    */
   public class Execute {
   
  @@ -140,7 +140,8 @@
                   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 @@
                   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 @@
        * @param watchdog a watchdog for the subprocess or <code>null</code> 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 @@
        * 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 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 @@
        *
        * @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 @@
                   } 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 @@
                   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
  
  
  
  1.25      +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java
  
  Index: ExecuteJava.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteJava.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -w -u -r1.24 -r1.25
  --- ExecuteJava.java	11 Apr 2002 14:58:00 -0000	1.24
  +++ ExecuteJava.java	15 Apr 2002 15:33:08 -0000	1.25
  @@ -128,7 +128,8 @@
               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);
  
  
  
  1.28      +7 -7      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
  
  Index: ExecuteOn.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -w -u -r1.27 -r1.28
  --- ExecuteOn.java	14 Apr 2002 11:16:12 -0000	1.27
  +++ ExecuteOn.java	15 Apr 2002 15:33:08 -0000	1.28
  @@ -286,8 +286,7 @@
                       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 @@
           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) {
  
  
  
  1.10      +15 -11    jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java
  
  Index: ExecuteWatchdog.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -u -r1.9 -r1.10
  --- ExecuteWatchdog.java	11 Apr 2002 15:59:37 -0000	1.9
  +++ ExecuteWatchdog.java	15 Apr 2002 15:33:08 -0000	1.10
  @@ -97,7 +97,8 @@
       /**
        * 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 @@
        * 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 <tt>null</tt>
  -     * @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 @@
       }
   
       /**
  -     * 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 @@
       }
   
       /**
  -     * 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 @@
   
       /**
        * Indicates whether or not the watchdog is still monitoring the process.
  -     * @return  <tt>true</tt> if the process is still running, otherwise <tt>false</tt>.
  +     * @return  <tt>true</tt> if the process is still running, otherwise 
  +     *          <tt>false</tt>.
        */
       public boolean isWatching(){
           return watch;
  @@ -190,7 +193,8 @@
   
       /**
        * Indicates whether the last process run was killed on timeout or not.
  -     * @return  <tt>true</tt> if the process was killed otherwise <tt>false</tt>.
  +     * @return  <tt>true</tt> if the process was killed otherwise 
  +     *          <tt>false</tt>.
        */
       public boolean killedProcess(){
           return killedProcess;
  
  
  
  1.16      +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Filter.java
  
  Index: Filter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Filter.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -w -u -r1.15 -r1.16
  --- Filter.java	11 Apr 2002 14:28:00 -0000	1.15
  +++ Filter.java	15 Apr 2002 15:33:08 -0000	1.16
  @@ -65,7 +65,8 @@
    * of the project to do token substitution, or sets mutiple tokens by
    * reading these from a file.
    *
  - * @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  + * @author Stefano Mazzocchi 
  + *         <a href="mailto:stefano@apache.org">stefano@apache.org</a>
    * @author Gero Vermaas <a href="mailto:gero@xs4all.nl">gero@xs4all.nl</a>
    * @author <A href="gholam@xtra.co.nz">Michael McCallum</A>
    *
  
  
  
  1.51      +6 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
  
  Index: Jar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -w -u -r1.50 -r1.51
  --- Jar.java	15 Apr 2002 14:56:29 -0000	1.50
  +++ Jar.java	15 Apr 2002 15:33:08 -0000	1.51
  @@ -78,7 +78,8 @@
    * Creates a JAR archive.
    *
    * @author James Davidson <a href="mailto:duncan@x180.com">duncan@x180.com</a>
  - * @author Brian Deitte <a href="mailto:bdeitte@macromedia.com">bdeitte@macromedia.com</a>
  + * @author Brian Deitte 
  + *         <a href="mailto:bdeitte@macromedia.com">bdeitte@macromedia.com</a>
    *
    * @since Ant 1.1
    *
  @@ -291,8 +292,8 @@
       /**
        * Create the index list to speed up classloading.
        * This is a JDK 1.3+ specific feature and is enabled by default. See
  -     * <a href="http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#JAR+Index">the
  -     * JAR index specification</a> for more details.
  +     * <a href="http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#JAR+Index">
  +     * the JAR index specification</a> 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 @@
                       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 {
  
  
  
  1.43      +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -w -u -r1.42 -r1.43
  --- Java.java	15 Apr 2002 13:36:17 -0000	1.42
  +++ Java.java	15 Apr 2002 15:33:09 -0000	1.43
  @@ -76,7 +76,8 @@
    * the same JVM for the called application thus resulting in much
    * faster operation.
    *
  - * @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  + * @author Stefano Mazzocchi 
  + *         <a href="mailto:stefano@apache.org">stefano@apache.org</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    *
    * @since Ant 1.1
  
  
  
  1.98      +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
  retrieving revision 1.97
  retrieving revision 1.98
  diff -u -w -u -r1.97 -r1.98
  --- Javac.java	15 Apr 2002 14:56:29 -0000	1.97
  +++ Javac.java	15 Apr 2002 15:33:09 -0000	1.98
  @@ -100,11 +100,12 @@
    * compile decision based on timestamp.
    *
    * @author James Davidson <a href="mailto:duncan@x180.com">duncan@x180.com</a>
  - * @author Robin Green <a href="mailto:greenrd@hotmail.com">greenrd@hotmail.com</a>
  + * @author Robin Green 
  + *         <a href="mailto:greenrd@hotmail.com">greenrd@hotmail.com</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    * @author <a href="mailto:jayglanville@home.com">J D Glanville</a>
    *
  - * @version $Revision: 1.97 $
  + * @version $Revision: 1.98 $
    *
    * @since Ant 1.1
    *
  
  
  
  1.91      +6 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -w -u -r1.90 -r1.91
  --- Javadoc.java	15 Apr 2002 14:56:29 -0000	1.90
  +++ Javadoc.java	15 Apr 2002 15:33:09 -0000	1.91
  @@ -97,8 +97,10 @@
    * <CODE>System.exit()</CODE> which would break Ant functionality.
    *
    * @author Jon S. Stevens <a href="mailto:jon@clearink.com">jon@clearink.com</a>
  - * @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  - * @author Patrick Chanezon <a href="mailto:chanezon@netscape.com">chanezon@netscape.com</a>
  + * @author Stefano Mazzocchi 
  + *         <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  + * @author Patrick Chanezon 
  + *         <a href="mailto:chanezon@netscape.com">chanezon@netscape.com</a>
    * @author Ernst de Haan <a href="mailto:ernst@jollem.com">ernst@jollem.com</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    *
  @@ -1077,7 +1079,8 @@
               // 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()) {
  
  
  
  1.12      +6 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Jikes.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -w -u -r1.11 -r1.12
  --- Jikes.java	14 Apr 2002 11:16:12 -0000	1.11
  +++ Jikes.java	15 Apr 2002 15:33:09 -0000	1.12
  @@ -87,8 +87,10 @@
       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 @@
                       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) {}
  
  
  
  1.12      +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
  
  Index: JikesOutputParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -w -u -r1.11 -r1.12
  --- JikesOutputParser.java	14 Apr 2002 11:16:12 -0000	1.11
  +++ JikesOutputParser.java	15 Apr 2002 15:33:09 -0000	1.12
  @@ -120,8 +120,10 @@
       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;
  
  
  
  1.24      +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
  
  Index: MatchingTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -w -u -r1.23 -r1.24
  --- MatchingTask.java	14 Apr 2002 11:16:12 -0000	1.23
  +++ MatchingTask.java	15 Apr 2002 15:33:09 -0000	1.24
  @@ -67,8 +67,10 @@
    * 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 <a href="mailto:ajkuiper@wxs.nl">ajkuiper@wxs.nl</a> 
  - * @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  + * @author Arnout J. Kuiper 
  + *         <a href="mailto:ajkuiper@wxs.nl">ajkuiper@wxs.nl</a> 
  + * @author Stefano Mazzocchi 
  + *         <a href="mailto:stefano@apache.org">stefano@apache.org</a>
    * @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
    * @author Jon S. Stevens <a href="mailto:jon@clearink.com">jon@clearink.com</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  
  
  
  1.25      +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Move.java
  
  Index: Move.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Move.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -w -u -r1.24 -r1.25
  --- Move.java	15 Apr 2002 12:16:31 -0000	1.24
  +++ Move.java	15 Apr 2002 15:33:09 -0000	1.25
  @@ -79,9 +79,10 @@
    * document, the following mailing list discussions, and the
    * copyfile/copydir tasks.</p>
    *
  - * @author Glenn McAllister <a href="mailto:glennm@ca.ibm.com">glennm@ca.ibm.com</a>
  + * @author Glenn McAllister 
  + *         <a href="mailto:glennm@ca.ibm.com">glennm@ca.ibm.com</a>
    * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  - * @version $Revision: 1.24 $
  + * @version $Revision: 1.25 $
    *
    * @since Ant 1.2
    *
  
  
  
  1.30      +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Replace.java
  
  Index: Replace.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Replace.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -w -u -r1.29 -r1.30
  --- Replace.java	15 Apr 2002 13:36:17 -0000	1.29
  +++ Replace.java	15 Apr 2002 15:33:09 -0000	1.30
  @@ -82,7 +82,8 @@
    * 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 <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  + * @author Stefano Mazzocchi 
  + *         <a href="mailto:stefano@apache.org">stefano@apache.org</a>
    * @author <a href="mailto:erik@desknetinc.com">Erik Langenbach</a>
    *
    * @since Ant 1.1
  
  
  
  1.20      +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java
  
  Index: SignJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -w -u -r1.19 -r1.20
  --- SignJar.java	14 Apr 2002 11:16:13 -0000	1.19
  +++ SignJar.java	15 Apr 2002 15:33:09 -0000	1.20
  @@ -69,8 +69,10 @@
   /**
    * Sign a archive.
    *
  - * @author Peter Donald <a href="mailto:donaldp@apache.org">donaldp@apache.org</a>
  - * @author Nick Fortescue <a href="mailto:nick@ox.compsoc.net">nick@ox.compsoc.net</a>
  + * @author Peter Donald 
  + *         <a href="mailto:donaldp@apache.org">donaldp@apache.org</a>
  + * @author Nick Fortescue 
  + *         <a href="mailto:nick@ox.compsoc.net">nick@ox.compsoc.net</a>
    * @since Ant 1.1
    * @ant.task category="java"
    */
  
  
  
  1.31      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java
  
  Index: Tar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -w -u -r1.30 -r1.31
  --- Tar.java	15 Apr 2002 14:56:29 -0000	1.30
  +++ Tar.java	15 Apr 2002 15:33:09 -0000	1.31
  @@ -74,7 +74,8 @@
   /**
    * Creates a TAR archive.
    *
  - * @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  + * @author Stefano Mazzocchi 
  + *         <a href="mailto:stefano@apache.org">stefano@apache.org</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
    *
  @@ -136,7 +137,6 @@
        * @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;
       }
   
  
  
  
  1.27      +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
  
  Index: Tstamp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tstamp.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -w -u -r1.26 -r1.27
  --- Tstamp.java	15 Apr 2002 14:56:29 -0000	1.26
  +++ Tstamp.java	15 Apr 2002 15:33:09 -0000	1.27
  @@ -107,7 +107,8 @@
               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();
  
  
  
  1.19      +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
  
  Index: UpToDate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/UpToDate.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -w -u -r1.18 -r1.19
  --- UpToDate.java	14 Apr 2002 11:16:13 -0000	1.18
  +++ UpToDate.java	15 Apr 2002 15:33:09 -0000	1.19
  @@ -73,8 +73,10 @@
    * Will set the given property if the specified target has a timestamp
    * greater than all of the source files.
    *
  - * @author William Ferguson <a href="mailto:williamf@mincom.com">williamf@mincom.com</a> 
  - * @author Hiroaki Nakamura <a href="mailto:hnakamur@mc.neweb.ne.jp">hnakamur@mc.neweb.ne.jp</a>
  + * @author William Ferguson 
  + *         <a href="mailto:williamf@mincom.com">williamf@mincom.com</a> 
  + * @author Hiroaki Nakamura 
  + *         <a href="mailto:hnakamur@mc.neweb.ne.jp">hnakamur@mc.neweb.ne.jp</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    *
    * @since Ant 1.2
  
  
  
  1.78      +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
  
  Index: Zip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
  retrieving revision 1.77
  retrieving revision 1.78
  diff -u -w -u -r1.77 -r1.78
  --- Zip.java	15 Apr 2002 14:56:29 -0000	1.77
  +++ Zip.java	15 Apr 2002 15:33:09 -0000	1.78
  @@ -611,8 +611,8 @@
           } 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);
                   }
               }
   
  
  
  
  1.5       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java
  
  Index: CompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -u -r1.4 -r1.5
  --- CompilerAdapter.java	12 Apr 2002 14:46:45 -0000	1.4
  +++ CompilerAdapter.java	15 Apr 2002 15:33:10 -0000	1.5
  @@ -67,7 +67,8 @@
    * task, the execute command and a parameterless constructor (for
    * reflection).</p>
    *
  - * @author Jay Dickon Glanville <a href="mailto:jayglanville@home.com">jayglanville@home.com</a>
  + * @author Jay Dickon Glanville 
  + *         <a href="mailto:jayglanville@home.com">jayglanville@home.com</a>
    * @since Ant 1.3
    */
   
  
  
  
  1.11      +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java
  
  Index: CompilerAdapterFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -w -u -r1.10 -r1.11
  --- CompilerAdapterFactory.java	15 Apr 2002 13:36:18 -0000	1.10
  +++ CompilerAdapterFactory.java	15 Apr 2002 15:33:10 -0000	1.11
  @@ -131,8 +131,10 @@
                                   + "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");
                       }
                   }
  
  
  
  1.24      +4 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -w -u -r1.23 -r1.24
  --- DefaultCompilerAdapter.java	12 Apr 2002 14:46:45 -0000	1.23
  +++ DefaultCompilerAdapter.java	15 Apr 2002 15:33:10 -0000	1.24
  @@ -75,7 +75,8 @@
    * Currently, this is a cut-and-paste of the original javac task.
    *
    * @author James Davidson <a href="mailto:duncan@x180.com">duncan@x180.com</a>
  - * @author Robin Green <a href="mailto:greenrd@hotmail.com">greenrd@hotmail.com</a>
  + * @author Robin Green 
  + *         <a href="mailto:greenrd@hotmail.com">greenrd@hotmail.com</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    * @author <a href="mailto:jayglanville@home.com">J D Glanville</a>
    *
  @@ -202,7 +203,8 @@
           // 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()) {
  
  
  
  1.8       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java
  
  Index: Javac12.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -w -u -r1.7 -r1.8
  --- Javac12.java	15 Apr 2002 13:36:18 -0000	1.7
  +++ Javac12.java	15 Apr 2002 15:33:11 -0000	1.8
  @@ -70,7 +70,8 @@
    * was refactored.
    *
    * @author James Davidson <a href="mailto:duncan@x180.com">duncan@x180.com</a>
  - * @author Robin Green <a href="mailto:greenrd@hotmail.com">greenrd@hotmail.com</a>
  + * @author Robin Green 
  + *         <a href="mailto:greenrd@hotmail.com">greenrd@hotmail.com</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    * @author <a href="mailto:jayglanville@home.com">J D Glanville</a>
    *
  
  
  
  1.8       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java
  
  Index: Javac13.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Javac13.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -w -u -r1.7 -r1.8
  --- Javac13.java	15 Apr 2002 14:56:30 -0000	1.7
  +++ Javac13.java	15 Apr 2002 15:33:11 -0000	1.8
  @@ -68,7 +68,8 @@
    * was refactored.
    *
    * @author James Davidson <a href="mailto:duncan@x180.com">duncan@x180.com</a>
  - * @author Robin Green <a href="mailto:greenrd@hotmail.com">greenrd@hotmail.com</a>
  + * @author Robin Green 
  + *         <a href="mailto:greenrd@hotmail.com">greenrd@hotmail.com</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
    * @author <a href="mailto:jayglanville@home.com">J D Glanville</a>
    *
  
  
  
  1.12      +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java
  
  Index: Jikes.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jikes.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -w -u -r1.11 -r1.12
  --- Jikes.java	12 Apr 2002 14:46:45 -0000	1.11
  +++ Jikes.java	15 Apr 2002 15:33:11 -0000	1.12
  @@ -65,7 +65,8 @@
    * was refactored.
    *
    * @author James Davidson <a href="mailto:duncan@x180.com">duncan@x180.com</a>
  - * @author Robin Green <a href="mailto:greenrd@hotmail.com">greenrd@hotmail.com</a>
  + * @author Robin Green 
  + *         <a href="mailto:greenrd@hotmail.com">greenrd@hotmail.com</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
    * @author <a href="mailto:jayglanville@home.com">J D Glanville</a>
    * @since Ant 1.3
  
  
  
  1.8       +2 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java
  
  Index: Jvc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/Jvc.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -w -u -r1.7 -r1.8
  --- Jvc.java	12 Apr 2002 14:46:45 -0000	1.7
  +++ Jvc.java	15 Apr 2002 15:33:11 -0000	1.8
  @@ -65,7 +65,8 @@
    * was refactored.
    *
    * @author James Davidson <a href="mailto:duncan@x180.com">duncan@x180.com</a>
  - * @author Robin Green <a href="mailto:greenrd@hotmail.com">greenrd@hotmail.com</a>
  + * @author Robin Green 
  + *         <a href="mailto:greenrd@hotmail.com">greenrd@hotmail.com</a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
    * @author <a href="mailto:jayglanville@home.com">J D Glanville</a>
    * @since Ant 1.3
  
  
  
  1.13      +5 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
  
  Index: ChangeLogParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -w -u -r1.12 -r1.13
  --- ChangeLogParser.java	15 Apr 2002 13:36:19 -0000	1.12
  +++ ChangeLogParser.java	15 Apr 2002 15:33:11 -0000	1.13
  @@ -64,7 +64,7 @@
    * A class used to parse the output of the CVS log command.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.12 $ $Date: 2002/04/15 13:36:19 $
  + * @version $Revision: 1.13 $ $Date: 2002/04/15 15:33:11 $
    */
   class ChangeLogParser {
       //private static final int GET_ENTRY = 0;
  @@ -143,12 +143,14 @@
           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 {
  
  
  
  1.6       +15 -8     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java
  
  Index: ChangeLogWriter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -w -u -r1.5 -r1.6
  --- ChangeLogWriter.java	14 Apr 2002 11:16:15 -0000	1.5
  +++ ChangeLogWriter.java	15 Apr 2002 15:33:11 -0000	1.6
  @@ -61,13 +61,15 @@
    * Class used to generate an XML changelog.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.5 $ $Date: 2002/04/14 11:16:15 $
  + * @version $Revision: 1.6 $ $Date: 2002/04/15 15:33:11 $
    */
   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 @@
        */
       private void printEntry(final PrintWriter output, final CVSEntry entry) {
           output.println("\t<entry>");
  -        output.println("\t\t<date>" + c_outputDate.format(entry.getDate()) + "</date>");
  -        output.println("\t\t<time>" + c_outputTime.format(entry.getDate()) + "</time>");
  -        output.println("\t\t<author><![CDATA[" + entry.getAuthor() + "]]></author>");
  +        output.println("\t\t<date>" + c_outputDate.format(entry.getDate()) 
  +            + "</date>");
  +        output.println("\t\t<time>" + c_outputTime.format(entry.getDate()) 
  +            + "</time>");
  +        output.println("\t\t<author><![CDATA[" + entry.getAuthor() 
  +            + "]]></author>");
   
           final Enumeration enumeration = entry.getFiles().elements();
   
  @@ -110,12 +115,14 @@
   
               output.println("\t\t<file>");
               output.println("\t\t\t<name>" + file.getName() + "</name>");
  -            output.println("\t\t\t<revision>" + file.getRevision() + "</revision>");
  +            output.println("\t\t\t<revision>" + file.getRevision() 
  +                + "</revision>");
   
               final String previousRevision = file.getPreviousRevision();
   
               if (previousRevision != null) {
  -                output.println("\t\t\t<prevrevision>" + previousRevision + "</prevrevision>");
  +                output.println("\t\t\t<prevrevision>" + previousRevision 
  +                    + "</prevrevision>");
               }
   
               output.println("\t\t</file>");
  
  
  
  1.5       +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java
  
  Index: CvsTagDiff.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -w -u -r1.4 -r1.5
  --- CvsTagDiff.java	15 Apr 2002 12:16:31 -0000	1.4
  +++ CvsTagDiff.java	15 Apr 2002 15:33:11 -0000	1.5
  @@ -98,7 +98,7 @@
    * </PRE>
    * 
    * @author <a href="mailto:fred@castify.net">Frederic Lavigne</a>
  - * @version $Revision: 1.4 $ $Date: 2002/04/15 12:16:31 $
  + * @version $Revision: 1.5 $ $Date: 2002/04/15 15:33:11 $
    * @since Ant 1.5
    * @ant.task name="cvstagdiff"
    */
  @@ -161,7 +161,8 @@
       
       /**
        * 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
        */
  
  
  
  1.10      +3 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java
  
  Index: RedirectingStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/RedirectingStreamHandler.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -u -r1.9 -r1.10
  --- RedirectingStreamHandler.java	14 Apr 2002 11:16:15 -0000	1.9
  +++ RedirectingStreamHandler.java	15 Apr 2002 15:33:11 -0000	1.10
  @@ -62,7 +62,7 @@
    * A dummy stream handler that just passes stuff to the parser.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.9 $ $Date: 2002/04/14 11:16:15 $
  + * @version $Revision: 1.10 $ $Date: 2002/04/15 15:33:11 $
    */
   class RedirectingStreamHandler
        extends PumpStreamHandler {
  @@ -74,7 +74,8 @@
   
       String getErrors() {
           try {
  -            final ByteArrayOutputStream error = (ByteArrayOutputStream) getErr();
  +            final ByteArrayOutputStream error 
  +                = (ByteArrayOutputStream) getErr();
   
               return error.toString("ASCII");
           } catch (final Exception e) {
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message