Author: nbelaevski Date: 2010-12-01 11:34:45 -0500 (Wed, 01 Dec 2010) New Revision: 20264 Modified: trunk/ui/common/ui/src/main/java/org/richfaces/component/UIDataAdaptor.java trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/TreeEncoderBase.java Log: https://jira.jboss.org/browse/RF-9680 Modified: trunk/ui/common/ui/src/main/java/org/richfaces/component/UIDataAdaptor.java =================================================================== --- trunk/ui/common/ui/src/main/java/org/richfaces/component/UIDataAdaptor.java 2010-12-01 16:31:57 UTC (rev 20263) +++ trunk/ui/common/ui/src/main/java/org/richfaces/component/UIDataAdaptor.java 2010-12-01 16:34:45 UTC (rev 20264) @@ -246,10 +246,6 @@ private Object rowKey = null; - private boolean rowDataIsSet = false; - - private Object rowData; - private String clientId; private Object originalVarValue; @@ -371,34 +367,6 @@ return rowKey; } - private void setRowKeyAndData(FacesContext facesContext, Object rowKey, boolean localRowDataAvailable, Object localRowData) { - this.saveChildState(facesContext); - - this.rowKey = rowKey; - - if (localRowDataAvailable) { - this.rowData = localRowData; - this.rowDataIsSet = (rowKey != null); - } else { - this.rowData = null; - this.rowDataIsSet = false; - - getExtendedDataModel().setRowKey(rowKey); - } - - this.clientId = null; - - boolean rowSelected = (rowKey != null) && isRowAvailable(); - - setupVariable(facesContext, rowSelected); - - this.restoreChildState(facesContext); - } - - protected void setRowKeyAndData(FacesContext facesContext, Object rowKey, Object localRowData) { - setRowKeyAndData(facesContext, rowKey, true, localRowData); - } - /** * Setup current row by key. Perform same functionality as * {@link javax.faces.component.UIData#setRowIndex(int)}, but for key object - it may be not only @@ -647,15 +615,11 @@ } public Object getRowData() { - if (rowDataIsSet) { - return rowData; - } - return getExtendedDataModel().getRowData(); } public boolean isRowAvailable() { - return rowDataIsSet || getExtendedDataModel().isRowAvailable(); + return getExtendedDataModel().isRowAvailable(); } /** Modified: trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/TreeEncoderBase.java =================================================================== --- trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/TreeEncoderBase.java 2010-12-01 16:31:57 UTC (rev 20263) +++ trunk/ui/iteration/ui/src/main/java/org/richfaces/renderkit/TreeEncoderBase.java 2010-12-01 16:34:45 UTC (rev 20264) @@ -162,8 +162,7 @@ writeTreeNodeEndElement(); } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + throw new FacesException(e.getMessage(), e); } }