]> source.dussan.org Git - vaadin-framework.git/commitdiff
Removes confusing "rowContainers" array (#13334)
authorHenrik Paul <henrik@vaadin.com>
Mon, 8 Sep 2014 08:57:39 +0000 (11:57 +0300)
committerHenrik Paul <henrik@vaadin.com>
Mon, 8 Sep 2014 08:57:39 +0000 (11:57 +0300)
Change-Id: I2bac21b418e31ac90bcac766f50409bee1294998

client/src/com/vaadin/client/ui/grid/Escalator.java

index b1782afb18e76a1a1c43e9e014b15eff4b9558cc..af23fdd70ab6163a318692f42c03917b68be4540 100644 (file)
@@ -3591,9 +3591,9 @@ public class Escalator extends Widget {
             }
 
             if (hasSomethingInDom()) {
-                for (final AbstractRowContainer rowContainer : rowContainers) {
-                    rowContainer.paintRemoveColumns(index, numberOfColumns);
-                }
+                header.paintRemoveColumns(index, numberOfColumns);
+                body.paintRemoveColumns(index, numberOfColumns);
+                footer.paintRemoveColumns(index, numberOfColumns);
 
                 final int firstRemovedColumnLeft = columnConfiguration
                         .getCalculatedColumnsWidth(Range.withLength(0, index));
@@ -3678,10 +3678,9 @@ public class Escalator extends Widget {
             }
 
             if (hasColumnAndRowData()) {
-                for (final AbstractRowContainer rowContainer : rowContainers) {
-                    rowContainer.paintInsertColumns(index, numberOfColumns,
-                            frozen);
-                }
+                header.paintInsertColumns(index, numberOfColumns, frozen);
+                body.paintInsertColumns(index, numberOfColumns, frozen);
+                footer.paintInsertColumns(index, numberOfColumns, frozen);
 
                 // this needs to be before the scrollbar adjustment.
                 scroller.recalculateScrollbarsForVirtualViewport();
@@ -3894,9 +3893,6 @@ public class Escalator extends Widget {
 
     private final Scroller scroller = new Scroller();
 
-    private final AbstractRowContainer[] rowContainers = new AbstractRowContainer[] {
-            header, body, footer };
-
     private final ColumnConfigurationImpl columnConfiguration = new ColumnConfigurationImpl();
     private final Element tableWrapper;
 
@@ -4318,9 +4314,10 @@ public class Escalator extends Widget {
         Profiler.enter("Escalator.recalculateElementSizes");
         widthOfEscalator = getPreciseWidth(getElement());
         heightOfEscalator = getPreciseHeight(getElement());
-        for (final AbstractRowContainer rowContainer : rowContainers) {
-            rowContainer.recalculateSectionHeight();
-        }
+
+        header.recalculateSectionHeight();
+        body.recalculateSectionHeight();
+        footer.recalculateSectionHeight();
 
         scroller.recalculateScrollbarsForVirtualViewport();
         body.verifyEscalatorCount();