From 6bfa71999a08d7ac77c2699a82d97a066b9ce55e Mon Sep 17 00:00:00 2001
From: Henrik Paul <henrik@vaadin.com>
Date: Tue, 7 Oct 2014 11:19:33 +0300
Subject: [PATCH] Moves AbstractRowContainer.refreshRows (#13334)

Because it was weird how BodyRowContainer overrode the
AbstractRowContainer's method without calling super. It was hard to
find at some times.

Change-Id: I2aef9773e3f6fa18e8b35ed2baf0ad110a81a545
---
 .../com/vaadin/client/ui/grid/Escalator.java  | 64 ++++++++++---------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/client/src/com/vaadin/client/ui/grid/Escalator.java b/client/src/com/vaadin/client/ui/grid/Escalator.java
index c2ea874574..b3aebb1ec4 100644
--- a/client/src/com/vaadin/client/ui/grid/Escalator.java
+++ b/client/src/com/vaadin/client/ui/grid/Escalator.java
@@ -1219,7 +1219,7 @@ public class Escalator extends Widget implements RequiresResize, DeferredWorker
 
         }
 
-        private void assertArgumentsAreValidAndWithinRange(final int index,
+        protected void assertArgumentsAreValidAndWithinRange(final int index,
                 final int numberOfRows) throws IllegalArgumentException,
                 IndexOutOfBoundsException {
             if (numberOfRows < 1) {
@@ -1412,35 +1412,8 @@ public class Escalator extends Widget implements RequiresResize, DeferredWorker
          * @see #hasColumnAndRowData()
          */
         @Override
-        public void refreshRows(final int index, final int numberOfRows) {
-            Profiler.enter("Escalator.AbstractRowContainer.refreshRows");
-
-            assertArgumentsAreValidAndWithinRange(index, numberOfRows);
-
-            if (!isAttached()) {
-                return;
-            }
-
-            /*
-             * TODO [[rowheight]]: even if no rows are evaluated in the current
-             * viewport, the heights of some unrendered rows might change in a
-             * refresh. This would cause the scrollbar to be adjusted (in
-             * scrollHeight and/or scrollTop). Do we want to take this into
-             * account?
-             */
-            if (hasColumnAndRowData()) {
-                /*
-                 * TODO [[rowheight]]: nudge rows down with
-                 * refreshRowPositions() as needed
-                 */
-                for (int row = index; row < index + numberOfRows; row++) {
-                    final TableRowElement tr = getTrByVisualIndex(row);
-                    refreshRow(tr, row);
-                }
-            }
-
-            Profiler.leave("Escalator.AbstractRowContainer.refreshRows");
-        }
+        // overridden because of JavaDoc
+        public abstract void refreshRows(final int index, final int numberOfRows);
 
         void refreshRow(final TableRowElement tr, final int logicalRowIndex) {
             flyweightRow.setup(tr, logicalRowIndex,
@@ -1977,6 +1950,37 @@ public class Escalator extends Widget implements RequiresResize, DeferredWorker
          * A table section is either header, body or footer.
          */
         protected abstract void sectionHeightCalculated();
+
+        @Override
+        public void refreshRows(final int index, final int numberOfRows) {
+            Profiler.enter("Escalator.AbstractStaticRowContainer.refreshRows");
+
+            assertArgumentsAreValidAndWithinRange(index, numberOfRows);
+
+            if (!isAttached()) {
+                return;
+            }
+
+            /*
+             * TODO [[rowheight]]: even if no rows are evaluated in the current
+             * viewport, the heights of some unrendered rows might change in a
+             * refresh. This would cause the scrollbar to be adjusted (in
+             * scrollHeight and/or scrollTop). Do we want to take this into
+             * account?
+             */
+            if (hasColumnAndRowData()) {
+                /*
+                 * TODO [[rowheight]]: nudge rows down with
+                 * refreshRowPositions() as needed
+                 */
+                for (int row = index; row < index + numberOfRows; row++) {
+                    final TableRowElement tr = getTrByVisualIndex(row);
+                    refreshRow(tr, row);
+                }
+            }
+
+            Profiler.leave("Escalator.AbstractStaticRowContainer.refreshRows");
+        }
     }
 
     private class HeaderRowContainer extends AbstractStaticRowContainer {
-- 
2.39.5