]> source.dussan.org Git - vaadin-framework.git/commitdiff
Fix Grid Footer to be visible by default (#13334)
authorTeemu Suo-Anttila <teemusa@vaadin.com>
Tue, 26 Aug 2014 10:21:37 +0000 (13:21 +0300)
committerVaadin Code Review <review@vaadin.com>
Tue, 26 Aug 2014 13:03:15 +0000 (13:03 +0000)
Change-Id: Ib2cc3be7b935bfbe78b34cd05c41d9d42292926d

server/src/com/vaadin/ui/components/grid/GridFooter.java
server/tests/src/com/vaadin/tests/server/component/grid/GridColumns.java
uitest/src/com/vaadin/tests/components/grid/GridColspans.java

index 0a28a481cf9b911be0f5f9da6ca3888b9b0e4576..2af991a39c74fb0fa0693364ef3d3a9ac0b9a06b 100644 (file)
@@ -50,7 +50,6 @@ public class GridFooter extends GridStaticSection<GridFooter.FooterRow> {
     protected GridFooter(Grid grid) {
         this.grid = grid;
         grid.getState(true).footer = footerState;
-        setVisible(false);
     }
 
     @Override
index d1c821cc549be8f29ae81d21afc215fb21893368..d7f29b8014372dbfc19c267290e5405917ea5314 100644 (file)
@@ -185,16 +185,16 @@ public class GridColumns {
     @Test
     public void testFooterVisibility() throws Exception {
 
-        assertFalse(grid.getFooter().isVisible());
-        assertFalse(state.footer.visible);
-
-        grid.getFooter().setVisible(true);
         assertTrue(grid.getFooter().isVisible());
         assertTrue(state.footer.visible);
 
         grid.getFooter().setVisible(false);
         assertFalse(grid.getFooter().isVisible());
         assertFalse(state.footer.visible);
+
+        grid.getFooter().setVisible(true);
+        assertTrue(grid.getFooter().isVisible());
+        assertTrue(state.footer.visible);
     }
 
     @Test
index be12c2bcb2cb3754d489cf9ad1c5d9235a26ec61..7b905d540476ab31a14bf454b2493c745f9ff842 100644 (file)
@@ -64,8 +64,6 @@ public class GridColspans extends AbstractTestUI {
         footerRow.join("streetAddress", "zipCode", "city").setText("Address");
         footer.appendRow().join(dataSource.getContainerPropertyIds().toArray())
                 .setText("All the stuff");
-
-        footer.setVisible(true);
     }
 
     @Override