commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scolebou...@apache.org
Subject cvs commit: jakarta-commons/lang RELEASE-NOTES.txt
Date Tue, 19 Aug 2003 00:21:46 GMT
scolebourne    2003/08/18 17:21:46

  Modified:    lang/src/java/org/apache/commons/lang CharSetUtils.java
               lang/src/test/org/apache/commons/lang CharSetUtilsTest.java
               lang     RELEASE-NOTES.txt
  Log:
  Remove evaluateSet(String) which is deprecated, but wasn't in 1.0.1
  
  Revision  Changes    Path
  1.24      +1 -30     jakarta-commons/lang/src/java/org/apache/commons/lang/CharSetUtils.java
  
  Index: CharSetUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/CharSetUtils.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- CharSetUtils.java	18 Aug 2003 02:22:22 -0000	1.23
  +++ CharSetUtils.java	19 Aug 2003 00:21:46 -0000	1.24
  @@ -91,35 +91,6 @@
        * </ul>
        * 
        * <pre>
  -     * CharSetUtils.evaluateSet(null)  = null
  -     * CharSetUtils.evaluateSet("")    = CharSet matching nothing
  -     * CharSetUtils.evaluateSet("a-e") = CharSet matching a,b,c,d,e
  -     * CharSetUtils.evaluateSet("abe-g") = CharSet matching a,b,e,f,g
  -     * </pre>
  -     *
  -     * @param setStr  the set, may be null
  -     * @return a CharSet instance, <code>null</code> if null input
  -     * @deprecated Use {@link CharSet#getInstance(String)}.
  -     *             Method will be removed in Commons Lang 3.0.
  -     */
  -    public static CharSet evaluateSet(String setStr) {
  -        if (setStr == null) {
  -            return null;
  -        }
  -        return CharSet.getInstance(setStr); 
  -    }
  -
  -    /**
  -     * <p>Creates a <code>CharSet</code> instance which allows a certain
amount of
  -     * set logic to be performed.</p>
  -     * <p>The syntax is:</p>
  -     * <ul>
  -     *  <li>&quot;aeio&quot; which implies 'a','e',..</li>
  -     *  <li>&quot;^e&quot; implies not e.</li>
  -     *  <li>&quot;ej-m&quot; implies e,j->m. e,j,k,l,m.</li>
  -     * </ul>
  -     * 
  -     * <pre>
        * CharSetUtils.evaluateSet(null)    = null
        * CharSetUtils.evaluateSet([])      = CharSet matching nothing
        * CharSetUtils.evaluateSet(["a-e"]) = CharSet matching a,b,c,d,e
  
  
  
  1.14      +1 -7      jakarta-commons/lang/src/test/org/apache/commons/lang/CharSetUtilsTest.java
  
  Index: CharSetUtilsTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/lang/src/test/org/apache/commons/lang/CharSetUtilsTest.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CharSetUtilsTest.java	18 Aug 2003 02:22:25 -0000	1.13
  +++ CharSetUtilsTest.java	19 Aug 2003 00:21:46 -0000	1.14
  @@ -104,12 +104,6 @@
       }
       
       //-----------------------------------------------------------------------
  -    public void testEvaluateSet_String() {
  -        assertEquals(null, CharSetUtils.evaluateSet((String) null));
  -        assertEquals("[]", CharSetUtils.evaluateSet("").toString());
  -        assertEquals("[a-e]", CharSetUtils.evaluateSet("a-e").toString());
  -    }
  -    
       public void testEvaluateSet_Stringarray() {
           assertEquals(null, CharSetUtils.evaluateSet((String[]) null));
           assertEquals("[]", CharSetUtils.evaluateSet(new String[0]).toString());
  
  
  
  1.25      +1 -2      jakarta-commons/lang/RELEASE-NOTES.txt
  
  Index: RELEASE-NOTES.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/lang/RELEASE-NOTES.txt,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- RELEASE-NOTES.txt	18 Aug 2003 02:35:16 -0000	1.24
  +++ RELEASE-NOTES.txt	19 Aug 2003 00:21:46 -0000	1.25
  @@ -524,7 +524,6 @@
   
   org.apache.commons.lang.CharSetUtils
   --------------------
  ->     public static org.apache.commons.lang.CharSet evaluateSet(java.lang.String);
   >     public static java.lang.String keep(java.lang.String, java.lang.String);
   >     public static java.lang.String keep(java.lang.String, java.lang.String[]);
   
  
  
  

Mime
View raw message