You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/05/27 00:12:25 UTC
svn commit: r948613 - in /myfaces/extensions/validator/trunk:
core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/component/
validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/
valid...
Author: gpetracek
Date: Wed May 26 22:12:25 2010
New Revision: 948613
URL: http://svn.apache.org/viewvc?rev=948613&view=rev
Log:
EXTVAL-98
Modified:
myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/component/AbstractHtmlCoreComponentsComponentInitializer.java
myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/HtmlCoreComponentsComponentInitializer.java
myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsComponentInitializer.java
Modified: myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/component/AbstractHtmlCoreComponentsComponentInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/component/AbstractHtmlCoreComponentsComponentInitializer.java?rev=948613&r1=948612&r2=948613&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/component/AbstractHtmlCoreComponentsComponentInitializer.java (original)
+++ myfaces/extensions/validator/trunk/core/src/main/java/org/apache/myfaces/extensions/validator/core/initializer/component/AbstractHtmlCoreComponentsComponentInitializer.java Wed May 26 22:12:25 2010
@@ -91,7 +91,7 @@ public abstract class AbstractHtmlCoreCo
* @return false to overrule the annotated property e.g. if component is readonly
*/
@ToDo(value = Priority.MEDIUM, description = "refactor")
- protected Boolean isComponentRequired(UIComponent uiComponent)
+ protected boolean isRequiredInitializationSupported(UIComponent uiComponent)
{
boolean isReadOnly = !Boolean.FALSE.equals(ReflectionUtils.tryToInvokeMethod(
uiComponent, ReflectionUtils.tryToGetMethod(uiComponent.getClass(), "isReadonly")));
Modified: myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/HtmlCoreComponentsComponentInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/HtmlCoreComponentsComponentInitializer.java?rev=948613&r1=948612&r2=948613&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/HtmlCoreComponentsComponentInitializer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/HtmlCoreComponentsComponentInitializer.java Wed May 26 22:12:25 2010
@@ -48,14 +48,17 @@ public class HtmlCoreComponentsComponent
return;
}
- if(Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.REQUIRED)) ||
- Boolean.TRUE.equals(isComponentRequired(uiComponent)))
+ if(!((EditableValueHolder)uiComponent).isRequired() &&
+ isRequiredInitializationRequested(metaData) &&
+ isRequiredInitializationSupported(uiComponent))
{
((EditableValueHolder)uiComponent).setRequired(true);
}
- else
- {
- ((EditableValueHolder)uiComponent).setRequired(false);
- }
+ }
+
+ private boolean isRequiredInitializationRequested(Map<String, Object> metaData)
+ {
+ return Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.REQUIRED)) ||
+ Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.WEAK_REQUIRED));
}
}
\ No newline at end of file
Modified: myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsComponentInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsComponentInitializer.java?rev=948613&r1=948612&r2=948613&view=diff
==============================================================================
--- myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsComponentInitializer.java (original)
+++ myfaces/extensions/validator/trunk/validation-modules/property-validation/src/main/java/org/apache/myfaces/extensions/validator/HtmlCoreComponentsComponentInitializer.java Wed May 26 22:12:25 2010
@@ -42,10 +42,9 @@ public class HtmlCoreComponentsComponent
UIComponent uiComponent,
Map<String, Object> metaData)
{
- if((Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.WEAK_REQUIRED)) ||
- Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.REQUIRED)))
- &&
- Boolean.TRUE.equals(isComponentRequired(uiComponent)))
+ if(!((EditableValueHolder)uiComponent).isRequired() &&
+ isRequiredInitializationRequested(metaData) &&
+ isRequiredInitializationSupported(uiComponent))
{
((EditableValueHolder)uiComponent).setRequired(true);
}
@@ -55,4 +54,10 @@ public class HtmlCoreComponentsComponent
((EditableValueHolder)uiComponent).setRequired(false);
}
}
+
+ private boolean isRequiredInitializationRequested(Map<String, Object> metaData)
+ {
+ return Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.WEAK_REQUIRED)) ||
+ Boolean.TRUE.equals(metaData.get(CommonMetaDataKeys.REQUIRED));
+ }
}