Changeset 4791

Timestamp:

06/09/08 07:14:44 (3 months ago)

Author:

magi@…

Message:

Merged [4752] from trunk to 5.2 branch: fixes #1771 (Table: size() function called more times than needed)

Files:

• branches/5.2/src/com/itmill/toolkit/ui/Table.java (modified) (3 diffs)

branches/5.2/src/com/itmill/toolkit/ui/Table.java

@@ -1149 +1149 @@
             final int pagelen = getPageLength();
             int firstIndex = getCurrentPageFirstItemIndex();
-            int rows = size();
+            int rows, totalRows;
+            rows = totalRows = size();
             if (rows > 0 && firstIndex >= 0) {
                 rows -= firstIndex;
@@ -1163 +1164 @@
             Object id;
             if (firstToBeRenderedInClient >= 0) {
-                if (firstToBeRenderedInClient < size()) {
+                if (firstToBeRenderedInClient < totalRows) {
                     firstIndex = firstToBeRenderedInClient;
                 } else {
-                    firstIndex = size() - 1;
+                    firstIndex = totalRows - 1;
                 }
             } else {
@@ -1172 +1173 @@
                 firstToBeRenderedInClient = firstIndex;
             }
-            if (size() > 0) {
-                if (rows + firstIndex > size()) {
-                    rows = size() - firstIndex;
+            if (totalRows > 0) {
+                if (rows + firstIndex > totalRows) {
+                    rows = totalRows - firstIndex;
                 }
             } else {