You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/11/25 23:59:03 UTC
svn commit: r1039214 - in
/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator:
AbstractDateRestrictionValidator.java _DateRestrictionRule.java
Author: lu4242
Date: Thu Nov 25 22:59:03 2010
New Revision: 1039214
URL: http://svn.apache.org/viewvc?rev=1039214&view=rev
Log:
fix invalidMonths and invalidDaysOfWeek in jsp and do not handle invalidDays with _DateRestrictionRule
Modified:
myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java
myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DateRestrictionRule.java
Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java?rev=1039214&r1=1039213&r2=1039214&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AbstractDateRestrictionValidator.java Thu Nov 25 22:59:03 2010
@@ -101,7 +101,7 @@ public abstract class AbstractDateRestri
* Possible values are jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec.
*
*/
- @JSFProperty
+ @JSFProperty(deferredValueType="java.lang.Object")
public abstract String[] getInvalidMonths();
public abstract void setInvalidMonths(String[] invalidMonths);
@@ -112,7 +112,7 @@ public abstract class AbstractDateRestri
* Possible values are sun, mon, tue, wed, thu, fri, sat.
*
*/
- @JSFProperty
+ @JSFProperty(deferredValueType="java.lang.Object")
public abstract String[] getInvalidDaysOfWeek();
public abstract void setInvalidDaysOfWeek(String[] invalidDaysOfWeek);
Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DateRestrictionRule.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DateRestrictionRule.java?rev=1039214&r1=1039213&r2=1039214&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DateRestrictionRule.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_DateRestrictionRule.java Thu Nov 25 22:59:03 2010
@@ -101,7 +101,7 @@ public class _DateRestrictionRule extend
{
if (meta.isTargetInstanceOf(DateRestrictionValidator.class)) {
- if ("invalidMonths".equals(name) || "invalidDaysOfWeek".equals(name) || "invalidDays".equals(name))
+ if ("invalidMonths".equals(name) || "invalidDaysOfWeek".equals(name))
{
Method m = meta.getWriteMethod(name);
Class type = meta.getPropertyType(name);