Fix for focus lost when selecting a multipage range in the Table.

svn changeset:13051/svn branch:6.4

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index b241f2ac6eb94bf798771afd43db480b8b1f0913..c445aad43c9a4127d2b88ec583954f2378878af5 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -799,6 +799,10 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
             focusLastItemInNextRender = false;
         }
 
+        if (focusedRow != null) {
+            setRowFocus(getRenderedRowByKey(focusedRow.getKey()));
+        }
+
         rendering = false;
         headerChangedDuringUpdate = false;
     }
@@ -3931,6 +3935,11 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                 // above
                 if (startRow == null) {
                     startRow = (VScrollTableRow) scrollBody.iterator().next();
+                    setRowFocus(endRow);
+                }
+
+                if (endRow == null) {
+                    setRowFocus(startRow);
                 }
 
                 Iterator<Widget> rows = scrollBody.iterator();