svn commit: r1651483 - /commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java

[britter]

Author: britter
Date: Tue Jan 13 20:44:10 2015
New Revision: 1651483

URL: http://svn.apache.org/r1651483
Log:
Generics and enhanced for loops

Modified:
    
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java

Modified: 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
URL: 
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java?rev=1651483&r1=1651482&r2=1651483&view=diff
==============================================================================
--- 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
 (original)
+++ 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/routines/CreditCardValidator.java
 Tue Jan 13 20:44:10 2015
@@ -19,6 +19,7 @@ package org.apache.commons.validator.rou
 import org.apache.commons.validator.routines.checkdigit.CheckDigit;
 import org.apache.commons.validator.routines.checkdigit.LuhnCheckDigit;
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.List;
 import java.util.ArrayList;
 
@@ -99,7 +100,7 @@ public class CreditCardValidator impleme
     /**
      * The CreditCardTypes that are allowed to pass validation.
      */
-    private final List cardTypes = new ArrayList();
+    private final List<CodeValidator> cardTypes = new 
ArrayList<CodeValidator>();
 
     /**
      * Luhn checkdigit validator for the card numbers.
@@ -169,9 +170,7 @@ public class CreditCardValidator impleme
         if (creditCardValidators == null) {
             throw new IllegalArgumentException("Card validators are missing");
         }
-        for (int i = 0; i < creditCardValidators.length; i++) {
-            cardTypes.add(creditCardValidators[i]);
-        }
+        Collections.addAll(cardTypes, creditCardValidators);
     }
 
     /**
@@ -183,9 +182,8 @@ public class CreditCardValidator impleme
         if (card == null || card.length() == 0) {
             return false;
         }
-        for (int i = 0; i < cardTypes.size(); i++) {
-            CodeValidator type = (CodeValidator)cardTypes.get(i);
-            if (type.isValid(card)) {
+        for (CodeValidator cardType : cardTypes) {
+            if (cardType.isValid(card)) {
                 return true;
             }
         }
@@ -203,11 +201,10 @@ public class CreditCardValidator impleme
             return null;
         }
         Object result = null;
-        for (int i = 0; i < cardTypes.size(); i++) {
-            CodeValidator type = (CodeValidator)cardTypes.get(i);
-            result = type.validate(card);
+        for (CodeValidator cardType : cardTypes) {
+            result = cardType.validate(card);
             if (result != null) {
-                return result ;
+                return result;
             }
         }
         return null;