From c48a48e636f7334061f335c4cf05de107041a366 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Fri, 2 Nov 2007 14:51:51 +0000 Subject: [PATCH] Fixed total&row attributes when nullselitem has been automatically removed. svn changeset:2701/svn branch:trunk --- src/com/itmill/toolkit/ui/Table.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/com/itmill/toolkit/ui/Table.java b/src/com/itmill/toolkit/ui/Table.java index 5a9762db9e..13f5deb456 100644 --- a/src/com/itmill/toolkit/ui/Table.java +++ b/src/com/itmill/toolkit/ui/Table.java @@ -1469,6 +1469,13 @@ public class Table extends AbstractSelect implements Action.Container, boolean rowheads = getRowHeaderMode() != ROW_HEADER_MODE_HIDDEN; Object[][] cells = getVisibleCells(); boolean iseditable = isEditable(); + int rows = cells[0].length; + + if (!isNullSelectionAllowed() && getNullSelectionItemId() != null + && containsId(getNullSelectionItemId())) { + total--; + rows--; + } // selection support String[] selectedKeys; @@ -1488,7 +1495,7 @@ public class Table extends AbstractSelect implements Action.Container, target.addAttribute("selectmode", "none"); } target.addAttribute("cols", cols); - target.addAttribute("rows", cells[0].length); + target.addAttribute("rows", rows); target .addAttribute("firstrow", (this.reqFirstRowToPaint >= 0 ? this.reqFirstRowToPaint -- 2.39.5