ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/types RegularExpression.java Substitution.java
Date Tue, 06 Nov 2001 11:08:34 GMT
bodewig     01/11/06 03:08:34

  Modified:    src/main/org/apache/tools/ant TaskAdapter.java
               src/main/org/apache/tools/ant/taskdefs XSLTLiaison.java
               src/main/org/apache/tools/ant/taskdefs/optional
                        ReplaceRegExp.java XMLValidateTask.java
               src/main/org/apache/tools/ant/types RegularExpression.java
                        Substitution.java
  Log:
  get rid of javadoc warnings
  
  Revision  Changes    Path
  1.10      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/TaskAdapter.java
  
  Index: TaskAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/TaskAdapter.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TaskAdapter.java	2001/11/02 14:37:33	1.9
  +++ TaskAdapter.java	2001/11/06 11:08:33	1.10
  @@ -73,7 +73,7 @@
        *
        * Checks conditions only, which are additionally required for a tasks
        * adapted by TaskAdapter. Thus, this method should be called by
  -     * {@link Project.checkTaskClass}.
  +     * {@link Project#checkTaskClass}.
        *
        * Throws a BuildException and logs as Project.MSG_ERR for
        * conditions, that will cause the task execution to fail.
  
  
  
  1.6       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
  
  Index: XSLTLiaison.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XSLTLiaison.java	2001/09/13 08:40:37	1.5
  +++ XSLTLiaison.java	2001/11/06 11:08:34	1.6
  @@ -61,7 +61,7 @@
    *
    * @author <a href="mailto:rubys@us.ibm.com">Sam Ruby</a>
    * @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a>
  - * @see #XSLTProcess
  + * @see XSLTProcess
    */
   public interface XSLTLiaison {
   
  
  
  
  1.4       +9 -16     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
  
  Index: ReplaceRegExp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ReplaceRegExp.java	2001/11/02 16:36:49	1.3
  +++ ReplaceRegExp.java	2001/11/06 11:08:34	1.4
  @@ -86,24 +86,20 @@
    * requires the Jakarta Oro Package).
    *
    * <pre>
  - * For jdk  <= 1.3, there are two available implementations:
  + * For jdk  &lt;= 1.3, there are two available implementations:
    *   org.apache.tools.ant.util.regexp.JakartaOroRegexp (the default)
    *        Requires  the jakarta-oro package
    *
    *   org.apache.tools.ant.util.regexp.JakartaRegexpRegexp
    *        Requires the jakarta-regexp package
    *
  - * For jdk <= 1.4, and additional implementation is available:
  + * For jdk &gt;= 1.4 an additional implementation is available:
    *   org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp
    *        Requires the jdk 1.4 built in regular expression package.
    * </pre>
    *
    * Usage:
    *
  - *   Task declaration in the project:
  - *
  - *     &lt;taskdef name="replaceregexp" class="com.sedona.ant.taskdef.ReplaceRegExp"
/&gt;
  - *
    *   Call Syntax:
    *
    *     &lt;replaceregexp file="file"
  @@ -124,14 +120,14 @@
    *
    *   Attributes:
    *
  - *     file    --> A single file to operation on (mutually exclusive with the fileset
subelements)
  - *     match   --> The Perl5 Regular expression to match (see perl5 documentation)
  - *     replace --> The Perl5 Expression replacement string (see perl5 documentation)
  - *     flags   --> The Perl5 options to give to the replacement (see perl5 documentation
for full list)
  + *     file    --&gt; A single file to operation on (mutually exclusive with the fileset
subelements)
  + *     match   --&gt; The Regular expression to match 
  + *     replace --&gt; The Expression replacement string 
  + *     flags   --&gt; The options to give to the replacement 
    *                 g = Substitute all occurrences. default is to replace only the first
one
    *                 i = Case insensitive match
    *
  - *     byline  --> Should this file be processed a single line at a time (default is
false)
  + *     byline  --&gt; Should this file be processed a single line at a time (default
is false)
    *                 "true" indicates to perform replacement on a line by line basis
    *                 "false" indicates to perform replacement on the whole file at once.
    *
  @@ -139,12 +135,11 @@
    *
    *     The following call could be used to replace an old property name in a ".properties"
    *     file with a new name.  In the replace attribute, you can refer to any part of the
  - *     match expression in parenthesis using the syntax appropriate for the specified
  - *     implementation ('$$1' for org.apache.tools.ant.util.regexp.JakartaOroRegexp).
  + *     match expression in parenthesis using backslash followed by a number like '\1'.
    *
    *     &lt;replaceregexp file="test.properties"
    *                    match="MyProperty=(.*)"
  - *                    replace="NewProperty=$$1"
  + *                    replace="NewProperty=\1"
    *                    byline="true" /&gt;
    *
    * </pre>
  @@ -153,8 +148,6 @@
    */
   public class ReplaceRegExp extends Task
   {
  -    // Don't extend SedonaTaskContainer until we can delay building of
  -    // the subtasks so variable of the current token works.
   
       private File file;
       private String flags;
  
  
  
  1.8       +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
  
  Index: XMLValidateTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XMLValidateTask.java	2001/11/02 14:04:56	1.7
  +++ XMLValidateTask.java	2001/11/06 11:08:34	1.8
  @@ -167,8 +167,8 @@
        * <p> if className is an implementation of <code>org.xml.sax.Parser</code>,
{@link #setLenient(boolean)},
        * will be ignored.
        * <p> if not set, the default {@link #DEFAULT_XML_READER_CLASSNAME} will be
used.
  -     * @see org.xml.sax.XMLReader;
  -     * @see org.xml.sax.Parser;
  +     * @see org.xml.sax.XMLReader
  +     * @see org.xml.sax.Parser
        */
       public void setClassName(String className) {
   
  @@ -189,7 +189,7 @@
       }
   
       /**
  -     * @see #setClassPath
  +     * @see #setClasspath
        */
       public Path createClasspath() {
           if (this.classpath == null) {
  @@ -199,7 +199,7 @@
       }
   
       /**
  -     * @see #setClassPath
  +     * @see #setClasspath
        */
       public void setClasspathRef(Reference r) {
           createClasspath().setRefid(r);
  
  
  
  1.3       +6 -6      jakarta-ant/src/main/org/apache/tools/ant/types/RegularExpression.java
  
  Index: RegularExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/RegularExpression.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RegularExpression.java	2001/10/28 21:27:19	1.2
  +++ RegularExpression.java	2001/11/06 11:08:34	1.3
  @@ -70,26 +70,26 @@
    * that will be used.
    *
    * <pre>
  - * For jdk  <= 1.3, there are two available implementations:
  + * For jdk  &lt;= 1.3, there are two available implementations:
    *   org.apache.tools.ant.util.regexp.JakartaOroRegexp (the default)
    *        Based on the jakarta-oro package
    *
    *   org.apache.tools.ant.util.regexp.JakartaRegexpRegexp
    *        Based on the jakarta-regexp package
    *
  - * For jdk <= 1.4, and additional implementation is available:
  + * For jdk &gt;= 1.4 an additional implementation is available:
    *   org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp
    *        Based on the jdk 1.4 built in regular expression package.
    * </pre>
    *
  - * @see org.apache.oro.regex.Perl5Compiler
  - * @see org.apache.regexp.RE
  - * @see java.util.regex.Pattern
  - *
    * <pre>
    *   &lt;regularexpression [ [id="id"] pattern="expression" | refid="id" ] 
    *   /&gt;
    * </pre>
  + *
  + * @see org.apache.oro.regex.Perl5Compiler
  + * @see org.apache.regexp.RE
  + * @see java.util.regex.Pattern
    *
    * @see org.apache.tools.ant.util.regexp.Regexp
    * @author Matthew Inger <a href="mailto:mattinger@mindless.com">mattinger@mindless.com</a>
  
  
  
  1.3       +2 -3      jakarta-ant/src/main/org/apache/tools/ant/types/Substitution.java
  
  Index: Substitution.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/Substitution.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Substitution.java	2001/10/28 21:27:19	1.2
  +++ Substitution.java	2001/11/06 11:08:34	1.3
  @@ -61,15 +61,14 @@
   
   /***
    * A regular expression substitution datatype.  It is an expression
  - * that is meant to replace a regular expression.  The syntax is the
  - * same as Perl5.
  - * @see org.apache.oro.text.regex.Perl5Substitition
  + * that is meant to replace a regular expression.
    *
    * <pre>
    *   &lt;substitition [ [id="id"] expression="expression" | refid="id" ] 
    *   /&gt;
    * </pre>
    *
  + * @see org.apache.oro.text.regex.Perl5Substitition
    * @author Matthew Inger <a href="mailto:mattinger@mindless.com">mattinger@mindless.com</a>
    */
   public class Substitution extends DataType
  
  
  

--
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