From 2041e6273e0dfb2e4e38b00ec1470e691ea115b8 Mon Sep 17 00:00:00 2001
From: Automerge <automerge@vaadin.com>
Date: Fri, 18 May 2012 08:45:07 +0000
Subject: [PATCH] [merge from 6.7] #8810 Fix row collapse animation as well

svn changeset:23764/svn branch:6.8
---
 .../terminal/gwt/client/ui/VTreeTable.java    | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java b/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
index 13a60c74b9..324efcb67d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
@@ -478,18 +478,23 @@ public class VTreeTable extends VScrollTable {
                     rowsToDelete.add(row);
                 }
             }
-            RowCollapseAnimation anim = new RowCollapseAnimation(rowsToDelete) {
-                @Override
-                protected void onComplete() {
-                    super.onComplete();
-                    // Actually unlink the rows and update the cache after the
-                    // animation is done.
-                    unlinkAndReindexRows(firstIndex, rows);
-                    discardRowsOutsideCacheWindow();
-                    ensureCacheFilled();
-                }
-            };
-            anim.run(150);
+            if (!rowsToDelete.isEmpty()) {
+                // #8810 Only animate if there's something to animate
+                RowCollapseAnimation anim = new RowCollapseAnimation(
+                        rowsToDelete) {
+                    @Override
+                    protected void onComplete() {
+                        super.onComplete();
+                        // Actually unlink the rows and update the cache after
+                        // the
+                        // animation is done.
+                        unlinkAndReindexRows(firstIndex, rows);
+                        discardRowsOutsideCacheWindow();
+                        ensureCacheFilled();
+                    }
+                };
+                anim.run(150);
+            }
         }
 
         protected List<VScrollTableRow> insertRowsAnimated(UIDL rowData,
@@ -747,6 +752,10 @@ public class VTreeTable extends VScrollTable {
 
             private final List<VScrollTableRow> rows;
 
+            /**
+             * @param rows
+             *            List of rows to animate. Must not be empty.
+             */
             public RowCollapseAnimation(List<VScrollTableRow> rows) {
                 super(rows);
                 this.rows = rows;
-- 
2.39.5