svn commit: r1090427 - in /commons/proper/lang/trunk/src: main/java/org/apache/commons/lang3/CharRange.java main/java/org/apache/commons/lang3/CharSet.java test/java/org/apache/commons/lang3/CharRangeTest.java

[ba...@apache.org]

Author: bayard
Date: Fri Apr  8 20:17:10 2011
New Revision: 1090427

URL: http://svn.apache.org/viewvc?rev=1090427&view=rev
Log:
Making CharRange non-public. LANG-689

Modified:
    commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/CharRange.java
    commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/CharSet.java
    commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/CharRangeTest.java

Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/CharRange.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/CharRange.java?rev=1090427&r1=1090426&r2=1090427&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/CharRange.java (original)
+++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/CharRange.java Fri Apr  8 20:17:10 2011
@@ -29,7 +29,9 @@ import java.util.NoSuchElementException;
  * @since 1.0
  * @version $Id$
  */
-public final class CharRange implements Iterable<Character>, Serializable {
+// TODO: This is no longer public and will be removed later as CharSet is moved 
+// to depend on Range.
+final class CharRange implements Iterable<Character>, Serializable {
 
     /**
      * Required for serialization support. Lang version 2.0. 

Modified: commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/CharSet.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/CharSet.java?rev=1090427&r1=1090426&r2=1090427&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/CharSet.java (original)
+++ commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/CharSet.java Fri Apr  8 20:17:10 2011
@@ -206,7 +206,9 @@ public class CharSet implements Serializ
      * @return an array of immutable CharRange objects
      * @since 2.0
      */
-    public CharRange[] getCharRanges() {
+// NOTE: This is no longer public as CharRange is no longer a public class. 
+//       It may be replaced when CharSet moves to Range.
+    /*public*/ CharRange[] getCharRanges() {
         return set.toArray(new CharRange[set.size()]);
     }
 

Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/CharRangeTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/CharRangeTest.java?rev=1090427&r1=1090426&r2=1090427&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/CharRangeTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/CharRangeTest.java Fri Apr  8 20:17:10 2011
@@ -37,7 +37,8 @@ public class CharRangeTest extends TestC
 
     //-----------------------------------------------------------------------
     public void testClass() {
-        assertEquals(true, Modifier.isPublic(CharRange.class.getModifiers()));
+        // class changed to non-public in 3.0
+        assertEquals(false, Modifier.isPublic(CharRange.class.getModifiers()));
         assertEquals(true, Modifier.isFinal(CharRange.class.getModifiers()));
     }