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/08/05 05:03:25 UTC
svn commit: r1154079 - in
/myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model:
ArrayDataModel.java ListDataModel.java ResultDataModel.java
ScalarDataModel.java
Author: lu4242
Date: Fri Aug 5 03:03:25 2011
New Revision: 1154079
URL: http://svn.apache.org/viewvc?rev=1154079&view=rev
Log:
MYFACES-3260 DataModel.setWrappedData should publish row change events even when it changes from one instance to other one
Modified:
myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ArrayDataModel.java
myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ListDataModel.java
myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ResultDataModel.java
myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ScalarDataModel.java
Modified: myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ArrayDataModel.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ArrayDataModel.java?rev=1154079&r1=1154078&r2=1154079&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ArrayDataModel.java (original)
+++ myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ArrayDataModel.java Fri Aug 5 03:03:25 2011
@@ -110,9 +110,17 @@ public class ArrayDataModel<E> extends D
@Override
public void setWrappedData(Object data)
{
- _data = (E[])data;
- int rowIndex = _data != null ? 0 : -1;
- setRowIndex(rowIndex);
+ if (data == null)
+ {
+ setRowIndex(-1);
+ _data = null;
+ }
+ else
+ {
+ _data = (E[])data;
+ _rowIndex = -1;
+ setRowIndex(0);
+ }
}
}
Modified: myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ListDataModel.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ListDataModel.java?rev=1154079&r1=1154078&r2=1154079&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ListDataModel.java (original)
+++ myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ListDataModel.java Fri Aug 5 03:03:25 2011
@@ -113,9 +113,17 @@ public class ListDataModel<E> extends Da
@Override
public void setWrappedData(Object data)
{
- _data = (List<E>)data;
- int rowIndex = _data != null ? 0 : -1;
- setRowIndex(rowIndex);
+ if (data == null)
+ {
+ setRowIndex(-1);
+ _data = null;
+ }
+ else
+ {
+ _data = (List<E>)data;
+ _rowIndex = -1;
+ setRowIndex(0);
+ }
}
}
Modified: myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ResultDataModel.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ResultDataModel.java?rev=1154079&r1=1154078&r2=1154079&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ResultDataModel.java (original)
+++ myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ResultDataModel.java Fri Aug 5 03:03:25 2011
@@ -126,10 +126,12 @@ public class ResultDataModel extends Dat
if (data == null)
{
setRowIndex(-1);
+ _data = null;
}
else
{
_data = ((Result)data);
+ _rowIndex = -1;
setRowIndex(0);
}
}
Modified: myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ScalarDataModel.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ScalarDataModel.java?rev=1154079&r1=1154078&r2=1154079&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ScalarDataModel.java (original)
+++ myfaces/core/branches/2.0.x/api/src/main/java/javax/faces/model/ScalarDataModel.java Fri Aug 5 03:03:25 2011
@@ -104,9 +104,17 @@ public class ScalarDataModel<E> extends
@Override
public void setWrappedData(Object data)
{
- _data = (E) data;
- int rowIndex = _data != null ? 0 : -1;
- setRowIndex(rowIndex);
+ if (data == null)
+ {
+ setRowIndex(-1);
+ _data = null;
+ }
+ else
+ {
+ _data = (E) data;
+ _rowIndex = -1;
+ setRowIndex(0);
+ }
}
}