Author: jdonnerstag
Date: Fri Dec 3 21:43:10 2010
New Revision: 1042018
URL: http://svn.apache.org/viewvc?rev=1042018&view=rev
Log:
don't use @see upperClass when javadoc inheritance is sufficient
Issue: WICKET-3221
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java?rev=1042018&r1=1042017&r2=1042018&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/CreditCardValidator.java
Fri Dec 3 21:43:10 2010
@@ -37,34 +37,50 @@ public class CreditCardValidator extends
{
private static final long serialVersionUID = 1L;
- /** The ID which represents the credit card institute. */
- private int cardId = -1;
-
/** */
- public static final int INVALID = -1;
- public static final int AMERICAN_EXPRESS = 0;
- public static final int CHINA_UNIONPAY = 1;
- public static final int DINERS_CLUB_CARTE_BLANCHE = 2;
- public static final int DINERS_CLUB_INTERNATIONAL = 3;
- public static final int DINERS_CLUB_US_AND_CANADA = 4;
- public static final int DISCOVER_CARD = 5;
- public static final int JCB = 6;
- public static final int LASER = 7;
- public static final int MAESTRO = 8;
- public static final int MASTERCARD = 9;
- public static final int SOLO = 10;
- public static final int SWITCH = 11;
- public static final int VISA = 12;
- public static final int VISA_ELECTRON = 13;
-
- private static final String[] creditCardNames = { "American Express",
"China UnionPay",
- "Diners Club Carte Blanche", "Diners Club
International", "Diners Club US & Canada",
- "Discover Card", "JCB", "Laser", "Maestro",
"MasterCard", "Solo", "Switch", "Visa",
- "Visa Electron" };
+ public static enum CreditCard {
+ /** */
+ INVALID(null),
+ /** */
+ AMERICAN_EXPRESS("American Express"),
+ /** */
+ CHINA_UNIONPAY("China UnionPay"),
+ /** */
+ DINERS_CLUB_CARTE_BLANCHE("Diners Club Carte Blanche"),
+ /** */
+ DINERS_CLUB_INTERNATIONAL("Diners Club International"),
+ /** */
+ DINERS_CLUB_US_AND_CANADA("Diners Club US & Canada"),
+ /** */
+ DISCOVER_CARD("Discover Card"),
+ /** */
+ JCB("JCB"),
+ /** */
+ LASER("Laser"),
+ /** */
+ MAESTRO("Maestro"),
+ /** */
+ MASTERCARD("MasterCard"),
+ /** */
+ SOLO("Solo"),
+ /** */
+ SWITCH("Switch"),
+ /** */
+ VISA("Visa"),
+ /** */
+ VISA_ELECTRON("Visa Electron");
+
+ private final String name;
+
+ CreditCard(String name)
+ {
+ this.name = name;
+ }
+ }
+
+ /** The ID which represents the credit card institute. */
+ private CreditCard cardId = CreditCard.INVALID;
- /**
- * @see AbstractValidator#onValidate(IValidatable)
- */
@Override
protected void onValidate(IValidatable<String> validatable)
{
@@ -195,7 +211,7 @@ public class CreditCardValidator extends
*/
private boolean isAmericanExpress(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if (creditCardNumber.length() == 15 &&
@@ -203,7 +219,7 @@ public class CreditCardValidator extends
{
if (isChecksumCorrect(creditCardNumber))
{
- cardId = CreditCardValidator.AMERICAN_EXPRESS;
+ cardId = CreditCard.AMERICAN_EXPRESS;
returnValue = true;
}
}
@@ -224,7 +240,7 @@ public class CreditCardValidator extends
*/
private boolean isChinaUnionPay(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if ((creditCardNumber.length() >= 16 &&
creditCardNumber.length() <= 19) &&
@@ -233,7 +249,7 @@ public class CreditCardValidator extends
int firstDigits =
Integer.parseInt(creditCardNumber.substring(0, 5));
if (firstDigits >= 622126 && firstDigits <= 622925)
{
- cardId = CreditCardValidator.CHINA_UNIONPAY;
+ cardId = CreditCard.CHINA_UNIONPAY;
returnValue = true;
}
}
@@ -253,7 +269,7 @@ public class CreditCardValidator extends
*/
private boolean isDinersClubCarteBlanche(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if (creditCardNumber.length() == 14 &&
creditCardNumber.startsWith("30"))
@@ -261,7 +277,7 @@ public class CreditCardValidator extends
int firstDigits =
Integer.parseInt(creditCardNumber.substring(0, 3));
if (firstDigits >= 300 && firstDigits <= 305 &&
isChecksumCorrect(creditCardNumber))
{
- cardId =
CreditCardValidator.DINERS_CLUB_CARTE_BLANCHE;
+ cardId = CreditCard.DINERS_CLUB_CARTE_BLANCHE;
returnValue = true;
}
}
@@ -281,13 +297,13 @@ public class CreditCardValidator extends
*/
private boolean isDinersClubInternational(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if (creditCardNumber.length() == 14 &&
creditCardNumber.startsWith("36") &&
isChecksumCorrect(creditCardNumber))
{
- cardId = CreditCardValidator.DINERS_CLUB_INTERNATIONAL;
+ cardId = CreditCard.DINERS_CLUB_INTERNATIONAL;
returnValue = true;
}
@@ -306,14 +322,14 @@ public class CreditCardValidator extends
*/
private boolean isDinersClubUsAndCanada(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if (creditCardNumber.length() == 16 &&
(creditCardNumber.startsWith("54") ||
creditCardNumber.startsWith("55")) &&
isChecksumCorrect(creditCardNumber))
{
- cardId = CreditCardValidator.DINERS_CLUB_US_AND_CANADA;
+ cardId = CreditCard.DINERS_CLUB_US_AND_CANADA;
returnValue = true;
}
@@ -332,7 +348,7 @@ public class CreditCardValidator extends
*/
private boolean isDiscoverCard(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if (creditCardNumber.length() == 16 &&
creditCardNumber.startsWith("6") &&
@@ -344,7 +360,7 @@ public class CreditCardValidator extends
(firstThreeDigits >= 644 && firstThreeDigits <=
649) ||
(firstSixDigits >= 622126 && firstSixDigits <=
622925))
{
- cardId = CreditCardValidator.DISCOVER_CARD;
+ cardId = CreditCard.DISCOVER_CARD;
returnValue = true;
}
}
@@ -363,7 +379,7 @@ public class CreditCardValidator extends
*/
private boolean isJCB(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if (creditCardNumber.length() == 16 &&
isChecksumCorrect(creditCardNumber))
@@ -371,7 +387,7 @@ public class CreditCardValidator extends
int firstFourDigits =
Integer.parseInt(creditCardNumber.substring(0, 4));
if (firstFourDigits >= 3528 && firstFourDigits <= 3589)
{
- cardId = CreditCardValidator.JCB;
+ cardId = CreditCard.JCB;
returnValue = true;
}
}
@@ -391,7 +407,7 @@ public class CreditCardValidator extends
*/
private boolean isLaser(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if (creditCardNumber.length() >= 16 &&
creditCardNumber.length() <= 19 &&
@@ -400,7 +416,7 @@ public class CreditCardValidator extends
if (creditCardNumber.startsWith("6304") ||
creditCardNumber.startsWith("6706") ||
creditCardNumber.startsWith("6771") ||
creditCardNumber.startsWith("6709"))
{
- cardId = CreditCardValidator.LASER;
+ cardId = CreditCard.LASER;
returnValue = true;
}
}
@@ -420,7 +436,7 @@ public class CreditCardValidator extends
*/
private boolean isMaestro(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if (creditCardNumber.length() >= 12 &&
creditCardNumber.length() <= 19 &&
@@ -431,7 +447,7 @@ public class CreditCardValidator extends
creditCardNumber.startsWith("6759") ||
creditCardNumber.startsWith("6761") ||
creditCardNumber.startsWith("6763"))
{
- cardId = CreditCardValidator.MAESTRO;
+ cardId = CreditCard.MAESTRO;
returnValue = true;
}
}
@@ -450,7 +466,7 @@ public class CreditCardValidator extends
*/
private boolean isSolo(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if ((creditCardNumber.length() == 16 ||
creditCardNumber.length() == 18 || creditCardNumber.length() == 19) &&
@@ -458,7 +474,7 @@ public class CreditCardValidator extends
{
if (creditCardNumber.startsWith("6334") ||
creditCardNumber.startsWith("6767"))
{
- cardId = CreditCardValidator.SOLO;
+ cardId = CreditCard.SOLO;
returnValue = true;
}
}
@@ -478,7 +494,7 @@ public class CreditCardValidator extends
*/
private boolean isSwitch(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if ((creditCardNumber.length() == 16 ||
creditCardNumber.length() == 18 || creditCardNumber.length() == 19) &&
@@ -489,7 +505,7 @@ public class CreditCardValidator extends
creditCardNumber.startsWith("564182") ||
creditCardNumber.startsWith("633110") ||
creditCardNumber.startsWith("6333") ||
creditCardNumber.startsWith("6759"))
{
- cardId = CreditCardValidator.SWITCH;
+ cardId = CreditCard.SWITCH;
returnValue = true;
}
}
@@ -508,14 +524,14 @@ public class CreditCardValidator extends
*/
private boolean isVisa(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if (creditCardNumber.length() == 13 ||
creditCardNumber.length() == 16)
{
if (creditCardNumber.startsWith("4"))
{
- cardId = CreditCardValidator.SWITCH;
+ cardId = CreditCard.SWITCH;
returnValue = true;
}
}
@@ -535,14 +551,14 @@ public class CreditCardValidator extends
*/
private boolean isVisaElectron(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if (creditCardNumber.length() == 16 &&
(creditCardNumber.startsWith("417500") ||
creditCardNumber.startsWith("4917") ||
creditCardNumber.startsWith("4913") ||
creditCardNumber.startsWith("4508") || creditCardNumber.startsWith("4844")))
{
- cardId = CreditCardValidator.VISA_ELECTRON;
+ cardId = CreditCard.VISA_ELECTRON;
returnValue = true;
}
@@ -561,7 +577,7 @@ public class CreditCardValidator extends
*/
private boolean isMastercard(String creditCardNumber)
{
- cardId = CreditCardValidator.INVALID;
+ cardId = CreditCard.INVALID;
boolean returnValue = false;
if (creditCardNumber.length() == 16 &&
isChecksumCorrect(creditCardNumber))
@@ -569,7 +585,7 @@ public class CreditCardValidator extends
int firstTwoDigits =
Integer.parseInt(creditCardNumber.substring(0, 2));
if (firstTwoDigits >= 51 && firstTwoDigits <= 55)
{
- cardId = CreditCardValidator.MASTERCARD;
+ cardId = CreditCard.MASTERCARD;
returnValue = true;
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java?rev=1042018&r1=1042017&r2=1042018&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java
(original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/BehaviorUrlTest.java
Fri Dec 3 21:43:10 2010
@@ -30,7 +30,7 @@ import org.apache.wicket.util.resource.S
public class BehaviorUrlTest extends WicketTestCase
{
/**
- * @see https://issues.apache.org/jira/browse/WICKET-3097
+ * @see href https://issues.apache.org/jira/browse/WICKET-3097
*/
public void testUrlRemainsStable()
{
@@ -51,7 +51,7 @@ public class BehaviorUrlTest extends Wic
/**
* Asserting that the component model assigning don't affect the
behavior data index
*
- * @see https://issues.apache.org/jira/browse/WICKET-3142
+ * @see href https://issues.apache.org/jira/browse/WICKET-3142
*/
public void testUrlRemainsStableAfterComponentReceiveAnModel()
{
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java?rev=1042018&r1=1042017&r2=1042018&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ComponentWithLazyModelCreationTest.java
Fri Dec 3 21:43:10 2010
@@ -31,7 +31,7 @@ import org.apache.wicket.util.resource.I
import org.apache.wicket.util.resource.StringResourceStream;
/**
- * @see https://issues.apache.org/jira/browse/WICKET3142
+ * @see href https://issues.apache.org/jira/browse/WICKET3142
*/
public class ComponentWithLazyModelCreationTest extends WicketTestCase
{
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java?rev=1042018&r1=1042017&r2=1042018&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormWithMultipleButtonsTest.java
Fri Dec 3 21:43:10 2010
@@ -61,7 +61,7 @@ public class FormWithMultipleButtonsTest
}
/**
- * @see https://issues.apache.org/jira/browse/WICKET-1894
+ * @see href https://issues.apache.org/jira/browse/WICKET-1894
*/
public void testAjaxFallbackButtonInvokedFirst()
{
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java?rev=1042018&r1=1042017&r2=1042018&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java
Fri Dec 3 21:43:10 2010
@@ -83,7 +83,7 @@ public class MarkupFragmentTest extends
}
/**
- * @see WICKET-3111
+ * @see href http://issues.apache.org/jira/browse/WICKET-3111
*
* @throws Exception
*/
