From 10415247e58f4d3c768fafe5dad9ec1b35383e6b Mon Sep 17 00:00:00 2001
From: Aleksi Hietanen <aleksi@vaadin.com>
Date: Mon, 12 Dec 2016 11:43:37 +0200
Subject: [PATCH] Remove unused EventListener interface (#7953)

Closes vaadin/framework8-issues#550
---
 .../java/com/vaadin/event/EventListener.java  | 50 -------------------
 server/src/main/java/com/vaadin/ui/Grid.java  | 10 ++--
 2 files changed, 6 insertions(+), 54 deletions(-)
 delete mode 100644 server/src/main/java/com/vaadin/event/EventListener.java

diff --git a/server/src/main/java/com/vaadin/event/EventListener.java b/server/src/main/java/com/vaadin/event/EventListener.java
deleted file mode 100644
index 4bce75245a..0000000000
--- a/server/src/main/java/com/vaadin/event/EventListener.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.event;
-
-import java.util.function.Consumer;
-
-/**
- * A generic interface for connector event listeners.
- *
- * @author Vaadin Ltd.
- *
- * @param <EVENT>
- *            the event type
- *
- * @since 8.0
- */
-@FunctionalInterface
-public interface EventListener<EVENT extends ConnectorEvent>
-        extends Consumer<EVENT>, ConnectorEventListener {
-
-    /**
-     * Invoked when this listener receives an event from the event source to
-     * which it has been added.
-     * <p>
-     * <strong>Implementation note:</strong>In addition to customizing the
-     * Javadoc, this override is needed in all extending interfaces to make
-     * ReflectTools.findMethod work as expected. It uses
-     * Class.getDeclaredMethod, but even if it used getMethod instead, the
-     * superinterface argument type is ConnectorEvent, not the actual event
-     * type, after type erasure.
-     *
-     * @param event
-     *            the received event, not null
-     */
-    @Override
-    public void accept(EVENT event);
-}
diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java
index 7d9913409e..4e0b8b7457 100644
--- a/server/src/main/java/com/vaadin/ui/Grid.java
+++ b/server/src/main/java/com/vaadin/ui/Grid.java
@@ -33,6 +33,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.BinaryOperator;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -44,8 +45,8 @@ import com.vaadin.data.BinderValidationStatus;
 import com.vaadin.data.Listing;
 import com.vaadin.data.SelectionModel;
 import com.vaadin.event.ConnectorEvent;
+import com.vaadin.event.ConnectorEventListener;
 import com.vaadin.event.ContextClickEvent;
-import com.vaadin.event.EventListener;
 import com.vaadin.event.selection.MultiSelectionListener;
 import com.vaadin.event.selection.SelectionListener;
 import com.vaadin.event.selection.SingleSelectionListener;
@@ -163,8 +164,8 @@ public class Grid<T> extends AbstractListing<T>
         },
 
         /**
-         * Multiselection mode that maps to build-in
-         * {@link MultiSelectionModel}.
+         * Multiselection mode that maps to build-in {@link MultiSelectionModel}
+         * .
          *
          * @see MultiSelectionModelImpl
          */
@@ -472,7 +473,8 @@ public class Grid<T> extends AbstractListing<T>
      * @see Registration
      */
     @FunctionalInterface
-    public interface ItemClickListener<T> extends EventListener<ItemClick<T>> {
+    public interface ItemClickListener<T>
+            extends Consumer<ItemClick<T>>, ConnectorEventListener {
         /**
          * Invoked when this listener receives a item click event from a Grid to
          * which it has been added.
-- 
2.39.5