ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs MacroDef.java MacroInstance.java Manifest.java MatchingTask.java Move.java Parallel.java Patch.java PreSetDef.java Property.java Redirector.java Rmic.java SQLExec.java Sleep.java StreamPumper.java
Date Mon, 15 Sep 2003 16:55:02 GMT
peterreilly    2003/09/15 09:55:01

  Modified:    src/main/org/apache/tools/ant/taskdefs MacroDef.java
                        MacroInstance.java Manifest.java MatchingTask.java
                        Move.java Parallel.java Patch.java PreSetDef.java
                        Property.java Redirector.java Rmic.java
                        SQLExec.java Sleep.java StreamPumper.java
  Log:
  next set of typo corrections by Larry  Shatzer
  
  Revision  Changes    Path
  1.6       +3 -3      ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java
  
  Index: MacroDef.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroDef.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MacroDef.java	22 Aug 2003 15:25:44 -0000	1.5
  +++ MacroDef.java	15 Sep 2003 16:55:01 -0000	1.6
  @@ -126,7 +126,7 @@
       }
   
       /**
  -     * <em>Expermential</em>
  +     * <em>Experimental</em>
        * I am uncertain at the moment how to encode attributes
        * using ant style ${attribute} or xpath style @attribute.
        * The first may get mixed up with ant properties and
  @@ -140,7 +140,7 @@
       }
   
       /**
  -     * <em>Expermential</em>
  +     * <em>Experimental</em>
        * @return the attribute style
        */
       public int getAttributeStyle() {
  @@ -511,7 +511,7 @@
           }
   
           /**
  -         * Similiar method for this definition
  +         * Similar method for this definition
            *
            * @param other another definition
            * @param project the current project
  
  
  
  1.5       +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java
  
  Index: MacroInstance.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MacroInstance.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MacroInstance.java	15 Aug 2003 15:04:29 -0000	1.4
  +++ MacroInstance.java	15 Sep 2003 16:55:01 -0000	1.5
  @@ -75,7 +75,7 @@
    * The class to be placed in the ant type definition.
    * It is given a pointer to the template definition,
    * and makes a copy of the unknown element, substituting
  - * the the parameter values in attributes and text.
  + * the parameter values in attributes and text.
    * @author Peter Reilly
    * @since Ant 1.6
    */
  
  
  
  1.48      +4 -4      ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java
  
  Index: Manifest.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- Manifest.java	4 Sep 2003 11:58:02 -0000	1.47
  +++ Manifest.java	15 Sep 2003 16:55:01 -0000	1.48
  @@ -321,7 +321,7 @@
            *
            * @param writer the Writer to which the attribute is written
            *
  -         * @throws IOException if the attribte value cannot be written
  +         * @throws IOException if the attribute value cannot be written
            */
           public void write(PrintWriter writer) throws IOException {
               for (Enumeration e = getValues(); e.hasMoreElements();) {
  @@ -335,7 +335,7 @@
            * @param writer the Writer to which the attribute is written
            * @param value the attribute value
            *
  -         * @throws IOException if the attribte value cannot be written
  +         * @throws IOException if the attribute value cannot be written
            */
           private void writeValue(PrintWriter writer, String value)
                throws IOException {
  @@ -857,7 +857,7 @@
        * @param other the Manifest to be merged with this one.
        *
        * @throws ManifestException if there is a problem merging the
  -     *         manfest according to the Manifest spec.
  +     *         manifest according to the Manifest spec.
        */
       public void merge(Manifest other) throws ManifestException {
           merge(other, false);
  @@ -871,7 +871,7 @@
        *        of the current manifest
        *
        * @throws ManifestException if there is a problem merging the
  -     *         manfest according to the Manifest spec.
  +     *         manifest according to the Manifest spec.
        */
       public void merge(Manifest other, boolean overwriteMain)
            throws ManifestException {
  
  
  
  1.42      +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
  
  Index: MatchingTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- MatchingTask.java	13 Sep 2003 16:35:52 -0000	1.41
  +++ MatchingTask.java	15 Sep 2003 16:55:01 -0000	1.42
  @@ -474,7 +474,7 @@
       }
   
       /**
  -     * Accessor for the implict fileset.
  +     * Accessor for the implicit fileset.
        *
        * @since Ant 1.5.2
        */
  
  
  
  1.41      +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/Move.java
  
  Index: Move.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Move.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- Move.java	25 Jul 2003 08:31:45 -0000	1.40
  +++ Move.java	15 Sep 2003 16:55:01 -0000	1.41
  @@ -365,7 +365,7 @@
           } else {
               if (!filtering) {
                   // ensure that parent dir of dest file exists!
  -                // not using getParentFile method to stay 1.1 compat
  +                // not using getParentFile method to stay 1.1 compatibility
                   String parentPath = destFile.getParent();
                   if (parentPath != null) {
                       File parent = new File(parentPath);
  
  
  
  1.24      +4 -4      ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java
  
  Index: Parallel.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Parallel.java	25 Jul 2003 11:02:53 -0000	1.23
  +++ Parallel.java	15 Sep 2003 16:55:01 -0000	1.24
  @@ -207,7 +207,7 @@
        * is set and the JVM is at least a 1.4 VM then this value is
        * ignored.; optional
        *
  -     * @param numThreads total number of therads.
  +     * @param numThreads total number of threads.
        *
        */
       public void setThreadCount(int numThreads) {
  @@ -351,7 +351,7 @@
                           running[i] = runnables[threadNumber++];
                           Thread thread =  new Thread(group, running[i]);
                           thread.start();
  -                        // countinue on outer while loop to get another
  +                        // continue on outer while loop to get another
                           // available slot
                           continue outer;
                       }
  @@ -362,7 +362,7 @@
                   try {
                       semaphore.wait();
                   } catch (InterruptedException ie) {
  -                    // dosen't java know interruptions are rude?
  +                    // doesn't java know interruptions are rude?
                       // just pretend it didn't happen and go about out business.
                       // sheesh!
                   }
  @@ -442,7 +442,7 @@
           /**
            * Construct a new TaskRunnable.<p>
            *
  -         * @param task the Task to be executed in a seperate thread
  +         * @param task the Task to be executed in a separate thread
            */
           TaskRunnable(Task task) {
               this.task = task;
  
  
  
  1.26      +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/Patch.java
  
  Index: Patch.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Patch.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- Patch.java	25 Jul 2003 08:59:39 -0000	1.25
  +++ Patch.java	15 Sep 2003 16:55:01 -0000	1.26
  @@ -150,7 +150,7 @@
   
       /**
        * Work silently unless an error occurs; optional, default=false
  -     * @param q if true supress set the -s option on the patch command
  +     * @param q if true suppress set the -s option on the patch command
        */
       public void setQuiet(boolean q) {
           if (q) {
  
  
  
  1.7       +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java
  
  Index: PreSetDef.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/PreSetDef.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PreSetDef.java	22 Aug 2003 15:25:44 -0000	1.6
  +++ PreSetDef.java	15 Sep 2003 16:55:01 -0000	1.7
  @@ -288,7 +288,7 @@
           }
   
           /**
  -         * Similiar method for this definition
  +         * Similar method for this definition
            *
            * @param other another definition
            * @param project the current project
  
  
  
  1.67      +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/Property.java
  
  Index: Property.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Property.java,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- Property.java	24 Jul 2003 08:09:34 -0000	1.66
  +++ Property.java	15 Sep 2003 16:55:01 -0000	1.67
  @@ -74,7 +74,7 @@
    * Sets a property by name, or set of properties (from file or
    * resource) in the project.  </p>
    * Properties are immutable: whoever sets a property first freezes it for the
  - * rest of the build; they are most definately not variable.
  + * rest of the build; they are most definitely not variable.
    * <p>There are five ways to set properties:</p>
    * <ul>
    *   <li>By supplying both the <i>name</i> and <i>value</i>
attribute.</li>
  
  
  
  1.11      +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java
  
  Index: Redirector.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Redirector.java	1 Sep 2003 09:50:05 -0000	1.10
  +++ Redirector.java	15 Sep 2003 16:55:01 -0000	1.11
  @@ -80,7 +80,7 @@
    */
   public class Redirector {
       /**
  -     * The file receiveing standard output. Will also receive standard error
  +     * The file receiving standard output. Will also receive standard error
        * unless standard error is redirected or logError is true.
        */
       private File out;
  @@ -445,7 +445,7 @@
       /**
        * Complete redirection.
        *
  -     * This opertaion will close any streams and create any specified
  +     * This operation will close any streams and create any specified
        * property values.
        *
        * @throws IOException if the output properties cannot be read from their
  
  
  
  1.51      +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java
  
  Index: Rmic.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- Rmic.java	19 Jul 2003 11:20:13 -0000	1.50
  +++ Rmic.java	15 Sep 2003 16:55:01 -0000	1.51
  @@ -175,7 +175,7 @@
       }
   
       /**
  -     * Sets the the class to run <code>rmic</code> against;
  +     * Sets the class to run <code>rmic</code> against;
        * optional
        */
       public void setClassname(String classname) {
  
  
  
  1.61      +2 -2      ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
  
  Index: SQLExec.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- SQLExec.java	22 Aug 2003 15:25:44 -0000	1.60
  +++ SQLExec.java	15 Sep 2003 16:55:01 -0000	1.61
  @@ -273,7 +273,7 @@
        * Set the delimiter type: "normal" or "row" (default "normal").
        *
        * <p>The delimiter type takes two values - normal and row. Normal
  -     * means that any occurence of the delimiter terminate the SQL
  +     * means that any occurrence of the delimiter terminate the SQL
        * command whereas with row, only a line containing just the
        * delimiter is recognized as the end of the command.</p>
        */
  @@ -411,7 +411,7 @@
   
                           ((Transaction) e.nextElement()).runTransaction(out);
                           if (!isAutocommit()) {
  -                            log("Commiting transaction", Project.MSG_VERBOSE);
  +                            log("Committing transaction", Project.MSG_VERBOSE);
                               conn.commit();
                           }
                       }
  
  
  
  1.15      +3 -3      ant/src/main/org/apache/tools/ant/taskdefs/Sleep.java
  
  Index: Sleep.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Sleep.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Sleep.java	10 Feb 2003 14:13:36 -0000	1.14
  +++ Sleep.java	15 Sep 2003 16:55:01 -0000	1.15
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -65,8 +65,8 @@
    *<p>
    * A negative value can be supplied to any of attributes provided the total sleep time
    * is positive, pending fundamental changes in physics and JVM
  - * execution tims</p>
  - * Note that sleep times are always hints to be interpred by the OS how it feels
  + * execution times</p>
  + * Note that sleep times are always hints to be interpreted by the OS how it feels
    * small times may either be ignored or rounded up to a minimum timeslice. Note
    * also that the system clocks often have a fairly low granularity too, which complicates
    * measuring how long a sleep actually took.</p>
  
  
  
  1.16      +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
  
  Index: StreamPumper.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- StreamPumper.java	24 Jul 2003 13:29:37 -0000	1.15
  +++ StreamPumper.java	15 Sep 2003 16:55:01 -0000	1.16
  @@ -67,7 +67,7 @@
   public class StreamPumper implements Runnable {
   
       // TODO: make SIZE an instance variable.
  -    // TODO: add a status flag to note if an error occured in run.
  +    // TODO: add a status flag to note if an error occurred in run.
   
       private static final int SIZE = 128;
       private InputStream is;
  
  
  

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


Mime
View raw message