Don't use V8 FieldEvents classes in v7 compatibility module. (#93)

* Don't use V8 FieldEvents classes in v7 compatibility module.

Fixes vaadin/framework8-issues#363

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
index 7422fd8ffc0bc0ce8d2b99ef090ebcc403b10db1..627b4cf25cf9ebefcdcb5f46fe239119daac5291 100644 (file)
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
@@ -45,6 +45,10 @@ import org.jsoup.select.Elements;
 import com.vaadin.data.sort.Sort;
 import com.vaadin.data.sort.SortOrder;
 import com.vaadin.event.ContextClickEvent;
+import com.vaadin.event.FieldEvents.BlurEvent;
+import com.vaadin.event.FieldEvents.BlurListener;
+import com.vaadin.event.FieldEvents.FocusEvent;
+import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.event.SortEvent;
 import com.vaadin.event.SortEvent.SortListener;
 import com.vaadin.event.SortEvent.SortNotifier;
@@ -60,8 +64,9 @@ import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.Registration;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.shared.util.SharedUtil;
-import com.vaadin.ui.AbstractFocusable;
+import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Component;
+import com.vaadin.ui.Component.Focusable;
 import com.vaadin.ui.ConnectorTracker;
 import com.vaadin.ui.SelectiveRenderer;
 import com.vaadin.ui.UI;
@@ -89,6 +94,8 @@ import com.vaadin.v7.data.fieldgroup.FieldGroupFieldFactory;
 import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.data.util.converter.ConverterUtil;
+import com.vaadin.v7.event.FieldEvents.BlurNotifier;
+import com.vaadin.v7.event.FieldEvents.FocusNotifier;
 import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
@@ -186,8 +193,9 @@ import elemental.json.JsonValue;
  * @author Vaadin Ltd
  */
 @Deprecated
-public class Grid extends AbstractFocusable implements SelectionNotifier,
-        SortNotifier, SelectiveRenderer, ItemClickNotifier {
+public class Grid extends AbstractComponent
+        implements SelectionNotifier, SortNotifier, SelectiveRenderer,
+        ItemClickNotifier, Focusable, FocusNotifier, BlurNotifier {
 
     /**
      * An event listener for column visibility change events in the Grid.
@@ -7409,6 +7417,43 @@ public class Grid extends AbstractFocusable implements SelectionNotifier,
         }
     }
 
+    @Override
+    public void addBlurListener(BlurListener listener) {
+        addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
+                BlurListener.blurMethod);
+    }
+
+    @Override
+    public void removeBlurListener(BlurListener listener) {
+        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
+    }
+
+    @Override
+    public void addFocusListener(FocusListener listener) {
+        addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
+                FocusListener.focusMethod);
+    }
+
+    @Override
+    public void removeFocusListener(FocusListener listener) {
+        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
+    }
+
+    @Override
+    public void focus() {
+        super.focus();
+    }
+
+    @Override
+    public int getTabIndex() {
+        return getState(false).tabIndex;
+    }
+
+    @Override
+    public void setTabIndex(int tabIndex) {
+        getState().tabIndex = tabIndex;
+    }
+
     @Override
     protected Collection<String> getCustomAttributes() {
         Collection<String> result = super.getCustomAttributes();

diff --git a/server/src/main/java/com/vaadin/event/FieldEvents.java b/server/src/main/java/com/vaadin/event/FieldEvents.java
index b0e539961b757419d93b0e5c1f655b86768a720c..46733188904ec37df54eef21ab8105d703283096 100644 (file)
--- a/server/src/main/java/com/vaadin/event/FieldEvents.java
+++ b/server/src/main/java/com/vaadin/event/FieldEvents.java
@@ -55,19 +55,6 @@ public interface FieldEvents {
          */
         public Registration addFocusListener(FocusListener listener);
 
-        /**
-         * Removes a <code>BlurListener</code> from the Component.
-         *
-         * @param listener
-         * @see FocusListener
-         * @since 6.2
-         *
-         * @deprecated As of 8.0, replaced by {@link Registration#remove()} in
-         *             the registration object returned from
-         *             {@link #addFocusListener(FocusListener)}.
-         */
-        @Deprecated
-        public void removeFocusListener(FocusListener listener);
     }
 
     /**
@@ -94,21 +81,6 @@ public interface FieldEvents {
          */
         public Registration addBlurListener(BlurListener listener);
 
-        /**
-         * Removes a <code>BlurListener</code> from the Component.
-         *
-         * @see BlurListener
-         * @since 6.2
-         *
-         * @param listener
-         *            the listener to remove
-         * 
-         * @deprecated As of 8.0, replaced by {@link Registration#remove()} in
-         *             the registration object returned from
-         *             {@link #addFocusListener(FocusListener)}.
-         */
-        @Deprecated
-        public void removeBlurListener(BlurListener listener);
     }
 
     /**

diff --git a/server/src/main/java/com/vaadin/ui/AbstractDateField.java b/server/src/main/java/com/vaadin/ui/AbstractDateField.java
index 1d3f1ee7b28dc0d64d7f09e14338a645feadce24..43d374c392b075ae67cdb77c8e67ce2fe11cd836 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/AbstractDateField.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractDateField.java
@@ -573,24 +573,12 @@ public abstract class AbstractDateField extends AbstractField<LocalDate>
                 FocusListener.focusMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeFocusListener(FocusListener listener) {
-        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
-    }
-
     @Override
     public Registration addBlurListener(BlurListener listener) {
         return addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeBlurListener(BlurListener listener) {
-        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
-    }
-
     @Override
     public void readDesign(Element design, DesignContext designContext) {
         super.readDesign(design, designContext);

diff --git a/server/src/main/java/com/vaadin/ui/AbstractFocusable.java b/server/src/main/java/com/vaadin/ui/AbstractFocusable.java
index 959a18fc808dfd2b13a8fbabffc4fabb5812819e..2ad0e4a9f50a2b0ce36a570617e7ae893ca767c4 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/AbstractFocusable.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractFocusable.java
@@ -46,24 +46,12 @@ public abstract class AbstractFocusable extends AbstractComponent
                 BlurListener.blurMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeBlurListener(BlurListener listener) {
-        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
-    }
-
     @Override
     public Registration addFocusListener(FocusListener listener) {
         return addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
                 FocusListener.focusMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeFocusListener(FocusListener listener) {
-        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
-    }
-
     @Override
     public void focus() {
         super.focus();

diff --git a/server/src/main/java/com/vaadin/ui/CheckBox.java b/server/src/main/java/com/vaadin/ui/CheckBox.java
index aa7cc565ebd42ea265fae2cefb592331d0d003a3..8675332eb5414cc4a58e77cd63d98c895948cdd9 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/CheckBox.java
+++ b/server/src/main/java/com/vaadin/ui/CheckBox.java
@@ -144,24 +144,12 @@ public class CheckBox extends AbstractField<Boolean>
                 BlurListener.blurMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeBlurListener(BlurListener listener) {
-        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
-    }
-
     @Override
     public Registration addFocusListener(FocusListener listener) {
         return addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
                 FocusListener.focusMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeFocusListener(FocusListener listener) {
-        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
-    }
-
     /*
      * (non-Javadoc)
      *

diff --git a/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java b/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java
index 016b5ca3922c1278cd1adabdd83399e01bc5e7ce..508d4ed4cc17c1fa00075179f31a772e85fffe99 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java
+++ b/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java
@@ -160,24 +160,12 @@ public class CheckBoxGroup<T> extends AbstractMultiSelect<T>
                 FocusListener.focusMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeFocusListener(FocusListener listener) {
-        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
-    }
-
     @Override
     public Registration addBlurListener(BlurListener listener) {
         return addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeBlurListener(BlurListener listener) {
-        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
-    }
-
     @Override
     protected List<T> readItems(Element design, DesignContext context) {
         setItemEnabledProvider(new DeclarativeItemEnabledProvider<>());

diff --git a/server/src/main/java/com/vaadin/ui/ComboBox.java b/server/src/main/java/com/vaadin/ui/ComboBox.java
index 093c5e9c7ae5ade16273f1d89bd1127ee3e6679e..036d4bec1e7a5c44db1580e9e50ebfa610abc5fd 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/ComboBox.java
+++ b/server/src/main/java/com/vaadin/ui/ComboBox.java
@@ -331,24 +331,12 @@ public class ComboBox<T> extends AbstractSingleSelect<T>
                 BlurListener.blurMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeBlurListener(BlurListener listener) {
-        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
-    }
-
     @Override
     public Registration addFocusListener(FocusListener listener) {
         return addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
                 FocusListener.focusMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeFocusListener(FocusListener listener) {
-        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
-    }
-
     /**
      * Returns the page length of the suggestion popup.
      *

diff --git a/server/src/main/java/com/vaadin/ui/NativeSelect.java b/server/src/main/java/com/vaadin/ui/NativeSelect.java
index b376979678edb900bcd8df02ed50648ebbfd0b2a..e7678b75154a95b0acd0a180cc48cc42c4f4f9a8 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/NativeSelect.java
+++ b/server/src/main/java/com/vaadin/ui/NativeSelect.java
@@ -103,24 +103,12 @@ public class NativeSelect<T> extends AbstractSingleSelect<T>
                 FocusListener.focusMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeFocusListener(FocusListener listener) {
-        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
-    }
-
     @Override
     public Registration addBlurListener(BlurListener listener) {
         return addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeBlurListener(BlurListener listener) {
-        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
-    }
-
     @Override
     protected NativeSelectState getState() {
         return getState(true);

diff --git a/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java b/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java
index 325efd045775a616f41b1c0930f007ef0ef4f165..0f3bd43c98c762e7f2764e4e81681b59f4590a95 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java
+++ b/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java
@@ -229,24 +229,12 @@ public class RadioButtonGroup<T> extends AbstractSingleSelect<T>
                 FocusListener.focusMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeFocusListener(FocusListener listener) {
-        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
-    }
-
     @Override
     public Registration addBlurListener(BlurListener listener) {
         return addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
                 BlurListener.blurMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeBlurListener(BlurListener listener) {
-        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
-    }
-
     @Override
     protected List<T> readItems(Element design, DesignContext context) {
         setItemEnabledProvider(new DeclarativeItemEnabledProvider<>());

diff --git a/server/src/main/java/com/vaadin/ui/TabSheet.java b/server/src/main/java/com/vaadin/ui/TabSheet.java
index 396c4975c1fab95f7f8a8e6a140861da3c51764e..58d67edc16d169efbd4cd88468a03d485494ab7e 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/TabSheet.java
+++ b/server/src/main/java/com/vaadin/ui/TabSheet.java
@@ -1368,24 +1368,12 @@ public class TabSheet extends AbstractComponentContainer
                 BlurListener.blurMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeBlurListener(BlurListener listener) {
-        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
-    }
-
     @Override
     public Registration addFocusListener(FocusListener listener) {
         return addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
                 FocusListener.focusMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeFocusListener(FocusListener listener) {
-        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
-    }
-
     @Override
     public boolean isRendered(Component childComponent) {
         return childComponent == getSelectedTab();

diff --git a/server/src/main/java/com/vaadin/ui/Window.java b/server/src/main/java/com/vaadin/ui/Window.java
index 028c5858638d32d8ef8b2a7c587d7bbef7194f41..c3a66a6c18ca4a4abb89c1940df4bd24cff973ac 100644 (file)
--- a/server/src/main/java/com/vaadin/ui/Window.java
+++ b/server/src/main/java/com/vaadin/ui/Window.java
@@ -1170,12 +1170,6 @@ public class Window extends Panel
                 FocusListener.focusMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeFocusListener(FocusListener listener) {
-        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
-    }
-
     /*
      * (non-Javadoc)
      *
@@ -1189,12 +1183,6 @@ public class Window extends Panel
                 BlurListener.blurMethod);
     }
 
-    @Override
-    @Deprecated
-    public void removeBlurListener(BlurListener listener) {
-        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
-    }
-
     /**
      * {@inheritDoc}
      *

diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java
index 6fbb489c1f7671895ff2dc69767d02025ebc7309..7089a2e810557188a92e3392e26da5d26fb8145e 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTest.java
@@ -249,25 +249,31 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> extends
 
     protected Command<T, Boolean> focusListenerCommand = new Command<T, Boolean>() {
 
+        private Registration focusListenerRegistration;
+
         @Override
         public void execute(T c, Boolean value, Object data) {
-            FocusNotifier fn = (FocusNotifier) c;
+            FocusNotifier focusNotifier = (FocusNotifier) c;
             if (value) {
-                fn.addFocusListener(AbstractComponentTest.this);
-            } else {
-                fn.removeFocusListener(AbstractComponentTest.this);
+                focusListenerRegistration = focusNotifier
+                        .addFocusListener(AbstractComponentTest.this);
+            } else if (focusListenerRegistration != null) {
+                focusListenerRegistration.remove();
             }
         }
     };
     protected Command<T, Boolean> blurListenerCommand = new Command<T, Boolean>() {
 
+        private Registration blurListenerRegistration;
+
         @Override
         public void execute(T c, Boolean value, Object data) {
             BlurNotifier bn = (BlurNotifier) c;
             if (value) {
-                bn.addBlurListener(AbstractComponentTest.this);
-            } else {
-                bn.removeBlurListener(AbstractComponentTest.this);
+                blurListenerRegistration = bn
+                        .addBlurListener(AbstractComponentTest.this);
+            } else if (blurListenerRegistration != null) {
+                blurListenerRegistration.remove();
             }
         }
     };