diff options
| author | Jonatan Kronqvist <jonatan.kronqvist@itmill.com> | 2011-09-23 06:51:57 +0000 |
|---|---|---|
| committer | Jonatan Kronqvist <jonatan.kronqvist@itmill.com> | 2011-09-23 06:51:57 +0000 |
| commit | 31634ac44058aea7fa778f8b5d88071bf2546813 (patch) | |
| tree | 80647432f21a8f4bd22e5c67755d3dad97ed22b5 /src | |
| parent | 8746955c7a11dcf6f334009c0299187185e95439 (diff) | |
| download | vaadin-framework-31634ac44058aea7fa778f8b5d88071bf2546813.tar.gz vaadin-framework-31634ac44058aea7fa778f8b5d88071bf2546813.zip | |
[21231] broke spanned generated rows, this commit fixes the bug (#7538)
svn changeset:21255/svn branch:6.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/ui/Table.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java index 7eba2a7504..fb8610f0b9 100644 --- a/src/com/vaadin/ui/Table.java +++ b/src/com/vaadin/ui/Table.java @@ -1646,12 +1646,11 @@ public class Table extends AbstractSelect implements Action.Container, } if (isGeneratedRow) { - if (generatedRow.isSpanColumns()) { - if (j > 0) { - value = null; - } else if (generatedRow.getValue() instanceof Component) { - value = generatedRow.getValue(); - } + if (generatedRow.isSpanColumns() && j > 0) { + value = null; + } else if (generatedRow.isSpanColumns() && j == 0 + && generatedRow.getValue() instanceof Component) { + value = generatedRow.getValue(); } else if (generatedRow.getText().length > j) { value = generatedRow.getText()[j]; } |