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 2011/07/13 00:32:13 UTC
svn commit: r1145801 - in
/myfaces/core/trunk/api/src/main/java/javax/faces/component:
UIComponentBase.java UIInput.java
Author: lu4242
Date: Tue Jul 12 22:32:12 2011
New Revision: 1145801
URL: http://svn.apache.org/viewvc?rev=1145801&view=rev
Log:
MYFACES-3214 Remove exception wrapping with FacesException and with getPathToComponent (Thanks to Martin Koci for provide this patch)
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java?rev=1145801&r1=1145800&r2=1145801&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java Tue Jul 12 22:32:12 2011
@@ -416,21 +416,13 @@ public abstract class UIComponentBase ex
{
if (context == null)
throw new NullPointerException("context");
- try
- {
- Renderer renderer = getRenderer(context);
- if (renderer != null)
- {
- renderer.decode(context, this);
- }
- }
- catch (Exception ex)
+
+ Renderer renderer = getRenderer(context);
+ if (renderer != null)
{
- String location = getComponentLocation(this);
- throw new FacesException("Exception while decoding component : "
- + getPathToComponent(this)
- + (location != null ? " created from: " + location : ""), ex);
+ renderer.decode(context, this);
}
+
}
@Override
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java?rev=1145801&r1=1145800&r2=1145801&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java Tue Jul 12 22:32:12 2011
@@ -530,72 +530,63 @@ public class UIInput extends UIOutput im
if (context == null)
throw new NullPointerException("context");
-
- try
+ Object submittedValue = getSubmittedValue();
+ if (submittedValue == null)
{
- Object submittedValue = getSubmittedValue();
- if (submittedValue == null)
- {
- return;
- }
+ return;
+ }
- // Begin new JSF 2.0 requirement (INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL)
- if (shouldInterpretEmptyStringSubmittedValuesAsNull(context) && isEmptyString(submittedValue))
- {
- // -= matzew = setSubmittedValue(null) is wrong, see:
- // https://javaserverfaces-spec-public.dev.java.net/issues/show_bug.cgi?id=671
- setSubmittedValue(null);
- submittedValue = null;
- }
- // End new JSF 2.0 requirement (INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL)
+ // Begin new JSF 2.0 requirement (INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL)
+ if (shouldInterpretEmptyStringSubmittedValuesAsNull(context) && isEmptyString(submittedValue))
+ {
+ // -= matzew = setSubmittedValue(null) is wrong, see:
+ // https://javaserverfaces-spec-public.dev.java.net/issues/show_bug.cgi?id=671
+ setSubmittedValue(null);
+ submittedValue = null;
+ }
+ // End new JSF 2.0 requirement (INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL)
- Object convertedValue;
- try
+ Object convertedValue;
+ try
+ {
+ convertedValue = getConvertedValue(context, submittedValue);
+ }
+ catch (ConverterException e)
+ {
+ String converterMessage = getConverterMessage();
+ if (converterMessage != null)
{
- convertedValue = getConvertedValue(context, submittedValue);
+ context.addMessage(getClientId(context), new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ converterMessage, converterMessage));
}
- catch (ConverterException e)
+ else
{
- String converterMessage = getConverterMessage();
- if (converterMessage != null)
+ FacesMessage facesMessage = e.getFacesMessage();
+ if (facesMessage != null)
{
- context.addMessage(getClientId(context), new FacesMessage(FacesMessage.SEVERITY_ERROR,
- converterMessage, converterMessage));
+ context.addMessage(getClientId(context), facesMessage);
}
else
{
- FacesMessage facesMessage = e.getFacesMessage();
- if (facesMessage != null)
- {
- context.addMessage(getClientId(context), facesMessage);
- }
- else
- {
- _MessageUtils.addErrorMessage(context, this, CONVERSION_MESSAGE_ID,
+ _MessageUtils.addErrorMessage(context, this, CONVERSION_MESSAGE_ID,
new Object[] { _MessageUtils.getLabel(context, this) });
- }
}
- setValid(false);
- return;
}
+ setValid(false);
+ return;
+ }
- validateValue(context, convertedValue);
+ validateValue(context, convertedValue);
- if (!isValid())
- return;
+ if (!isValid())
+ return;
- Object previousValue = getValue();
- setValue(convertedValue);
- setSubmittedValue(null);
- if (compareValues(previousValue, convertedValue))
- {
- queueEvent(new ValueChangeEvent(this, previousValue, convertedValue));
- }
- }
- catch (Exception ex)
+ Object previousValue = getValue();
+ setValue(convertedValue);
+ setSubmittedValue(null);
+ if (compareValues(previousValue, convertedValue))
{
- throw new FacesException("Exception while validating component with path : "
- + _ComponentUtils.getPathToComponent(this), ex);
+ queueEvent(new ValueChangeEvent(this, previousValue, convertedValue));
}
}