You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/10/20 18:13:23 UTC
svn commit: r1186881 -
/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/
Author: struberg
Date: Thu Oct 20 16:13:22 2011
New Revision: 1186881
URL: http://svn.apache.org/viewvc?rev=1186881&view=rev
Log:
MFCOMMONS-40 fix checkstyle rules for mf-commons-validator
Modified:
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCSVValidator.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCreditCardValidator.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractRegExprValidator.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractUrlValidator.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/EmailValidator.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ISBNValidator.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidateDateRestrictionTagHandler.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTag.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedStateWrapper.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DateRestrictionRule.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DeltaStateHelper.java
myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_ValidatorRule.java
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCSVValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCSVValidator.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCSVValidator.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCSVValidator.java Thu Oct 20 16:13:22 2011
@@ -43,7 +43,8 @@ import org.apache.myfaces.commons.util.M
clazz = "org.apache.myfaces.commons.validator.CSVValidator",
tagClass = "org.apache.myfaces.commons.validator.ValidateCSVTag",
serialuidtag = "-8874279182242196266L")
-public abstract class AbstractCSVValidator extends ValidatorBase {
+public abstract class AbstractCSVValidator extends ValidatorBase
+{
/**
* <p>The standard converter id for this converter.</p>
*/
@@ -52,9 +53,15 @@ public abstract class AbstractCSVValidat
* <p>The message identifiers of the {@link FacesMessage} to be created if
* the check fails.</p>
*/
- public static final String CSV_NOT_STRING_MESSAGE_ID = "org.apache.myfaces.commons.validator.csv.NOT_STRING";
- public static final String CSV_INVALID_SEPARATOR_MESSAGE_ID = "org.apache.myfaces.commons.validator.csv.INVALID_SEPARATOR";
- public static final String CSV_SUFFIX_MESSAGE_ID = "org.apache.myfaces.commons.validator.csv.SUFFIX";
+ public static final String CSV_NOT_STRING_MESSAGE_ID
+ = "org.apache.myfaces.commons.validator.csv.NOT_STRING";
+
+ public static final String CSV_INVALID_SEPARATOR_MESSAGE_ID
+ = "org.apache.myfaces.commons.validator.csv.INVALID_SEPARATOR";
+
+ public static final String CSV_SUFFIX_MESSAGE_ID
+ = "org.apache.myfaces.commons.validator.csv.SUFFIX";
+
private static final String DEFAULT_SEPARATOR = ",";
/**
@@ -64,7 +71,7 @@ public abstract class AbstractCSVValidat
public abstract String getSubvalidatorId();
/**
- * @param the VALIDATOR_ID of the actual validator to be used
+ * @param subvalidatorId the VALIDATOR_ID of the actual validator to be used
*/
public abstract void setSubvalidatorId(String subvalidatorId);
@@ -77,48 +84,75 @@ public abstract class AbstractCSVValidat
public abstract String getSeparator();
/**
- * @param the separator character to separate values
+ * @param separator character to separate values
*/
public abstract void setSeparator(String separator);
- private FacesMessage addMessage(FacesMessage oldMsg, FacesMessage newMsg, int index, String suffixMessageKey) {
+ private FacesMessage addMessage(FacesMessage oldMsg, FacesMessage newMsg, int index, String suffixMessageKey)
+ {
if (oldMsg != null && newMsg.getSeverity().getOrdinal() < oldMsg.getSeverity().getOrdinal())
+ {
return oldMsg;
+ }
+
String summaryMessageText = null;
String detailMessageText = null;
- if (oldMsg == null || newMsg.getSeverity().getOrdinal() > oldMsg.getSeverity().getOrdinal()) {
+ if (oldMsg == null || newMsg.getSeverity().getOrdinal() > oldMsg.getSeverity().getOrdinal())
+ {
summaryMessageText = null;
detailMessageText = null;
}
- else {
+ else
+ {
summaryMessageText = oldMsg.getSummary();
detailMessageText = oldMsg.getDetail();
}
+
Object[] args = { Integer.valueOf(index + 1) };
FacesMessage suffixMessage = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, suffixMessageKey, args);
String summarySuffix = suffixMessage.getSummary();
String detailSuffix = suffixMessage.getDetail();
if (summarySuffix == null)
+ {
summarySuffix = detailSuffix;
+ }
else if (detailSuffix == null)
+ {
detailSuffix = summarySuffix;
+ }
String summary = newMsg.getSummary();
if (summaryMessageText == null)
+ {
summaryMessageText = summary + summarySuffix;
+ }
else
+ {
summaryMessageText += ", " + summary + summarySuffix;
+ }
String detail = newMsg.getDetail();
if (detailMessageText == null)
+ {
detailMessageText = detail + detailSuffix;
+ }
else
+ {
detailMessageText += ", " + detail + detailSuffix;
+ }
+
return new FacesMessage(newMsg.getSeverity(), summaryMessageText, detailMessageText);
}
- public void validate(FacesContext facesContext, UIComponent uiComponent, Object value) throws ValidatorException {
+ public void validate(FacesContext facesContext, UIComponent uiComponent, Object value) throws ValidatorException
+ {
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
@@ -127,38 +161,57 @@ public abstract class AbstractCSVValidat
String suffixMessageKey = getMessage();
if (suffixMessageKey == null)
+ {
suffixMessageKey = CSV_SUFFIX_MESSAGE_ID;
+ }
FacesMessage facesMsg = null;
// value must be a String
- if (!(value instanceof String)) {
+ if (!(value instanceof String))
+ {
Object[] args = { value };
- throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, CSV_NOT_STRING_MESSAGE_ID, args));
+ throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
+ CSV_NOT_STRING_MESSAGE_ID, args));
}
+
Validator validator = facesContext.getApplication().createValidator(getSubvalidatorId());
if (getSeparator() == null)
+ {
setSeparator(DEFAULT_SEPARATOR);
+ }
String[] values = null;
- try {
+ try
+ {
values = ((String)value).split(getSeparator());
}
- catch (PatternSyntaxException e) {
+ catch (PatternSyntaxException e)
+ {
Object[] args = { getSeparator() };
- throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, CSV_INVALID_SEPARATOR_MESSAGE_ID, args));
+ throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR,
+ CSV_INVALID_SEPARATOR_MESSAGE_ID, args));
}
// loop through the separated values and validate each one
- for (int i = 0; i < values.length; i++) {
- if (values[i].trim().length() == 0) {
+ for (int i = 0; i < values.length; i++)
+ {
+ if (values[i].trim().length() == 0)
+ {
continue;
}
- else try {
- validator.validate(facesContext, uiComponent, values[i]);
- }
- catch (ValidatorException e) {
- facesMsg = addMessage(facesMsg, e.getFacesMessage(), i, suffixMessageKey);
+ else
+ {
+ try
+ {
+ validator.validate(facesContext, uiComponent, values[i]);
+ }
+ catch (ValidatorException e)
+ {
+ facesMsg = addMessage(facesMsg, e.getFacesMessage(), i, suffixMessageKey);
+ }
}
}
if (facesMsg != null)
+ {
throw new ValidatorException(facesMsg);
+ }
}
}
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCompareToValidator.java Thu Oct 20 16:13:22 2011
@@ -99,7 +99,8 @@ import org.apache.myfaces.commons.util.M
* <ul>
* <li> Operator names should be localized.</li>
* <li> The default message key should be localized.</li>
- * <li> Perhaps an exception should be thrown if the two values are not Comparable and no Comparator is specified.</li>
+ * <li> Perhaps an exception should be thrown if the two values are not
+ * Comparable and no Comparator is specified.</li>
* </ul>
*
*
@@ -111,7 +112,8 @@ import org.apache.myfaces.commons.util.M
clazz = "org.apache.myfaces.commons.validator.CompareToValidator",
tagClass = "org.apache.myfaces.commons.validator.ValidateCompareToTag",
serialuidtag = "-8879289182242196266L")
-public abstract class AbstractCompareToValidator extends ValidatorBase {
+public abstract class AbstractCompareToValidator extends ValidatorBase
+{
/**
* <p>The standard converter id for this converter.</p>
*/
@@ -123,7 +125,8 @@ public abstract class AbstractCompareToV
*/
public static final String COMPARE_TO_MESSAGE_ID = "org.apache.myfaces.commons.validator.CompareTo.INVALID";
- public AbstractCompareToValidator(){
+ public AbstractCompareToValidator()
+ {
super();
}
@@ -146,33 +149,57 @@ public abstract class AbstractCompareToV
protected String getOperatorForString(String operatorSpecified)
{
if (OPERATOR_EQUALS.equalsIgnoreCase(operatorSpecified))
+ {
return OPERATOR_EQUALS;
+ }
else if (OPERATOR_NOT_EQUALS.equalsIgnoreCase(operatorSpecified))
+ {
return OPERATOR_NOT_EQUALS;
+ }
else if (OPERATOR_GREATER_THAN.equalsIgnoreCase(operatorSpecified))
+ {
return OPERATOR_GREATER_THAN;
+ }
else if (OPERATOR_LESS_THAN.equalsIgnoreCase(operatorSpecified))
+ {
return OPERATOR_LESS_THAN;
+ }
else if (OPERATOR_GREATER_THAN_OR_EQUALS.equalsIgnoreCase(operatorSpecified))
+ {
return OPERATOR_GREATER_THAN_OR_EQUALS;
+ }
else if (OPERATOR_LESS_THAN_OR_EQUALS.equalsIgnoreCase(operatorSpecified))
+ {
return OPERATOR_LESS_THAN_OR_EQUALS;
-
+ }
else if (OPERATOR_EQUALS_ALT.equalsIgnoreCase(operatorSpecified))
+ {
return OPERATOR_EQUALS;
+ }
else if (OPERATOR_NOT_EQUALS_ALT.equalsIgnoreCase(operatorSpecified))
+ {
return OPERATOR_NOT_EQUALS;
+ }
else if (OPERATOR_GREATER_THAN_ALT.equalsIgnoreCase(operatorSpecified))
+ {
return OPERATOR_GREATER_THAN;
+ }
else if (OPERATOR_LESS_THAN_ALT.equalsIgnoreCase(operatorSpecified))
+ {
return OPERATOR_LESS_THAN;
+ }
else if (OPERATOR_GREATER_THAN_OR_EQUALS_ALT.equalsIgnoreCase(operatorSpecified))
+ {
return OPERATOR_GREATER_THAN_OR_EQUALS;
+ }
else if (OPERATOR_LESS_THAN_OR_EQUALS_ALT.equalsIgnoreCase(operatorSpecified))
+ {
return OPERATOR_LESS_THAN_OR_EQUALS;
-
+ }
else if (OPERATOR_EQUALS_ALT2.equalsIgnoreCase(operatorSpecified))
+ {
return OPERATOR_EQUALS;
+ }
throw new IllegalStateException("Operator has unknown value of '" + operatorSpecified + "'");
}
@@ -180,17 +207,29 @@ public abstract class AbstractCompareToV
protected String nameForOperator(String operator)
{
if (OPERATOR_EQUALS.equals(operator))
+ {
return "equal to";
+ }
else if (OPERATOR_NOT_EQUALS.equals(operator))
+ {
return "inequal to";
+ }
else if (OPERATOR_GREATER_THAN.equals(operator))
+ {
return "greater than";
+ }
else if (OPERATOR_LESS_THAN.equals(operator))
+ {
return "less than";
+ }
else if (OPERATOR_GREATER_THAN_OR_EQUALS.equals(operator))
+ {
return "greater than or equal to";
+ }
else if (OPERATOR_LESS_THAN_OR_EQUALS.equals(operator))
+ {
return "less than or equal to";
+ }
throw new IllegalStateException("Operator has unknown value of '" + operator + "'");
}
@@ -198,17 +237,29 @@ public abstract class AbstractCompareToV
protected boolean validateOperatorOnComparisonResult(String operator, int result)
{
if (OPERATOR_EQUALS.equals(operator))
+ {
return result == 0;
+ }
else if (OPERATOR_NOT_EQUALS.equals(operator))
+ {
return result != 0;
+ }
else if (OPERATOR_GREATER_THAN.equals(operator))
+ {
return result > 0;
+ }
else if (OPERATOR_LESS_THAN.equals(operator))
+ {
return result < 0;
+ }
else if (OPERATOR_GREATER_THAN_OR_EQUALS.equals(operator))
+ {
return result >= 0;
+ }
else if (OPERATOR_LESS_THAN_OR_EQUALS.equals(operator))
+ {
return result <= 0;
+ }
throw new IllegalStateException("Operator has unknown value of '" + operator + "'");
}
@@ -217,10 +268,18 @@ public abstract class AbstractCompareToV
FacesContext facesContext,
UIComponent uiComponent,
Object value)
- throws ValidatorException {
+ throws ValidatorException
+ {
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
// Don't perform validation if the value is null
if (value == null)
@@ -229,20 +288,30 @@ public abstract class AbstractCompareToV
}
String foreignComponentName = getFor();
- foreignComponentName = (foreignComponentName != null && foreignComponentName.length() > 0) ? foreignComponentName : getForId();
- if (foreignComponentName == null) {
+ foreignComponentName = (foreignComponentName != null && foreignComponentName.length() > 0)
+ ? foreignComponentName
+ : getForId();
+ if (foreignComponentName == null)
+ {
throw new FacesException("No id set to compare. Use 'for' in jsp mode and 'forId' in facelets mode");
}
UIComponent foreignComponent = (UIComponent) uiComponent.getParent().findComponent(foreignComponentName);
if(foreignComponent == null)
- throw new FacesException("Unable to find component '" + foreignComponentName + "' (calling findComponent on component '" + uiComponent.getId() + "')");
+ {
+ throw new FacesException("Unable to find component '" + foreignComponentName
+ + "' (calling findComponent on component '" + uiComponent.getId() + "')");
+ }
if(false == foreignComponent instanceof EditableValueHolder)
- throw new FacesException("Component '" + foreignComponent.getId() + "' does not implement EditableValueHolder");
+ {
+ throw new FacesException("Component '" + foreignComponent.getId()
+ + "' does not implement EditableValueHolder");
+ }
EditableValueHolder foreignEditableValueHolder = (EditableValueHolder)foreignComponent;
- if (foreignEditableValueHolder.isRequired() && foreignEditableValueHolder.getValue()== null ) {
+ if (foreignEditableValueHolder.isRequired() && foreignEditableValueHolder.getValue()== null )
+ {
return;
}
@@ -280,16 +349,20 @@ public abstract class AbstractCompareToV
String operator = getOperatorForString(getOperator());
String alternateOperatorName = getAlternateOperatorName();
- Object[] args = {
+ Object[] args =
+ {
uiComponent.getId(),
value.toString(),
(alternateOperatorName == null) ? nameForOperator(operator) : alternateOperatorName,
foreignComponent.getId(),
foreignValue.toString()
- };
+ };
String message = getMessage();
- if (null == message) message = COMPARE_TO_MESSAGE_ID;
+ if (null == message)
+ {
+ message = COMPARE_TO_MESSAGE_ID;
+ }
Comparator comparator = createComparator();
@@ -317,13 +390,15 @@ public abstract class AbstractCompareToV
}
else
{
- throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, message + ": " + exception.getLocalizedMessage(), args));
+ throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, message + ": "
+ + exception.getLocalizedMessage(), args));
}
}
}
else if (value instanceof Comparable)
{
- throw new ClassCastException(getClassCastExceptionMessage(foreignComponent.getId(), Comparable.class, foreignValue));
+ throw new ClassCastException(getClassCastExceptionMessage(foreignComponent.getId(),
+ Comparable.class, foreignValue));
}
else if (foreignValue instanceof Comparable)
{
@@ -334,15 +409,23 @@ public abstract class AbstractCompareToV
protected String getClassCastExceptionMessage(String name, Class clazz, Object object)
{
if (null == object)
+ {
return name + " must be type " + clazz + " but is null";
- else return name + " must be type " + clazz + " but is type " + object.getClass();
+ }
+ else
+ {
+ return name + " must be type " + clazz + " but is type " + object.getClass();
+ }
}
protected Comparator createComparator()
{
Object comparator = getComparator();
- if (null == comparator) return null;
+ if (null == comparator)
+ {
+ return null;
+ }
if (false == comparator instanceof Comparator)
{
@@ -386,7 +469,8 @@ public abstract class AbstractCompareToV
public abstract void setForId(String string);
/**
- * Operator for comparison: equals: eq, ==, =, not equals: ne, !=, greater than: gt, >, less than: lt, <, greater than or equals: ge, >=, less than or equals: le, <=
+ * Operator for comparison: equals: eq, ==, =, not equals: ne, !=, greater than: gt, >,
+ * less than: lt, <, greater than or equals: ge, >=, less than or equals: le, <=
*
* @return
*/
@@ -420,16 +504,25 @@ public abstract class AbstractCompareToV
private Renderer getRenderer(FacesContext context, UIComponent foreignComponent)
{
- if (context == null) throw new NullPointerException("context");
+ if (context == null)
+ {
+ throw new NullPointerException("context");
+ }
+
String rendererType = foreignComponent.getRendererType();
- if (rendererType == null) return null;
+ if (rendererType == null)
+ {
+ return null;
+ }
+
String renderKitId = context.getViewRoot().getRenderKitId();
RenderKitFactory rkf = (RenderKitFactory)FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
RenderKit renderKit = rkf.getRenderKit(context, renderKitId);
Renderer renderer = renderKit.getRenderer(foreignComponent.getFamily(), rendererType);
if (renderer == null)
{
- getFacesContext().getExternalContext().log("No Renderer found for component " + foreignComponent + " (component-family=" + foreignComponent.getFamily() + ", renderer-type=" + rendererType + ")");
+ getFacesContext().getExternalContext().log("No Renderer found for component " + foreignComponent
+ + " (component-family=" + foreignComponent.getFamily() + ", renderer-type=" + rendererType + ")");
}
return renderer;
}
@@ -441,17 +534,33 @@ public abstract class AbstractCompareToV
{
converter = ((ValueHolder)component).getConverter();
}
- if (converter != null) return converter;
+ if (converter != null)
+ {
+ return converter;
+ }
//Try to find out by value binding
ValueExpression vb = component.getValueExpression("value");
- if (vb == null) return null;
+ if (vb == null)
+ {
+ return null;
+ }
Class valueType = vb.getType(facesContext.getELContext());
- if (valueType == null) return null;
+ if (valueType == null)
+ {
+ return null;
+ }
+
+ if (String.class.equals(valueType))
+ {
+ return null; //No converter needed for String type
+ }
- if (String.class.equals(valueType)) return null; //No converter needed for String type
- if (Object.class.equals(valueType)) return null; //There is no converter for Object class
+ if (Object.class.equals(valueType))
+ {
+ return null; //There is no converter for Object class
+ }
try
{
@@ -501,7 +610,9 @@ public abstract class AbstractCompareToV
{
componentValueObject = submittedValue;
}
- }else{
+ }
+ else
+ {
componentValueObject = submittedValue;
}
}
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCreditCardValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCreditCardValidator.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCreditCardValidator.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractCreditCardValidator.java Thu Oct 20 16:13:22 2011
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.commons.validator;
-import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.validator.ValidatorException;
@@ -40,7 +39,8 @@ import org.apache.myfaces.buildtools.mav
bodyContent = "empty",
tagClass = "org.apache.myfaces.commons.validator.ValidateCreditCardTag",
serialuidtag = "3810660506302799072L")
-public abstract class AbstractCreditCardValidator extends ValidatorBase {
+public abstract class AbstractCreditCardValidator extends ValidatorBase
+{
/**
* <p>The standard converter id for this converter.</p>
@@ -48,12 +48,13 @@ public abstract class AbstractCreditCard
public static final String VALIDATOR_ID = "org.apache.myfaces.commons.validator.CreditCard";
/**
- * <p>The message identifier of the {@link FacesMessage} to be created if
+ * <p>The message identifier of the {@link javax.faces.application.FacesMessage} to be created if
* the creditcard check fails.</p>
*/
public static final String CREDITCARD_MESSAGE_ID = "org.apache.myfaces.commons.validator.Creditcard.INVALID";
- public AbstractCreditCardValidator(){
+ public AbstractCreditCardValidator()
+ {
}
//Field, to init the desired Validator
@@ -68,17 +69,26 @@ public abstract class AbstractCreditCard
FacesContext facesContext,
UIComponent uiComponent,
Object value)
- throws ValidatorException {
+ throws ValidatorException
+ {
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
- if (value == null)
- {
- return;
- }
+ if (value == null)
+ {
+ return;
+ }
initValidator();
- if (!this.creditCardValidator.isValid(value.toString())){
+ if (!this.creditCardValidator.isValid(value.toString()))
+ {
Object[] args = {value.toString()};
throw new ValidatorException(getFacesMessage(CREDITCARD_MESSAGE_ID, args));
}
@@ -91,12 +101,16 @@ public abstract class AbstractCreditCard
* <p>initializes the desired validator.</p>
*/
- private void initValidator() {
- if(isNone()){
+ private void initValidator()
+ {
+ if(isNone())
+ {
//no cardtypes are allowed
- creditCardValidator = new org.apache.commons.validator.CreditCardValidator(org.apache.commons.validator.CreditCardValidator.NONE);
+ creditCardValidator = new org.apache.commons.validator.CreditCardValidator(
+ org.apache.commons.validator.CreditCardValidator.NONE);
}
- else{
+ else
+ {
computeValidators();
creditCardValidator = new org.apache.commons.validator.CreditCardValidator(_initSum);
}
@@ -105,17 +119,22 @@ public abstract class AbstractCreditCard
/**
* private methode, that counts the desired creditCards
*/
- private void computeValidators(){
- if(isAmex()){
+ private void computeValidators()
+ {
+ if(isAmex())
+ {
this._initSum= org.apache.commons.validator.CreditCardValidator.AMEX + _initSum;
}
- if(isVisa()){
+ if(isVisa())
+ {
this._initSum= org.apache.commons.validator.CreditCardValidator.VISA+ _initSum;
}
- if(isMastercard()){
+ if(isMastercard())
+ {
this._initSum= org.apache.commons.validator.CreditCardValidator.MASTERCARD+ _initSum;
}
- if(isDiscover()){
+ if(isDiscover())
+ {
this._initSum= org.apache.commons.validator.CreditCardValidator.DISCOVER+ _initSum;
}
}
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java Thu Oct 20 16:13:22 2011
@@ -32,7 +32,6 @@ import javax.faces.component.ValueHolder
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.DateTimeConverter;
-import javax.faces.validator.Validator;
import javax.faces.validator.ValidatorException;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
@@ -54,7 +53,8 @@ import org.apache.myfaces.commons.valida
public abstract class AbstractDateRestrictionValidator extends ValidatorBase
{
- public static final String VALIDATOR_ID = "org.apache.myfaces.commons.validator.DateRestriction";
+ public static final String VALIDATOR_ID
+ = "org.apache.myfaces.commons.validator.DateRestriction";
/**
* <p>The message identifier of the {@link javax.faces.application.FacesMessage}
@@ -64,7 +64,8 @@ public abstract class AbstractDateRestri
* which will be replaced by user input, component label and configured
* days value.</p>
*/
- public static final String DAY_MESSAGE_ID = "org.apache.myfaces.commons.validator.DateRestrictionValidator.DAY";
+ public static final String DAY_MESSAGE_ID
+ = "org.apache.myfaces.commons.validator.DateRestrictionValidator.DAY";
/**
* <p>The message identifier of the {@link javax.faces.application.FacesMessage}
@@ -74,7 +75,8 @@ public abstract class AbstractDateRestri
* which will be replaced by user input, component label and configured
* month value.</p>
*/
- public static final String MONTH_MESSAGE_ID = "org.apache.myfaces.commons.validator.DateRestrictionValidator.MONTH";
+ public static final String MONTH_MESSAGE_ID
+ = "org.apache.myfaces.commons.validator.DateRestrictionValidator.MONTH";
/**
* <p>The message identifier of the {@link javax.faces.application.FacesMessage}
@@ -84,10 +86,11 @@ public abstract class AbstractDateRestri
* which will be replaced by user input, component label and configured
* weekdays value.</p>
*/
- public static final String WEEKDAY_MESSAGE_ID = "org.apache.myfaces.commons.validator.DateRestrictionValidator.WEEKDAY";
+ public static final String WEEKDAY_MESSAGE_ID
+ = "org.apache.myfaces.commons.validator.DateRestrictionValidator.WEEKDAY";
/**
- * Construct a {@link Validator} with no preconfigured limits.
+ * Construct a {@link javax.faces.validator.Validator} with no preconfigured limits.
*/
public AbstractDateRestrictionValidator()
{
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractRegExprValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractRegExprValidator.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractRegExprValidator.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractRegExprValidator.java Thu Oct 20 16:13:22 2011
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.commons.validator;
-import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.validator.ValidatorException;
@@ -41,34 +40,45 @@ import org.apache.myfaces.buildtools.mav
clazz = "org.apache.myfaces.commons.validator.RegExprValidator",
tagClass = "org.apache.myfaces.commons.validator.ValidateRegExprTag",
serialuidtag = "-449945949876262076L")
-public abstract class AbstractRegExprValidator extends ValidatorBase {
+public abstract class AbstractRegExprValidator extends ValidatorBase
+{
/**
* <p>The standard converter id for this converter.</p>
*/
public static final String VALIDATOR_ID = "org.apache.myfaces.commons.validator.RegExpr";
/**
- * <p>The message identifier of the {@link FacesMessage} to be created if
+ * <p>The message identifier of the {@link javax.faces.application.FacesMessage} to be created if
* the regex check fails.</p>
*/
public static final String REGEXPR_MESSAGE_ID = "org.apache.myfaces.commons.validator.RegExpr.INVALID";
- public AbstractRegExprValidator(){
+ public AbstractRegExprValidator()
+ {
}
public void validate(
FacesContext facesContext,
UIComponent uiComponent,
Object value)
- throws ValidatorException {
+ throws ValidatorException
+ {
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
- {
- return;
+ {
+ return;
}
+
Object[] args = {value.toString()};
String pattern = getPattern();
if (pattern == null)
@@ -79,7 +89,8 @@ public abstract class AbstractRegExprVal
{
pattern = getPatternExpression();
}
- if(!GenericValidator.matchRegexp(value.toString(),"^"+pattern+"$")){
+ if(!GenericValidator.matchRegexp(value.toString(),"^"+pattern+"$"))
+ {
throw new ValidatorException(getFacesMessage(REGEXPR_MESSAGE_ID, args));
}
}
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractUrlValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractUrlValidator.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractUrlValidator.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractUrlValidator.java Thu Oct 20 16:13:22 2011
@@ -19,7 +19,6 @@
package org.apache.myfaces.commons.validator;
-import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.validator.ValidatorException;
@@ -40,20 +39,21 @@ import org.apache.myfaces.buildtools.mav
clazz = "org.apache.myfaces.commons.validator.UrlValidator",
tagClass = "org.apache.myfaces.commons.validator.ValidateUrlTag",
serialuidtag = "6041422002721046221L")
-public abstract class AbstractUrlValidator extends ValidatorBase {
+public abstract class AbstractUrlValidator extends ValidatorBase
+{
/**
* <p>The standard converter id for this converter.</p>
*/
public static final String VALIDATOR_ID = "org.apache.myfaces.commons.validator.Url";
/**
- * <p>The message identifier of the {@link FacesMessage} to be created if
+ * <p>The message identifier of the {@link javax.faces.application.FacesMessage} to be created if
* the maximum length check fails.</p>
*/
public static final String URL_MESSAGE_ID = "org.apache.myfaces.commons.validator.Url.INVALID";
- public AbstractUrlValidator(){
-
+ public AbstractUrlValidator()
+ {
}
/**
@@ -64,11 +64,19 @@ public abstract class AbstractUrlValidat
FacesContext facesContext,
UIComponent uiComponent,
Object value)
- throws ValidatorException {
+ throws ValidatorException
+ {
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
@@ -77,7 +85,8 @@ public abstract class AbstractUrlValidat
org.apache.commons.validator.UrlValidator urlValidator = initValidator();
- if (!urlValidator.isValid(value.toString())) {
+ if (!urlValidator.isValid(value.toString()))
+ {
Object[] args = {value.toString()};
throw new ValidatorException(getFacesMessage(URL_MESSAGE_ID, args));
}
@@ -100,7 +109,8 @@ public abstract class AbstractUrlValidat
String [] schemesList = getSchemesList();
org.apache.commons.validator.UrlValidator urlValidator = null;
- if (schemesList == null){
+ if (schemesList == null)
+ {
urlValidator = new
org.apache.commons.validator.UrlValidator(options);
}
@@ -112,7 +122,8 @@ public abstract class AbstractUrlValidat
return urlValidator;
}
- private String[] getSchemesList(){
+ private String[] getSchemesList()
+ {
if (getSchemes() == null)
{
return null;
@@ -127,7 +138,7 @@ public abstract class AbstractUrlValidat
return resp;
}
- public abstract void setSchemes(String _schemes);
+ public abstract void setSchemes(String schemes);
/**
* CSV values that indicates the set of schemes to check this url.
@@ -140,7 +151,7 @@ public abstract class AbstractUrlValidat
@JSFProperty
public abstract String getSchemes();
- public abstract void setAllow2Slashes(boolean _allow2Slashes);
+ public abstract void setAllow2Slashes(boolean allow2Slashes);
/**
* Allow two slashes in the path component of the URL.
@@ -151,7 +162,7 @@ public abstract class AbstractUrlValidat
defaultValue = "false")
public abstract boolean isAllow2Slashes();
- public abstract void setAllowAllSchemas(boolean _allowAllSchemas);
+ public abstract void setAllowAllSchemas(boolean allowAllSchemas);
/**
* Allows all validly formatted schemes to pass validation instead of
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/EmailValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/EmailValidator.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/EmailValidator.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/EmailValidator.java Thu Oct 20 16:13:22 2011
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.commons.validator;
-import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.validator.ValidatorException;
@@ -40,19 +39,21 @@ import org.apache.myfaces.buildtools.mav
name = "mcv:validateEmail",
tagClass = "org.apache.myfaces.commons.validator.ValidateEmailTag",
serialuidtag = "6041422002721046221L")
-public class EmailValidator extends ValidatorBase {
+public class EmailValidator extends ValidatorBase
+{
/**
* <p>The standard converter id for this converter.</p>
*/
public static final String VALIDATOR_ID = "org.apache.myfaces.commons.validator.Email";
/**
- * <p>The message identifier of the {@link FacesMessage} to be created if
+ * <p>The message identifier of the {@link javax.faces.application.FacesMessage} to be created if
* the maximum length check fails.</p>
*/
public static final String EMAIL_MESSAGE_ID = "org.apache.myfaces.commons.validator.Email.INVALID";
- public EmailValidator(){
+ public EmailValidator()
+ {
}
/**
@@ -63,17 +64,25 @@ public class EmailValidator extends Vali
FacesContext facesContext,
UIComponent uiComponent,
Object value)
- throws ValidatorException {
-
+ throws ValidatorException
+ {
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
return;
}
- if (!GenericValidator.isEmail(value.toString().trim())) {
+
+ if (!GenericValidator.isEmail(value.toString().trim()))
+ {
Object[] args = {value.toString()};
throw new ValidatorException(getFacesMessage(EMAIL_MESSAGE_ID, args));
}
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ISBNValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ISBNValidator.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ISBNValidator.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ISBNValidator.java Thu Oct 20 16:13:22 2011
@@ -37,7 +37,8 @@ import org.apache.myfaces.commons.util.M
name = "mcv:validateISBN",
tagClass = "org.apache.myfaces.commons.validator.ValidateISBNTag",
serialuidtag = "5230653358032218656L")
-public class ISBNValidator extends ValidatorBase {
+public class ISBNValidator extends ValidatorBase
+{
/**
* <p>The standard converter id for this converter.</p>
@@ -54,7 +55,8 @@ public class ISBNValidator extends Valid
*/
private org.apache.commons.validator.ISBNValidator isbnValidator;
- public ISBNValidator(){
+ public ISBNValidator()
+ {
isbnValidator = new org.apache.commons.validator.ISBNValidator();
}
@@ -66,21 +68,32 @@ public class ISBNValidator extends Valid
FacesContext facesContext,
UIComponent uiComponent,
Object value)
- throws ValidatorException {
+ throws ValidatorException
+ {
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null)
+ {
+ throw new NullPointerException("facesContext");
+ }
+ if (uiComponent == null)
+ {
+ throw new NullPointerException("uiComponent");
+ }
if (value == null)
{
return;
}
- if (!isbnValidator.isValid( value.toString())) {
+ if (!isbnValidator.isValid( value.toString()))
+ {
Object[] args = {value.toString()};
String message = getMessage();
- if (null == message) message = ISBN_MESSAGE_ID;
+ if (null == message)
+ {
+ message = ISBN_MESSAGE_ID;
+ }
throw new ValidatorException(MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, message, args));
}
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidateDateRestrictionTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidateDateRestrictionTagHandler.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidateDateRestrictionTagHandler.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidateDateRestrictionTagHandler.java Thu Oct 20 16:13:22 2011
@@ -40,7 +40,7 @@ public class ValidateDateRestrictionTagH
{
MetaRuleset ruleSet = super.createMetaRuleset(type);
- ruleSet.addRule(_DateRestrictionRule.Instance);
+ ruleSet.addRule(_DateRestrictionRule.INSTANCE);
return ruleSet;
}
}
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java Thu Oct 20 16:13:22 2011
@@ -45,7 +45,8 @@ import org.apache.myfaces.commons.util.M
evaluateELOnExecution = true,
tagClass = "org.apache.myfaces.commons.validator.ValidatorBaseTag",
tagHandler = "org.apache.myfaces.commons.validator.ValidatorBaseTagHandler")
-public abstract class ValidatorBase implements PartialStateHolder, Validator {
+public abstract class ValidatorBase implements PartialStateHolder, Validator
+{
private boolean _transient = false;
@@ -68,7 +69,8 @@ public abstract class ValidatorBase impl
*
* @param message The summary message to be displayed.
*/
- public void setSummaryMessage(String message) {
+ public void setSummaryMessage(String message)
+ {
getStateHelper().put(PropertyKeys.summaryMessage, message);
}
@@ -80,7 +82,8 @@ public abstract class ValidatorBase impl
* @deprecated Use getDetailMessage()
*/
@JSFProperty
- public String getMessage() {
+ public String getMessage()
+ {
return getDetailMessage();
}
@@ -89,7 +92,8 @@ public abstract class ValidatorBase impl
* @param message The detail message to be displayed.
* @deprecated Use setDetailMessage()
*/
- public void setMessage(String message) {
+ public void setMessage(String message)
+ {
setDetailMessage(message);
}
@@ -101,7 +105,8 @@ public abstract class ValidatorBase impl
* @return The detail message.
*/
@JSFProperty
- public String getDetailMessage() {
+ public String getDetailMessage()
+ {
return (String) getStateHelper().eval(PropertyKeys.detailMessage);
}
@@ -109,7 +114,8 @@ public abstract class ValidatorBase impl
*
* @param message The detail message to be displayed.
*/
- public void setDetailMessage(String message) {
+ public void setDetailMessage(String message)
+ {
getStateHelper().put(PropertyKeys.detailMessage, message);
}
@@ -140,11 +146,13 @@ public abstract class ValidatorBase impl
getStateHelper().restoreState(context, state);
}
- public boolean isTransient() {
+ public boolean isTransient()
+ {
return _transient;
}
- public void setTransient(boolean newTransientValue) {
+ public void setTransient(boolean newTransientValue)
+ {
_transient = newTransientValue;
}
@@ -155,13 +163,16 @@ public abstract class ValidatorBase impl
* @param args Arguments for parsing this message.
* @return FacesMessage
*/
- protected FacesMessage getFacesMessage(String defaultMessage, Object[] args) {
+ protected FacesMessage getFacesMessage(String defaultMessage, Object[] args)
+ {
FacesMessage msg;
if (getSummaryMessage() == null && getDetailMessage() == null)
{
msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, defaultMessage, args);
- } else {
+ }
+ else
+ {
Locale locale = MessageUtils.getCurrentLocale();
String summaryText = MessageUtils.substituteParams(locale, getSummaryMessage(), args);
String detailText = MessageUtils.substituteParams(locale, getDetailMessage(), args);
@@ -175,12 +186,16 @@ public abstract class ValidatorBase impl
@SuppressWarnings("unchecked")
public ValueExpression getValueExpression(String name)
{
- if (name == null) throw new NullPointerException("name");
+ if (name == null)
+ {
+ throw new NullPointerException("name");
+ }
StateHelper helper = getStateHelper(false);
if (helper == null)
{
return null;
}
+
Map<String,Object> bindings = (Map<String,Object>) helper.get(PropertyKeys.bindings);
if (bindings == null)
{
@@ -194,10 +209,17 @@ public abstract class ValidatorBase impl
public void setValueExpression(String name, ValueExpression expression)
{
- if (name == null) throw new NullPointerException("name");
- if (expression == null) {
+ if (name == null)
+ {
+ throw new NullPointerException("name");
+ }
+
+ if (expression == null)
+ {
getStateHelper().remove(PropertyKeys.bindings, name);
- } else {
+ }
+ else
+ {
getStateHelper().put(PropertyKeys.bindings, name, expression);
}
}
@@ -235,7 +257,10 @@ public abstract class ValidatorBase impl
}
if (attachedObject == null)
+ {
return null;
+ }
+
// StateHolder interface should take precedence over
// List children
if (attachedObject instanceof StateHolder)
@@ -275,9 +300,14 @@ public abstract class ValidatorBase impl
public static Object restoreAttachedState(FacesContext context, Object stateObj) throws IllegalStateException
{
if (context == null)
+ {
throw new NullPointerException("context");
+ }
if (stateObj == null)
+ {
return null;
+ }
+
if (stateObj instanceof _AttachedListStateWrapper)
{
List<Object> lst = ((_AttachedListStateWrapper) stateObj).getWrappedStateList();
@@ -343,7 +373,8 @@ public abstract class ValidatorBase impl
_facesContext = facesContext;
}
- protected StateHelper getStateHelper() {
+ protected StateHelper getStateHelper()
+ {
return getStateHelper(true);
}
@@ -353,11 +384,14 @@ public abstract class ValidatorBase impl
* @param create if true a state helper is created if not already existing
* @return an implementation of the StateHelper interface or null if none exists and create is set to false
*/
- protected StateHelper getStateHelper(boolean create) {
- if(_stateHelper != null) {
+ protected StateHelper getStateHelper(boolean create)
+ {
+ if(_stateHelper != null)
+ {
return _stateHelper;
}
- if(create) {
+ if(create)
+ {
_stateHelper = new _DeltaStateHelper(this);
}
return _stateHelper;
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTag.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTag.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTag.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTag.java Thu Oct 20 16:13:22 2011
@@ -32,13 +32,15 @@ import javax.servlet.jsp.JspException;
* @author mkienenb (latest modification by $Author$)
* @version $Revision$
*/
-public abstract class ValidatorBaseTag extends ValidatorELTag {
+public abstract class ValidatorBaseTag extends ValidatorELTag
+{
private static final long serialVersionUID = 4416508071412794682L;
private ValueExpression _message = null;
private ValueExpression _detailMessage = null;
private ValueExpression _summaryMessage = null;
- public void setMessage(ValueExpression string) {
+ public void setMessage(ValueExpression string)
+ {
_message = string;
}
@@ -52,19 +54,24 @@ public abstract class ValidatorBaseTag e
_summaryMessage = summaryMessage;
}
- protected void _setProperties(Validator v) throws JspException {
+ protected void _setProperties(Validator v) throws JspException
+ {
ValidatorBase validator = (ValidatorBase) v;
FacesContext facesContext = FacesContext.getCurrentInstance();
if(_message != null && _detailMessage != null)
+ {
throw new JspException("you may not set message and detailMessage together - they serve the same purpose.");
+ }
ValueExpression detailMessage = _message;
if(_detailMessage != null)
+ {
detailMessage = _detailMessage;
+ }
if (detailMessage != null)
{
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBaseTagHandler.java Thu Oct 20 16:13:22 2011
@@ -39,7 +39,7 @@ public class ValidatorBaseTagHandler ext
MetaRuleset ruleSet = super.createMetaRuleset(type);
//Add rule to handle EL expressions
- ruleSet.addRule(_ValidatorRule.Instance);
+ ruleSet.addRule(_ValidatorRule.INSTANCE);
return ruleSet;
}
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedStateWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedStateWrapper.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedStateWrapper.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedStateWrapper.java Thu Oct 20 16:13:22 2011
@@ -39,7 +39,8 @@ class _AttachedStateWrapper
{
if (wrappedStateObject != null && !(wrappedStateObject instanceof Serializable))
{
- throw new IllegalArgumentException("Attached state for Object of type " + clazz + " (Class " + wrappedStateObject.getClass().getName() + ") is not serializable");
+ throw new IllegalArgumentException("Attached state for Object of type " + clazz
+ + " (Class " + wrappedStateObject.getClass().getName() + ") is not serializable");
}
_class = clazz;
_wrappedStateObject = wrappedStateObject;
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DateRestrictionRule.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DateRestrictionRule.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DateRestrictionRule.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DateRestrictionRule.java Thu Oct 20 16:13:22 2011
@@ -33,7 +33,8 @@ import javax.faces.view.facelets.TagAttr
public class _DateRestrictionRule extends MetaRule
{
- final static class DateRestrictionMetadata extends Metadata {
+ final static class DateRestrictionMetadata extends Metadata
+ {
private final String name;
@@ -45,8 +46,8 @@ public class _DateRestrictionRule extend
private Object[] value;
- public DateRestrictionMetadata(String name, Method method, Class type,
- TagAttribute attr) {
+ public DateRestrictionMetadata(String name, Method method, Class type, TagAttribute attr)
+ {
this.name = name;
this.attr = attr;
this.method = method;
@@ -60,19 +61,27 @@ public class _DateRestrictionRule extend
{
try
{
- if (value == null) {
- value = new Object[] {
+ if (value == null)
+ {
+ value = new Object[]
+ {
org.apache.myfaces.commons.util.TagUtils.getStringArray(
ctx.getExpressionFactory().coerceToType(
this.attr.getValue(),
String.class)
- ) };
+ )
+ };
}
- try {
+ try
+ {
method.invoke(instance, this.value);
- } catch (InvocationTargetException e) {
+ }
+ catch (InvocationTargetException e)
+ {
throw new TagAttributeException(this.attr, e.getCause());
- } catch (Exception e) {
+ }
+ catch (Exception e)
+ {
throw new TagAttributeException(this.attr, e);
}
}
@@ -90,7 +99,7 @@ public class _DateRestrictionRule extend
}
- public final static _DateRestrictionRule Instance = new _DateRestrictionRule();
+ public final static _DateRestrictionRule INSTANCE = new _DateRestrictionRule();
public _DateRestrictionRule()
{
@@ -101,13 +110,15 @@ public class _DateRestrictionRule extend
public Metadata applyRule(String name, TagAttribute attribute,
MetadataTarget meta)
{
- if (meta.isTargetInstanceOf(DateRestrictionValidator.class)) {
+ if (meta.isTargetInstanceOf(DateRestrictionValidator.class))
+ {
if ("invalidMonths".equals(name) || "invalidDaysOfWeek".equals(name))
{
Method m = meta.getWriteMethod(name);
Class type = meta.getPropertyType(name);
- if (type == null) {
+ if (type == null)
+ {
type = Object.class;
}
return new DateRestrictionMetadata(name, m, type, attribute);
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DeltaStateHelper.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DeltaStateHelper.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DeltaStateHelper.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DeltaStateHelper.java Thu Oct 20 16:13:22 2011
@@ -594,7 +594,9 @@ class _DeltaStateHelper implements State
public void restoreState(FacesContext context, Object state)
{
if (state == null)
+ {
return;
+ }
Object[] serializedState = (Object[]) state;
Modified: myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_ValidatorRule.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_ValidatorRule.java?rev=1186881&r1=1186880&r2=1186881&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_ValidatorRule.java (original)
+++ myfaces/commons/branches/jsf_20/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_ValidatorRule.java Thu Oct 20 16:13:22 2011
@@ -24,9 +24,11 @@ import javax.faces.view.facelets.Metadat
import javax.faces.view.facelets.MetadataTarget;
import javax.faces.view.facelets.TagAttribute;
-final class _ValidatorRule extends MetaRule {
+final class _ValidatorRule extends MetaRule
+{
- final static class ValueExpressionMetadata extends Metadata {
+ final static class ValueExpressionMetadata extends Metadata
+ {
private final String name;
@@ -34,14 +36,15 @@ final class _ValidatorRule extends MetaR
private final Class type;
- public ValueExpressionMetadata(String name, Class type,
- TagAttribute attr) {
+ public ValueExpressionMetadata(String name, Class type, TagAttribute attr)
+ {
this.name = name;
this.attr = attr;
this.type = type;
}
- public void applyMetadata(FaceletContext ctx, Object instance) {
+ public void applyMetadata(FaceletContext ctx, Object instance)
+ {
((ValidatorBase) instance).setValueExpression(this.name, this.attr
.getValueExpression(ctx, this.type));
}
@@ -71,24 +74,28 @@ final class _ValidatorRule extends MetaR
}*/
- public final static _ValidatorRule Instance = new _ValidatorRule();
+ public final static _ValidatorRule INSTANCE = new _ValidatorRule();
- public _ValidatorRule() {
+ public _ValidatorRule()
+ {
super();
}
- public Metadata applyRule(String name, TagAttribute attribute,
- MetadataTarget meta) {
- if (meta.isTargetInstanceOf(ValidatorBase.class)) {
+ public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta)
+ {
+ if (meta.isTargetInstanceOf(ValidatorBase.class))
+ {
// if component and dynamic, then must set expression
- if (!attribute.isLiteral()) {
+ if (!attribute.isLiteral())
+ {
Class type = meta.getPropertyType(name);
- if (type == null) {
+ if (type == null)
+ {
type = Object.class;
}
//if (FacesAPI.getComponentVersion(meta.getTargetClass()) >= 12) {
- return new ValueExpressionMetadata(name, type, attribute);
+ return new ValueExpressionMetadata(name, type, attribute);
//} else {
// return new ValueBindingMetadata(name, type, attribute);
//}