svn commit: r646500 - in /commons/sandbox/functor/trunk/src: main/java/org/apache/commons/functor/core/collection/TransformedIterator.java test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java

[mbenson]

Author: mbenson
Date: Wed Apr  9 12:39:39 2008
New Revision: 646500

URL: http://svn.apache.org/viewvc?rev=646500&view=rev
Log:
IllegalArgumentException more to-the-point than NPE

Modified:
    
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/TransformedIterator.java
    
commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java

Modified: 
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/TransformedIterator.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/TransformedIterator.java?rev=646500&r1=646499&r2=646500&view=diff
==============================================================================
--- 
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/TransformedIterator.java
 (original)
+++ 
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/TransformedIterator.java
 Wed Apr  9 12:39:39 2008
@@ -41,12 +41,14 @@
      * @param function to apply
      */
     public TransformedIterator(Iterator iterator, UnaryFunction function) {
-        if (null == iterator || null == function) {
-            throw new NullPointerException();
-        } else {
-            this.function = function;
-            this.iterator = iterator;
+        if (null == iterator) {
+            throw new IllegalArgumentException("Iterator argument was null");
         }
+        if (null == function) {
+            throw new IllegalArgumentException("filtering UnaryFunction 
argument was null");
+        }
+        this.function = function;
+        this.iterator = iterator;
     }
 
     // iterator methods

Modified: 
commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java?rev=646500&r1=646499&r2=646500&view=diff
==============================================================================
--- 
commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java
 (original)
+++ 
commons/sandbox/functor/trunk/src/test/java/org/apache/commons/functor/core/collection/TestTransformedIterator.java
 Wed Apr  9 12:39:39 2008
@@ -175,19 +175,19 @@
         try {
             new TransformedIterator(null,null);
             fail("ExpectedNullPointerException");
-        } catch(NullPointerException e) {
+        } catch(IllegalArgumentException e) {
             // expected
         }
         try {
             new TransformedIterator(null,negate);
             fail("ExpectedNullPointerException");
-        } catch(NullPointerException e) {
+        } catch(IllegalArgumentException e) {
             // expected
         }
         try {
             new TransformedIterator(list.iterator(),null);
             fail("ExpectedNullPointerException");
-        } catch(NullPointerException e) {
+        } catch(IllegalArgumentException e) {
             // expected
         }
     }