From b111777140142adc6bc824ef32b7599d9f784f8e Mon Sep 17 00:00:00 2001
From: Jonatan Kronqvist <jonatan.kronqvist@itmill.com>
Date: Fri, 2 Sep 2011 13:25:51 +0000
Subject: [PATCH] Fix for #7534

svn changeset:20827/svn branch:6.7
---
 src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java | 6 ++----
 src/com/vaadin/ui/TreeTable.java                      | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java b/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
index ecc065e117..8730b580dd 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
@@ -84,10 +84,8 @@ public class VTreeTable extends VScrollTable {
             collapseRequest = false;
         }
         if (uidl.hasAttribute("focusedRow")) {
-            // TODO figure out if the row needs to focused at all
-
-            // scrolled to parent by the server, focusedRow is probably the sam
-            // as the first row in view port
+            String key = uidl.getStringAttribute("focusedRow");
+            setRowFocus(getRenderedRowByKey(key));
         }
     }
 
diff --git a/src/com/vaadin/ui/TreeTable.java b/src/com/vaadin/ui/TreeTable.java
index 6832e68d3b..7971d292bc 100644
--- a/src/com/vaadin/ui/TreeTable.java
+++ b/src/com/vaadin/ui/TreeTable.java
@@ -390,16 +390,15 @@ public class TreeTable extends Table implements Hierarchical {
         if (!inView) {
             setCurrentPageFirstItemId(itemId);
         }
+        // Select the row if it is selectable.
         if (isSelectable()) {
             if (isMultiSelect()) {
                 setValue(Collections.singleton(itemId));
             } else {
                 setValue(itemId);
             }
-        } else {
-            // just instruct the VTreeTable to set focus the row (not to select)
-            setFocusedRow(itemId);
         }
+        setFocusedRow(itemId);
     }
 
     private void setFocusedRow(Object itemId) {
-- 
2.39.5