Update of /cvsroot/displaytag/display09/src/org/displaytag/model
In directory sc8-pr-cvs1:/tmp/cvs-serv8227/src/org/displaytag/model
Modified Files:
TableModel.java
Log Message:
updated sorting
Index: TableModel.java
===================================================================
RCS file: /cvsroot/displaytag/display09/src/org/displaytag/model/TableModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TableModel.java 21 Jun 2003 12:34:50 -0000 1.1
--- TableModel.java 20 Jul 2003 21:28:59 -0000 1.2
***************
*** 8,12 ****
import org.apache.commons.logging.LogFactory;
import org.displaytag.decorator.TableDecorator;
- import org.displaytag.util.RowCellSorter;
import org.displaytag.util.RowSorter;
--- 8,11 ----
***************
*** 268,286 ****
if (lSortedHeaderCell != null)
{
! // If it is an explicit value, then sort by that,
otherwise sort by
! // the property...
!
! if (lSortedHeaderCell.getBeanPropertyName() != null)
{
Collections.sort(
pList,
new RowSorter(
lSortedHeaderCell.getBeanPropertyName(),
getTableDecorator(),
mSortOrderAscending));
- }
- else if (mSortColumn != -1 && mSortColumn <
mHeaderCellList.size())
- {
- Collections.sort(pList, new
RowCellSorter(mSortColumn, mSortOrderAscending));
}
}
--- 267,281 ----
if (lSortedHeaderCell != null)
{
! // If it is an explicit value, then sort by that,
otherwise sort by the property...
! if (lSortedHeaderCell.getBeanPropertyName() != null
! || (mSortColumn != -1 && mSortColumn <
mHeaderCellList.size()))
{
Collections.sort(
pList,
new RowSorter(
+ mSortColumn,
lSortedHeaderCell.getBeanPropertyName(),
getTableDecorator(),
mSortOrderAscending));
}
}
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0
_______________________________________________
displaytag-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/displaytag-devel