diff options
| author | Artur Signell <artur.signell@itmill.com> | 2010-10-14 07:45:34 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2010-10-14 07:45:34 +0000 |
| commit | a14876b352538cc63c023d4444db0cbdbfe848cc (patch) | |
| tree | 5e3fac3ed36df8717d9cdbaf5bc9a324740c9c51 /src/com/vaadin/ui/Table.java | |
| parent | da911a6550a0c9f45267244d54def8c93f298401 (diff) | |
| download | vaadin-framework-a14876b352538cc63c023d4444db0cbdbfe848cc.tar.gz vaadin-framework-a14876b352538cc63c023d4444db0cbdbfe848cc.zip | |
Merged multiple bug fixes and test updates from 6.4
svn changeset:15546/svn branch:6.5
Diffstat (limited to 'src/com/vaadin/ui/Table.java')
| -rw-r--r-- | src/com/vaadin/ui/Table.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java index 790c44d09e..12f69ec606 100644 --- a/src/com/vaadin/ui/Table.java +++ b/src/com/vaadin/ui/Table.java @@ -1036,9 +1036,9 @@ public class Table extends AbstractSelect implements Action.Container, if (header == null) { columnHeaders.remove(propertyId); - return; + } else { + columnHeaders.put(propertyId, header); } - columnHeaders.put(propertyId, header); // Assures the visual refresh // FIXME: Is this really needed? Header captions should not affect @@ -4006,9 +4006,9 @@ public class Table extends AbstractSelect implements Action.Container, public void setColumnFooter(Object propertyId, String footer) { if (footer == null) { columnFooters.remove(propertyId); - return; + } else { + columnFooters.put(propertyId, footer); } - columnFooters.put(propertyId, footer); requestRepaint(); } |