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

diff --git a/WebContent/VAADIN/themes/reindeer/table/table.css b/WebContent/VAADIN/themes/reindeer/table/table.css
index 461f4642b3f47ef04b26f0dcc7148ed22bea90ec..d4e7046d2b4940a98bb44df670608d6e6c0042b5 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/table/table.css
+++ b/WebContent/VAADIN/themes/reindeer/table/table.css
@@ -122,7 +122,7 @@
        background: #eff0f1;
 }
 .v-table-generated-row {
-       background: #dcdee0;
+    background: #dcdee0;
     text-transform: uppercase;
     font-size: 10px;
     font-weight: bold;
@@ -130,6 +130,10 @@
     text-shadow: #f3f5f8 0 1px 0;
     line-height: normal;
 }
+.v-table-generated-row .v-table-cell-content {
+    padding-top: 1px;
+    padding-bottom: 2px;
+}
 .v-table-cell-content:last-child {
        border-right-color: transparent;
 }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 5c55a432b720d5a721b03bb59350a910dc1350cf..fda2c5798e05e76fe3c38f9056192f6d223aea4c 100644 (file)
--- 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 2b13467481414551b56f967a5707bf2618edf2da..65340eaf919079bbef9529fd45ebc012ee10c864 100644 (file)
--- 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;