Fix for #5112

svn changeset:13499/svn branch:6.4

2 files changed, 10 insertions, 13 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index c6f74bc360..e8cf37c1ff 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -50,6 +50,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.Container;
+import com.vaadin.terminal.gwt.client.Focusable;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.RenderSpace;
@@ -90,7 +91,7 @@ import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation;
  */
 public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
         VHasDropHandler, KeyPressHandler, KeyDownHandler, FocusHandler,
-        BlurHandler {
+        BlurHandler, Focusable {
 
     public static final String CLASSNAME = "v-table";
     public static final String CLASSNAME_SELECTION_FOCUS = CLASSNAME + "-focus";
@@ -5038,4 +5039,12 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
         return false;
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.terminal.gwt.client.Focusable#focus()
+     */
+    public void focus() {
+        scrollBodyPanel.focus();
+    }
 }
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 336436530c..8c9a0afc3d 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -3080,18 +3080,6 @@ public class Table extends AbstractSelect implements Action.Container,
     }
 
     /**
-     * Focusing to this component is not supported.
-     * 
-     * @throws UnsupportedOperationException
-     *             if invoked.
-     * @see com.vaadin.ui.AbstractField#focus()
-     */
-    @Override
-    public void focus() throws UnsupportedOperationException {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
      * Gets the ID of the Item following the Item that corresponds to itemId.
      * 
      * @see com.vaadin.data.Container.Ordered#nextItemId(java.lang.Object)