You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oro-dev@jakarta.apache.org by df...@locus.apache.org on 2000/11/24 06:39:14 UTC

cvs commit: jakarta-oro/src/java/org/apache/oro/text/regex Util.java

dfs         00/11/23 21:39:14

  Modified:    build    build-oro.xml
               src/java/org/apache/oro/text/regex Util.java
  Log:
  Updated build version to 2.0.2-dev-1.
  Changed org.apache.oro.text.regex.Util.split to accept a Collection instead
  of a List to store results.  This makes it more generic and doesn't break
  any existing code.
  
  Revision  Changes    Path
  1.5       +2 -2      jakarta-oro/build/build-oro.xml
  
  Index: build-oro.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-oro/build/build-oro.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build-oro.xml	2000/11/24 05:13:55	1.4
  +++ build-oro.xml	2000/11/24 05:39:13	1.5
  @@ -1,5 +1,5 @@
   <?xml version="1.0"?>
  -<!-- $Id: build-oro.xml,v 1.4 2000/11/24 05:13:55 dfs Exp $ -->
  +<!-- $Id: build-oro.xml,v 1.5 2000/11/24 05:39:13 dfs Exp $ -->
   
   <project name="Jakarta-ORO" default="main" basedir=".">
   
  @@ -8,7 +8,7 @@
   <target name="init">
     <property name="Name" value="Jakarta-ORO"/>
     <property name="year" value="2000"/>
  -  <property name="version" value="2.0.1"/>
  +  <property name="version" value="2.0.2-dev-1"/>
     <property name="project" value="jakarta-oro"/>
     <property name="build.compiler" value="classic"/>
     <property name="code.src" value="../src"/>
  
  
  
  1.4       +10 -10    jakarta-oro/src/java/org/apache/oro/text/regex/Util.java
  
  Index: Util.java
  ===================================================================
  RCS file: /home/cvs/jakarta-oro/src/java/org/apache/oro/text/regex/Util.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Util.java	2000/09/15 05:17:24	1.3
  +++ Util.java	2000/11/24 05:39:14	1.4
  @@ -85,7 +85,7 @@
    * </ol>
   
    @author <a href="mailto:dfs@savarese.org">Daniel F. Savarese</a>
  - @version $Id: Util.java,v 1.3 2000/09/15 05:17:24 dfs Exp $
  + @version $Id: Util.java,v 1.4 2000/11/24 05:39:14 dfs Exp $
   
    * @see Pattern
    * @see PatternMatcher
  @@ -138,7 +138,7 @@
      * {@link org.apache.oro.text.perl.Perl5Util#split}.
      * </ul>
      * <p>
  -   * @param results A List to which the split results are appended.
  +   * @param results A Collection to which the split results are appended.
      *         After the method returns, it contains the substrings of the input
      *         that occur between the regular expression delimiter occurences.
      *         The input will not be split into any more substrings than the
  @@ -157,7 +157,7 @@
      *               behavior associated with non-positive limit values.
      * @return A <code>Vector</code>
      */
  -  public static void split(List results, PatternMatcher matcher,
  +  public static void split(Collection results, PatternMatcher matcher,
   			   Pattern pattern, String input, int limit)
     {
       int beginOffset;
  @@ -180,7 +180,7 @@
   
     /**
      * Splits up a <code>String</code> instance and stores results as a
  -   * <code>List</code> of all its substrings using a regular expression
  +   * <code>Collection</code> of all its substrings using a regular expression
      * as the delimiter.
      * This method is inspired by the Perl split() function and behaves 
      * identically to it when used in conjunction with the Perl5Matcher and
  @@ -205,14 +205,14 @@
      * split(matcher, pattern, input, Util.SPLIT_ALL);
      * </pre></blockquote>
      * <p>
  -   * @param results A <code>List</code> to which all the substrings of
  +   * @param results A <code>Collection</code> to which all the substrings of
      *         the input that occur between the regular expression delimiter
      *         occurences are appended.
      * @param matcher The regular expression matcher to execute the split.
      * @param pattern The regular expression to use as a split delimiter.
      * @param input  The <code>String</code> to split.
      */
  -  public static void split(List results,  PatternMatcher matcher,
  +  public static void split(Collection results,  PatternMatcher matcher,
   			   Pattern pattern, String input)
     {
       split(results, matcher, pattern, input, SPLIT_ALL);
  @@ -243,8 +243,8 @@
      * {@link org.apache.oro.text.perl.Perl5Util#split}.
      * </ul>
      * <p>
  -   * @deprecated Use {@link #split(List, PatternMatcher, Pattern, String, int)}
  -   *             instead.
  +   * @deprecated Use 
  +   *  {@link #split(Collection, PatternMatcher, Pattern, String, int)} instead.
      * @param matcher The regular expression matcher to execute the split.
      * @param pattern The regular expression to use as a split delimiter.
      * @param input  The <code>String</code> to split.
  @@ -299,8 +299,8 @@
      * split(matcher, pattern, input, Util.SPLIT_ALL);
      * </pre></blockquote>
      * <p>
  -   * @deprecated Use {@link #split(List, PatternMatcher, Pattern, String)}
  -   *             instead.
  +   * @deprecated Use 
  +   * {@link #split(Collection, PatternMatcher, Pattern, String)} instead.
      * @param matcher The regular expression matcher to execute the split.
      * @param pattern The regular expression to use as a split delimiter.
      * @param input  The <code>String</code> to split.