From b18bf1e1f3c52e41eea044faff427af9ffde5fe8 Mon Sep 17 00:00:00 2001
From: Bogdan Udrescu <bogdan@vaadin.com>
Date: Fri, 15 Aug 2014 07:59:14 +0300
Subject: [PATCH] TabSheet focus/blur patch for 7.3 (#14304)

Remove the listeners from VTabSheet and use them as inner.

Change-Id: I65bc84fe6120abcaa01d22fcc373802f4f773bdc
---
 .../src/com/vaadin/client/ui/VTabsheet.java   | 28 +++----------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java
index aff1848647..e5afbea4b4 100644
--- a/client/src/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/com/vaadin/client/ui/VTabsheet.java
@@ -76,10 +76,7 @@ import com.vaadin.shared.ui.tabsheet.TabState;
 import com.vaadin.shared.ui.tabsheet.TabsheetServerRpc;
 import com.vaadin.shared.ui.tabsheet.TabsheetState;
 
-public class VTabsheet extends VTabsheetBase implements Focusable,
-        SubPartAware,
-        // TODO: These listeners are due to be removed in 7.3
-        FocusHandler, BlurHandler, KeyDownHandler {
+public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware {
 
     private static class VCloseEvent {
         private Tab tab;
@@ -1532,21 +1529,6 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
 
     }
 
-    @Override
-    public void onBlur(BlurEvent event) {
-        selectionHandler.onBlur(event);
-    }
-
-    @Override
-    public void onFocus(FocusEvent event) {
-        selectionHandler.onFocus(event);
-    }
-
-    @Override
-    public void onKeyDown(KeyDownEvent event) {
-        selectionHandler.onKeyDown(event);
-    }
-
     /*
      * The tabs selection handler instance.
      */
@@ -1570,11 +1552,9 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
          */
         public void registerTab(Tab tab) {
 
-            // TODO: change VTabsheet.this to this in 7.3
-            tab.addBlurHandler(VTabsheet.this);
-            tab.addFocusHandler(VTabsheet.this);
-            tab.addKeyDownHandler(VTabsheet.this);
-
+            tab.addBlurHandler(this);
+            tab.addFocusHandler(this);
+            tab.addKeyDownHandler(this);
             tab.addClickHandler(this);
             tab.addMouseDownHandler(this);
         }
-- 
2.39.5