Changeset 4972

Timestamp:

06/30/08 10:35:42 (6 months ago)

Author:

jouni.koivuviita@…

Message:

Toolkit 4: Changed unwanted String array to List in paintContent-method (problem with lazy-loading containers when the array needed to know the size of the whole set).

Files:

• branches/4.0/src/com/itmill/toolkit/ui/Table.java (modified) (4 diffs)

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

@@ -11 +11 @@
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -1468 +1469 @@
 
                 // selection support
-                String[] selectedKeys;
-                if (isMultiSelect()) {
-                        selectedKeys = new String[((Set) getValue()).size()];
-                } else {
-                        selectedKeys = new String[(getValue() == null
-                                        && getNullSelectionItemId() == null ? 0 : 1)];
-                }
-                int keyIndex = 0;
+                List selectedKeys = new LinkedList();
 
                 // Table attributes
@@ -1585 +1579 @@
                         if (actionHandlers != null || isSelectable()) {
                                 target.addAttribute("key", (String) cells[CELL_KEY][i]);
-                                if (isSelected(itemId) && keyIndex < selectedKeys.length) {
+                                if (isSelected(itemId)) {
                                         target.addAttribute("selected", true);
-                                        selectedKeys[keyIndex++] = (String) cells[CELL_KEY][i];
+                                        selectedKeys.add((String) cells[CELL_KEY][i]);
                                 }
                         }
@@ -1637 +1631 @@
                 // The select variable is only enabled if selectable
                 if (selectable) {
-                        target.addVariable(this, "selected", selectedKeys);
+                        String[] list = new String[selectedKeys.size()];
+                        selectedKeys.toArray(list);
+                        target.addVariable(this, "selected", list);
                 }