You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mk...@apache.org on 2006/08/03 02:25:53 UTC
svn commit: r428204 -
/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
Author: mkienenb
Date: Wed Aug 2 17:25:52 2006
New Revision: 428204
URL: http://svn.apache.org/viewvc?rev=428204&view=rev
Log:
Fix for TOMAHAWK-467 -- combination of non-newspaper dataTables and scollers miscount available rows.
Thanks to Michael Heinen.
Modified:
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?rev=428204&r1=428203&r2=428204&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Wed Aug 2 17:25:52 2006
@@ -212,6 +212,10 @@
else
{
last = first + rows;
+ if (last > uiData.getRowCount())
+ {
+ last=uiData.getRowCount();
+ }
}
int newspaperColumns = getNewspaperColumns(component);
@@ -232,7 +236,7 @@
uiData.setRowIndex(currentRow);
if (!uiData.isRowAvailable()) {
log.error("Row is not available. Rowindex = " + currentRow);
- return;
+ break;
}
beforeRow(facesContext, uiData);
@@ -255,8 +259,6 @@
uiData.setRowIndex(currentRow);
if(!uiData.isRowAvailable()) {
log.error("Row is not available. Rowindex = " + currentRow);
- //todo quickfix for TOMAHAWK-467: break instead of return
- //todo the cause of coming to this line needs to be found as well, though!
break;
}
}