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 2011/07/13 21:28:04 UTC
svn commit: r1146267 -
/myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java
Author: gpetracek
Date: Wed Jul 13 19:28:03 2011
New Revision: 1146267
URL: http://svn.apache.org/viewvc?rev=1146267&view=rev
Log:
EXTVAL-134 support for CoreSelectOneChoice - thx to Andrei Lupsa
Modified:
myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java
Modified: myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.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/interceptor/TrinidadValidationExceptionInterceptor.java?rev=1146267&r1=1146266&r2=1146267&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java (original)
+++ myfaces/extensions/validator/branches/branch_for_jsf_2_0/component-support/trinidad-support/src/main/java/org/apache/myfaces/extensions/validator/trinidad/interceptor/TrinidadValidationExceptionInterceptor.java Wed Jul 13 19:28:03 2011
@@ -18,23 +18,23 @@
*/
package org.apache.myfaces.extensions.validator.trinidad.interceptor;
-import org.apache.myfaces.extensions.validator.internal.UsageInformation;
-import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+import org.apache.myfaces.extensions.validator.core.InvocationOrder;
import org.apache.myfaces.extensions.validator.core.interceptor.ValidationExceptionInterceptor;
import org.apache.myfaces.extensions.validator.core.metadata.MetaDataEntry;
import org.apache.myfaces.extensions.validator.core.property.PropertyInformationKeys;
-import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
-import org.apache.myfaces.extensions.validator.core.validation.message.LabeledMessage;
import org.apache.myfaces.extensions.validator.core.validation.exception.RequiredValidatorException;
-import org.apache.myfaces.extensions.validator.core.InvocationOrder;
-import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
+import org.apache.myfaces.extensions.validator.core.validation.message.LabeledMessage;
+import org.apache.myfaces.extensions.validator.core.validation.strategy.ValidationStrategy;
+import org.apache.myfaces.extensions.validator.internal.UsageCategory;
+import org.apache.myfaces.extensions.validator.internal.UsageInformation;
import org.apache.myfaces.extensions.validator.util.ExtValUtils;
+import org.apache.myfaces.extensions.validator.util.ReflectionUtils;
import org.apache.myfaces.trinidad.context.RequestContext;
-import javax.faces.context.FacesContext;
+import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
import javax.faces.validator.ValidatorException;
-import javax.faces.application.FacesMessage;
/**
* @author Gerhard Petracek
@@ -45,9 +45,11 @@ import javax.faces.application.FacesMess
public class TrinidadValidationExceptionInterceptor implements ValidationExceptionInterceptor
{
private static final String TRINIDAD_CORE_INPUT_TEXT
- = "org.apache.myfaces.trinidad.component.core.input.CoreInputText";
+ = "org.apache.myfaces.trinidad.component.core.input.CoreInputText";
private static final String TRINIDAD_CORE_INPUT_DATE
- = "org.apache.myfaces.trinidad.component.core.input.CoreInputDate";
+ = "org.apache.myfaces.trinidad.component.core.input.CoreInputDate";
+ private static final String TRINIDAD_CORE_SELECT_ONE_CHOICE
+ = "org.apache.myfaces.trinidad.component.core.input.CoreSelectOneChoice";
public boolean afterThrowing(UIComponent uiComponent,
MetaDataEntry metaDataEntry,
@@ -55,7 +57,7 @@ public class TrinidadValidationException
ValidatorException validatorException,
ValidationStrategy validatorExceptionSource)
{
- if(processComponent(uiComponent))
+ if (processComponent(uiComponent))
{
tryToRefreshComponent(uiComponent);
tryToPlaceLabelInFacesMessage(uiComponent, metaDataEntry, validatorException);
@@ -85,14 +87,14 @@ public class TrinidadValidationException
private void processLabel(FacesMessage facesMessage, String label)
{
- if(facesMessage instanceof LabeledMessage)
+ if (facesMessage instanceof LabeledMessage)
{
- ((LabeledMessage)facesMessage).setLabelText(label);
+ ((LabeledMessage) facesMessage).setLabelText(label);
}
//if someone uses a normal faces message
else
{
- for(int i = 0; i < 3; i++)
+ for (int i = 0; i < 3; i++)
{
ExtValUtils.tryToPlaceLabel(facesMessage, label, i);
}
@@ -101,7 +103,7 @@ public class TrinidadValidationException
private String tryToOverrideLabelIfProvidedManually(MetaDataEntry metaDataEntry, String label)
{
- if(metaDataEntry != null && metaDataEntry.getProperty(PropertyInformationKeys.LABEL) != null)
+ if (metaDataEntry != null && metaDataEntry.getProperty(PropertyInformationKeys.LABEL) != null)
{
return metaDataEntry.getProperty(PropertyInformationKeys.LABEL, String.class);
}
@@ -110,7 +112,7 @@ public class TrinidadValidationException
private String getClientIdAsFallbackIfNeeded(UIComponent uiComponent, String label)
{
- if(label == null)
+ if (label == null)
{
return uiComponent.getClientId(FacesContext.getCurrentInstance());
}
@@ -119,12 +121,12 @@ public class TrinidadValidationException
private void tryToHandleRequiredValidatorException(UIComponent uiComponent, ValidatorException validatorException)
{
- if(validatorException instanceof RequiredValidatorException)
+ if (validatorException instanceof RequiredValidatorException)
{
FacesMessage facesMessage = validatorException.getFacesMessage();
String inlineMessage = getInlineRequiredMessage(uiComponent);
- if(inlineMessage != null)
+ if (inlineMessage != null)
{
facesMessage.setSummary(inlineMessage);
facesMessage.setDetail(inlineMessage);
@@ -134,7 +136,7 @@ public class TrinidadValidationException
private void tryToRefreshComponent(UIComponent uiComponent)
{
- if(RequestContext.getCurrentInstance().isPartialRequest(FacesContext.getCurrentInstance()))
+ if (RequestContext.getCurrentInstance().isPartialRequest(FacesContext.getCurrentInstance()))
{
RequestContext.getCurrentInstance().addPartialTarget(uiComponent);
}
@@ -144,18 +146,19 @@ public class TrinidadValidationException
{
return uiComponent != null &&
(TRINIDAD_CORE_INPUT_TEXT.equals(uiComponent.getClass().getName()) ||
- TRINIDAD_CORE_INPUT_DATE.equals(uiComponent.getClass().getName()));
+ TRINIDAD_CORE_INPUT_DATE.equals(uiComponent.getClass().getName()) ||
+ TRINIDAD_CORE_SELECT_ONE_CHOICE.equals(uiComponent.getClass().getName()));
}
private String getLabel(UIComponent uiComponent)
{
- return (String)ReflectionUtils.tryToInvokeMethod(uiComponent,
+ return (String) ReflectionUtils.tryToInvokeMethod(uiComponent,
ReflectionUtils.tryToGetMethod(uiComponent.getClass(), "getLabel"));
}
private String getInlineRequiredMessage(UIComponent uiComponent)
{
- return (String)ReflectionUtils.tryToInvokeMethod(uiComponent,
+ return (String) ReflectionUtils.tryToInvokeMethod(uiComponent,
ReflectionUtils.tryToGetMethod(uiComponent.getClass(), "getRequiredMessageDetail"));
}
}