Changeset c63f0db4 in vaadin

Timestamp:

11/28/11 11:17:11 (18 months ago)

Author:

Henri Sara <henri.sara@…>

Branches:

master, 7.0, 7.1

Children:

ad47ed7b

Parents:

2ae16a43

git-author:

Henri Sara <henri.sara@…> (11/28/11 11:17:11)

git-committer:

Henri Sara <henri.sara@…> (11/28/11 11:17:11)

Message:

#7988 TreeTable.setCollapsed() should not throw NPE if the component has not been rendered yet

svn changeset:22147/svn branch:6.7

Location:

src/com/vaadin/ui

Files:

• Table.java (modified) (1 diff)
• TreeTable.java (modified) (1 diff)

src/com/vaadin/ui/Table.java

@@ -3817 +3817 @@
 
         final Object[][] cells = getVisibleCells();
-        for (int i = 0; i < cells[CELL_ITEMID].length; i++) {
-            visible.add(cells[CELL_ITEMID][i]);
+        // may be null if the table has not been rendered yet (e.g. not attached
+        // to a layout)
+        if (null != cells) {
+            for (int i = 0; i < cells[CELL_ITEMID].length; i++) {
+                visible.add(cells[CELL_ITEMID][i]);
+            }
         }
 

src/com/vaadin/ui/TreeTable.java

@@ -658 +658 @@
     public void setCollapsed(Object itemId, boolean collapsed) {
         if (isCollapsed(itemId) != collapsed) {
-            if (null == toggledItemId && getVisibleItemIds().contains(itemId)
-                    && !isRowCacheInvalidated()) {
+            if (null == toggledItemId && !isRowCacheInvalidated()
+                    && getVisibleItemIds().contains(itemId)) {
                 // optimization: partial refresh if only one item is
                 // collapsed/expanded