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/05/24 09:24:47 UTC
svn commit: r178130 - in /myfaces/trunk: doc/release-notes.txt
src/components/org/apache/myfaces/component/html/ext/HtmlDataTable.java
src/components/org/apache/myfaces/custom/equalvalidator/EqualValidator.java
Author: mmarinschek
Date: Tue May 24 00:24:46 2005
New Revision: 178130
URL: http://svn.apache.org/viewcvs?rev=178130&view=rev
Log:
fix for MyFaces-242
Modified:
myfaces/trunk/doc/release-notes.txt
myfaces/trunk/src/components/org/apache/myfaces/component/html/ext/HtmlDataTable.java
myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/EqualValidator.java
Modified: myfaces/trunk/doc/release-notes.txt
URL: http://svn.apache.org/viewcvs/myfaces/trunk/doc/release-notes.txt?rev=178130&r1=178129&r2=178130&view=diff
==============================================================================
--- myfaces/trunk/doc/release-notes.txt (original)
+++ myfaces/trunk/doc/release-notes.txt Tue May 24 00:24:46 2005
@@ -9,6 +9,7 @@
* closed MYFACES-177
* closed MYFACES-199
* closed MYFACES-209
+* closed MYFACES-242
----------------------------------------------------------------------
Changes in Release 1.0.9
* added support for portlet api (MYFACES-86). Thanks to Stan Silver (JBoss Group)
Modified: myfaces/trunk/src/components/org/apache/myfaces/component/html/ext/HtmlDataTable.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/component/html/ext/HtmlDataTable.java?rev=178130&r1=178129&r2=178130&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/component/html/ext/HtmlDataTable.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/component/html/ext/HtmlDataTable.java Tue May 24 00:24:46 2005
@@ -326,7 +326,7 @@
}
else if (List.class.isAssignableFrom(type))
{
- vb.setValue(context, (List)dm.getWrappedData());
+ vb.setValue(context, dm.getWrappedData());
}
else if (OBJECT_ARRAY_CLASS.isAssignableFrom(type))
{
@@ -531,7 +531,7 @@
values[6] = _renderedIfEmpty;
values[7] = _rowCountVar;
values[8] = _rowIndexVar;
- return ((Object) (values));
+ return values;
}
@@ -603,7 +603,7 @@
}
else
{
- return new _SerializableScalarDataModel(getFirst(), getRows(), (Object)value);
+ return new _SerializableScalarDataModel(getFirst(), getRows(), value);
}
}
Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/EqualValidator.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/EqualValidator.java?rev=178130&r1=178129&r2=178130&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/EqualValidator.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/equalvalidator/EqualValidator.java Tue May 24 00:24:46 2005
@@ -61,17 +61,21 @@
Object value)
throws ValidatorException {
- if (facesContext == null) throw new NullPointerException("facesContext");
- if (uiComponent == null) throw new NullPointerException("uiComponent");
+ if (facesContext == null) throw new NullPointerException("facesContext");
+ if (uiComponent == null) throw new NullPointerException("uiComponent");
- if (value == null)
- {
- return;
+ if (value == null)
+ {
+ return;
}
UIInput foreignComp = (UIInput) uiComponent.getParent().findComponent(_for);
- if(foreignComp==null)
- throw new FacesException("Unable to find component '" + _for + "' (calling findComponent on component '" + uiComponent.getId() + "')");
+ if(foreignComp==null)
+ throw new FacesException("Unable to find component '" + _for + "' (calling findComponent on component '" + uiComponent.getId() + "')");
+
+ if (foreignComp.isRequired() && foreignComp.getValue()== null ) {
+ return;
+ }
Object[] args = {value.toString(),(foreignComp.getValue()==null) ? foreignComp.getId():foreignComp.getValue().toString()};