You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/08/12 12:41:03 UTC
svn commit: r232262 -
/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/RendererUtils.java
Author: mmarinschek
Date: Fri Aug 12 03:40:53 2005
New Revision: 232262
URL: http://svn.apache.org/viewcvs?rev=232262&view=rev
Log:
Myfaces-389: thanks to Mario Ivankovits for this patch
Modified:
myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/RendererUtils.java
Modified: myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/RendererUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/RendererUtils.java?rev=232262&r1=232261&r2=232262&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/RendererUtils.java (original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/renderkit/RendererUtils.java Fri Aug 12 03:40:53 2005
@@ -146,31 +146,7 @@
public static Boolean getBooleanValue(UIComponent component)
{
- if (!(component instanceof ValueHolder))
- {
- throw new IllegalArgumentException("Component : "+getPathToComponent(component)
- +"is not a ValueHolder");
- }
-
- if (component instanceof EditableValueHolder)
- {
- Object submittedValue = ((EditableValueHolder)component).getSubmittedValue();
- if (submittedValue != null)
- {
- if (submittedValue instanceof Boolean)
- {
- return (Boolean)submittedValue;
- }
- else
- {
- throw new IllegalArgumentException("Expected submitted value of type Boolean for component : "+
- getPathToComponent(component));
- }
- }
- }
-
- Object value = ((ValueHolder)component).getValue();
-
+ Object value = getObjectValue(component);
if (value==null || value instanceof Boolean)
{
return (Boolean) value;
@@ -184,6 +160,20 @@
public static Date getDateValue(UIComponent component)
{
+ Object value = getObjectValue(component);
+ if (value==null || value instanceof Date)
+ {
+ return (Date) value;
+ }
+ else
+ {
+ throw new IllegalArgumentException("Expected submitted value of type Date for component : "
+ +getPathToComponent(component));
+ }
+ }
+
+ public static Object getObjectValue(UIComponent component)
+ {
if (!(component instanceof ValueHolder))
{
throw new IllegalArgumentException("Component : "+
@@ -192,35 +182,15 @@
if (component instanceof EditableValueHolder)
{
- Object submittedValue = ((EditableValueHolder)component).getSubmittedValue();
- if (submittedValue != null)
+ Object value = ((EditableValueHolder)component).getSubmittedValue();
+ if (value != null)
{
- if (submittedValue instanceof Date)
- {
- return (Date)submittedValue;
- }
- else
- {
- throw new IllegalArgumentException(
- "Expected submitted value of type Date for component : "+
- getPathToComponent(component));
- }
+ return value;
}
}
- Object value = ((ValueHolder)component).getValue();
-
- if (value==null || value instanceof Date)
- {
- return (Date) value;
- }
- else
- {
- throw new IllegalArgumentException("Expected submitted value of type Date for component : "
- +getPathToComponent(component));
- }
+ return ((ValueHolder)component).getValue();
}
-
public static String getStringValue(FacesContext facesContext,
UIComponent component)