diff options
| -rw-r--r-- | src/com/vaadin/ui/TreeTable.java | 4 | ||||
| -rw-r--r-- | tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/com/vaadin/ui/TreeTable.java b/src/com/vaadin/ui/TreeTable.java index f64c818313..6832e68d3b 100644 --- a/src/com/vaadin/ui/TreeTable.java +++ b/src/com/vaadin/ui/TreeTable.java @@ -178,6 +178,10 @@ public class TreeTable extends Table implements Hierarchical { } public boolean isLastId(Object itemId) { + if (itemId == null) { + return false; + } + return itemId.equals(lastItemId()); } diff --git a/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java b/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java new file mode 100644 index 0000000000..535ed8e860 --- /dev/null +++ b/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java @@ -0,0 +1,13 @@ +package com.vaadin.tests.server.component.treetable; + +import junit.framework.TestCase; + +import com.vaadin.ui.TreeTable; + +public class EmptyTreeTable extends TestCase { + public void testLastId() { + TreeTable treeTable = new TreeTable(); + + assertFalse(treeTable.isLastId(treeTable.getValue())); + } +} |