diff options
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]; } |