diff options
| author | Jonatan Kronqvist <jonatan.kronqvist@itmill.com> | 2011-08-23 11:04:52 +0000 |
|---|---|---|
| committer | Jonatan Kronqvist <jonatan.kronqvist@itmill.com> | 2011-08-23 11:04:52 +0000 |
| commit | 30a10c6e93d839afafad031abc532a7520723134 (patch) | |
| tree | 13903e1d3ff402d9c81eb906dae7561978cae95b /src | |
| parent | b5ad3151338da797325195643c2de5f4f4829ef2 (diff) | |
| download | vaadin-framework-30a10c6e93d839afafad031abc532a7520723134.tar.gz vaadin-framework-30a10c6e93d839afafad031abc532a7520723134.zip | |
Fixes for issues found during review of #6720
- Don't statically set row height
- Table.RowGenerator and Table.GeneratedRow made Serializable
svn changeset:20561/svn branch:6.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 2 | ||||
| -rw-r--r-- | src/com/vaadin/ui/Table.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index 5c55a432b7..fda2c5798e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -5387,7 +5387,6 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, TableCellElement td = DOM.createTD().cast(); td.setColSpan(colCount); initCellWithWidget(w, align, style, sorted, td); - td.getStyle().setHeight(getRowHeight(), Unit.PX); } private void addSpannedCell(UIDL rowUidl, String text, char align, @@ -5398,7 +5397,6 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, td.setColSpan(colCount); initCellWithText(text, align, style, textIsHTML, sorted, description, td); - td.getStyle().setHeight(getRowHeight(), Unit.PX); } @Override diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java index 2b13467481..65340eaf91 100644 --- a/src/com/vaadin/ui/Table.java +++ b/src/com/vaadin/ui/Table.java @@ -4643,7 +4643,7 @@ public class Table extends AbstractSelect implements Action.Container, * * Row generators can be used for e.g. summary rows or grouping of items. */ - public interface RowGenerator { + public interface RowGenerator extends Serializable { /** * Called for every row that is painted in the Table. Returning a * GeneratedRow object will cause the row to be painted based on the @@ -4677,7 +4677,7 @@ public class Table extends AbstractSelect implements Action.Container, public GeneratedRow generateRow(Table table, Object itemId); } - public static class GeneratedRow { + public static class GeneratedRow implements Serializable { private boolean htmlContentAllowed = false; private boolean spanColumns = false; private String[] text = null; |