From 5778c65bdef65337f8cbcc9d0504abbd11f8278f Mon Sep 17 00:00:00 2001
From: Denis <denis@vaadin.com>
Date: Wed, 7 Dec 2016 13:27:43 +0200
Subject: 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
---
 .../main/java/com/vaadin/event/FieldEvents.java    | 28 ----------------------
 .../main/java/com/vaadin/ui/AbstractDateField.java | 12 ----------
 .../main/java/com/vaadin/ui/AbstractFocusable.java | 12 ----------
 server/src/main/java/com/vaadin/ui/CheckBox.java   | 12 ----------
 .../src/main/java/com/vaadin/ui/CheckBoxGroup.java | 12 ----------
 server/src/main/java/com/vaadin/ui/ComboBox.java   | 12 ----------
 .../src/main/java/com/vaadin/ui/NativeSelect.java  | 12 ----------
 .../main/java/com/vaadin/ui/RadioButtonGroup.java  | 12 ----------
 server/src/main/java/com/vaadin/ui/TabSheet.java   | 12 ----------
 server/src/main/java/com/vaadin/ui/Window.java     | 12 ----------
 10 files changed, 136 deletions(-)

(limited to 'server')

diff --git a/server/src/main/java/com/vaadin/event/FieldEvents.java b/server/src/main/java/com/vaadin/event/FieldEvents.java
index b0e539961b..4673318890 100644
--- 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 1d3f1ee7b2..43d374c392 100644
--- 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 959a18fc80..2ad0e4a9f5 100644
--- 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 aa7cc565eb..8675332eb5 100644
--- 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 016b5ca392..508d4ed4cc 100644
--- 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 093c5e9c7a..036d4bec1e 100644
--- 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 b376979678..e7678b7515 100644
--- 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 325efd0457..0f3bd43c98 100644
--- 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 396c4975c1..58d67edc16 100644
--- 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 028c585863..c3a66a6c18 100644
--- 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}
      *
-- 
cgit v1.2.3