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/07/04 20:29:33 UTC
svn commit: r960380 - in
/myfaces/extensions/validator/branches/branch_for_jsf_2_0:
component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/
core/src/main/java/org/apache/myfaces/extension...
Author: gpetracek
Date: Sun Jul 4 18:29:32 2010
New Revision: 960380
URL: http://svn.apache.org/viewvc?rev=960380&view=rev
Log:
EXTVAL-80 minor improvements
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/TrinidadComponentInitializer.java
myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererProxy.java
myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java
myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/ExtValBeanValidationMetaDataInternals.java
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/TrinidadComponentInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/TrinidadComponentInitializer.java?rev=960380&r1=960379&r2=960380&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/TrinidadComponentInitializer.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/initializer/component/TrinidadComponentInitializer.java Sun Jul 4 18:29:32 2010
@@ -64,22 +64,19 @@ public class TrinidadComponentInitialize
public final void configureComponent(FacesContext facesContext, UIComponent uiComponent,
Map<String, Object> metaData)
{
+ TrinidadClientValidatorStorage storage = ExtValUtils
+ .getStorage(TrinidadClientValidatorStorage.class, TrinidadClientValidatorStorage.class.getName());
+
for(TrinidadComponentInitializer componentInitializer : componentInitializers)
{
if(componentInitializer.configureTrinidadComponent(facesContext, uiComponent, metaData))
{
- addComponentToStorage(uiComponent);
+ storage.addComponent(uiComponent);
updateComponent(facesContext, uiComponent);
}
}
}
- private void addComponentToStorage(UIComponent uiComponent)
- {
- ExtValUtils.getStorage(TrinidadClientValidatorStorage.class, TrinidadClientValidatorStorage.class.getName())
- .addComponent(uiComponent);
- }
-
protected boolean configureTrinidadComponent(FacesContext facesContext, UIComponent uiComponent,
Map<String, Object> metaData)
{
@@ -99,4 +96,4 @@ public class TrinidadComponentInitialize
RequestContext.getCurrentInstance().addPartialTarget(uiComponent.getParent());
}
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererProxy.java?rev=960380&r1=960379&r2=960380&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererProxy.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/core/src/main/java/org/apache/myfaces/extensions/validator/core/renderkit/ExtValRendererProxy.java Sun Jul 4 18:29:32 2010
@@ -251,11 +251,13 @@ public class ExtValRendererProxy extends
key += getOptionalKey(facesContext, uiComponent);
- if (!getRendererStorage().containsEntry(getRendererKey(), key))
+ RendererProxyStorage rendererProxyStorage = getRendererStorage();
+
+ if (!rendererProxyStorage.containsEntry(getRendererKey(), key))
{
- getRendererStorage().setEntry(getRendererKey(), key, new RendererProxyStorageEntry());
+ rendererProxyStorage.setEntry(getRendererKey(), key, new RendererProxyStorageEntry());
}
- return getRendererStorage().getEntry(getRendererKey(), key);
+ return rendererProxyStorage.getEntry(getRendererKey(), key);
}
protected String getOptionalKey(FacesContext facesContext, UIComponent uiComponent)
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java?rev=960380&r1=960379&r2=960380&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/BeanValidationUtils.java Sun Jul 4 18:29:32 2010
@@ -118,6 +118,8 @@ public class BeanValidationUtils
List<ModelValidationEntry> modelValidationEntryList = new ArrayList<ModelValidationEntry>();
List<Class> restrictedGroupsForModelValidation = new ArrayList<Class>();
+ String activeViewId = FacesContext.getCurrentInstance().getViewRoot().getViewId();
+
bvmi.extractExtValBeanValidationMetaData(propertyDetails,
processModelValidation,
key,
@@ -125,14 +127,16 @@ public class BeanValidationUtils
foundGroupsForPropertyValidation,
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
- restrictedGroupsForModelValidation);
+ restrictedGroupsForModelValidation,
+ activeViewId);
bvmi.processExtValBeanValidationMetaData(component,
propertyDetails,
foundGroupsForPropertyValidation,
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
- restrictedGroupsForModelValidation);
+ restrictedGroupsForModelValidation,
+ activeViewId);
}
public static void processConstraintViolations(FacesContext facesContext,
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/ExtValBeanValidationMetaDataInternals.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/ExtValBeanValidationMetaDataInternals.java?rev=960380&r1=960379&r2=960380&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/ExtValBeanValidationMetaDataInternals.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/validation-modules/bean-validation/src/main/java/org/apache/myfaces/extensions/validator/beanval/util/ExtValBeanValidationMetaDataInternals.java Sun Jul 4 18:29:32 2010
@@ -72,14 +72,16 @@ class ExtValBeanValidationMetaDataIntern
List<Class> foundGroupsForPropertyValidation,
List<Class> restrictedGroupsForPropertyValidation,
List<ModelValidationEntry> modelValidationEntryList,
- List<Class> restrictedGroupsForModelValidation)
+ List<Class> restrictedGroupsForModelValidation,
+ String activeViewId)
{
inspectFirstBean(processModelValidation,
firstBean,
foundGroupsForPropertyValidation,
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
- restrictedGroupsForModelValidation);
+ restrictedGroupsForModelValidation,
+ activeViewId);
inspectFirstProperty(processModelValidation,
key,
@@ -88,6 +90,7 @@ class ExtValBeanValidationMetaDataIntern
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
restrictedGroupsForModelValidation,
+ activeViewId,
key.length == 2);
inspectBaseOfProperty(propertyDetails,
@@ -95,14 +98,16 @@ class ExtValBeanValidationMetaDataIntern
foundGroupsForPropertyValidation,
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
- restrictedGroupsForModelValidation);
+ restrictedGroupsForModelValidation,
+ activeViewId);
inspectLastProperty(propertyDetails,
processModelValidation,
foundGroupsForPropertyValidation,
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
- restrictedGroupsForModelValidation);
+ restrictedGroupsForModelValidation,
+ activeViewId);
}
void processExtValBeanValidationMetaData(UIComponent component,
@@ -110,17 +115,17 @@ class ExtValBeanValidationMetaDataIntern
List<Class> foundGroupsForPropertyValidation,
List<Class> restrictedGroupsForPropertyValidation,
List<ModelValidationEntry> modelValidationEntryList,
- List<Class> restrictedGroupsForModelValidation)
+ List<Class> restrictedGroupsForModelValidation,
+ String activeViewId)
{
ExtValBeanValidationContext extValBeanValidationContext = ExtValBeanValidationContext.getCurrentInstance();
- String currentViewId = FacesContext.getCurrentInstance().getViewRoot().getViewId();
String clientId = component.getClientId(FacesContext.getCurrentInstance());
- processFoundGroups(extValBeanValidationContext, currentViewId, clientId,
+ processFoundGroups(extValBeanValidationContext, activeViewId, clientId,
foundGroupsForPropertyValidation);
- processRestrictedGroups(extValBeanValidationContext, currentViewId, clientId,
+ processRestrictedGroups(extValBeanValidationContext, activeViewId, clientId,
restrictedGroupsForPropertyValidation);
initModelValidation(extValBeanValidationContext, component, propertyDetails,
@@ -132,13 +137,15 @@ class ExtValBeanValidationMetaDataIntern
List<Class> foundGroupsForPropertyValidation,
List<Class> restrictedGroupsForPropertyValidation,
List<ModelValidationEntry> modelValidationEntryList,
- List<Class> restrictedGroupsForModelValidation)
+ List<Class> restrictedGroupsForModelValidation,
+ String activeViewId)
{
processClass(firstBean,
foundGroupsForPropertyValidation,
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
restrictedGroupsForModelValidation,
+ activeViewId,
processModelValidation);
}
@@ -149,6 +156,7 @@ class ExtValBeanValidationMetaDataIntern
List<Class> restrictedGroupsForPropertyValidation,
List<ModelValidationEntry> modelValidationEntryList,
List<Class> restrictedGroupsForModelValidation,
+ String activeViewId,
boolean isLastProperty)
{
processFieldsAndProperties(key[0] + "." + key[1],
@@ -158,6 +166,7 @@ class ExtValBeanValidationMetaDataIntern
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
restrictedGroupsForModelValidation,
+ activeViewId,
processModelValidation,
isLastProperty);
}
@@ -167,13 +176,15 @@ class ExtValBeanValidationMetaDataIntern
List<Class> foundGroupsForPropertyValidation,
List<Class> restrictedGroupsForPropertyValidation,
List<ModelValidationEntry> modelValidationEntryList,
- List<Class> restrictedGroupsForModelValidation)
+ List<Class> restrictedGroupsForModelValidation,
+ String activeViewId)
{
processClass(propertyDetails.getBaseObject(),
foundGroupsForPropertyValidation,
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
restrictedGroupsForModelValidation,
+ activeViewId,
processModelValidation);
}
@@ -182,7 +193,8 @@ class ExtValBeanValidationMetaDataIntern
List<Class> foundGroupsForPropertyValidation,
List<Class> restrictedGroupsForPropertyValidation,
List<ModelValidationEntry> modelValidationEntryList,
- List<Class> restrictedGroupsForModelValidation)
+ List<Class> restrictedGroupsForModelValidation,
+ String activeViewId)
{
processFieldsAndProperties(
propertyDetails.getKey(),
@@ -192,6 +204,7 @@ class ExtValBeanValidationMetaDataIntern
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
restrictedGroupsForModelValidation,
+ activeViewId,
processModelValidation,
true);
}
@@ -201,6 +214,7 @@ class ExtValBeanValidationMetaDataIntern
List<Class> restrictedGroupsForPropertyValidation,
List<ModelValidationEntry> modelValidationEntryList,
List<Class> restrictedGroupsForModelValidation,
+ String activeViewId,
boolean processModelValidation)
{
Class classToInspect = ProxyUtils.getUnproxiedClass(objectToInspect.getClass());
@@ -212,6 +226,7 @@ class ExtValBeanValidationMetaDataIntern
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
restrictedGroupsForModelValidation,
+ activeViewId,
processModelValidation);
processInterfaces(objectToInspect.getClass(), objectToInspect,
@@ -219,6 +234,7 @@ class ExtValBeanValidationMetaDataIntern
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
restrictedGroupsForModelValidation,
+ activeViewId,
processModelValidation);
classToInspect = classToInspect.getSuperclass();
@@ -232,6 +248,7 @@ class ExtValBeanValidationMetaDataIntern
List<Class> restrictedGroupsForPropertyValidation,
List<ModelValidationEntry> modelValidationEntryList,
List<Class> restrictedGroupsForModelValidation,
+ String activeViewId,
boolean processModelValidation,
boolean isLastProperty)
{
@@ -248,6 +265,7 @@ class ExtValBeanValidationMetaDataIntern
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
restrictedGroupsForModelValidation,
+ activeViewId,
processModelValidation);
}
else if (metaDataEntry.getValue() instanceof BeanValidation.List)
@@ -260,6 +278,7 @@ class ExtValBeanValidationMetaDataIntern
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
restrictedGroupsForModelValidation,
+ activeViewId,
processModelValidation);
}
}
@@ -367,6 +386,7 @@ class ExtValBeanValidationMetaDataIntern
List<Class> restrictedGroupsForPropertyValidation,
List<ModelValidationEntry> modelValidationEntryList,
List<Class> restrictedGroupsForModelValidation,
+ String activeViewId,
boolean processModelValidation)
{
if (objectToInspect.getClass().isAnnotationPresent(BeanValidation.class))
@@ -377,6 +397,7 @@ class ExtValBeanValidationMetaDataIntern
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
restrictedGroupsForModelValidation,
+ activeViewId,
processModelValidation);
}
else if (objectToInspect.getClass().isAnnotationPresent(BeanValidation.List.class))
@@ -390,6 +411,7 @@ class ExtValBeanValidationMetaDataIntern
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
restrictedGroupsForModelValidation,
+ activeViewId,
processModelValidation);
}
}
@@ -401,6 +423,7 @@ class ExtValBeanValidationMetaDataIntern
List<Class> restrictedGroupsForPropertyValidation,
List<ModelValidationEntry> modelValidationEntryList,
List<Class> restrictedGroupsForModelValidation,
+ String activeViewId,
boolean processModelValidation)
{
for (Class currentInterface : currentClass.getInterfaces())
@@ -410,6 +433,7 @@ class ExtValBeanValidationMetaDataIntern
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
restrictedGroupsForModelValidation,
+ activeViewId,
processModelValidation);
processInterfaces(currentInterface, metaDataSourceObject,
@@ -417,6 +441,7 @@ class ExtValBeanValidationMetaDataIntern
restrictedGroupsForPropertyValidation,
modelValidationEntryList,
restrictedGroupsForModelValidation,
+ activeViewId,
processModelValidation);
}
}
@@ -427,11 +452,12 @@ class ExtValBeanValidationMetaDataIntern
List<Class> restrictedGroupsForPropertyValidation,
List<ModelValidationEntry> modelValidationEntryList,
List<Class> restrictedGroupsForModelValidation,
+ String activeViewId,
boolean processModelValidation)
{
for (String currentViewId : beanValidation.viewIds())
{
- if (useMetaDataForViewId(beanValidation, currentViewId))
+ if (useMetaDataForViewId(beanValidation, currentViewId, activeViewId))
{
processMetaData(beanValidation,
metaDataSourceObject,
@@ -445,10 +471,10 @@ class ExtValBeanValidationMetaDataIntern
}
}
- private boolean useMetaDataForViewId(BeanValidation beanValidation, String currentViewId)
+ private boolean useMetaDataForViewId(BeanValidation beanValidation, String viewId, String activeViewId)
{
- return (currentViewId.equals(FacesContext.getCurrentInstance().getViewRoot().getViewId()) ||
- currentViewId.equals("*")) && isValidationPermitted(beanValidation);
+ return (viewId.equals(activeViewId) ||
+ viewId.equals("*")) && isValidationPermitted(beanValidation);
}
private void processMetaData(BeanValidation beanValidation,