Rename ComponentEventListener to ConnectorEventListener (#10340)

Change-Id: I8e5d60e0e6d7003eeff984ceb0b4bf04347267b0

4 files changed, 9 insertions, 9 deletions

diff --git a/server/src/com/vaadin/ui/AbstractSplitPanel.java b/server/src/com/vaadin/ui/AbstractSplitPanel.java
index 926c8e2c86..5e3f7ec24d 100644
--- a/server/src/com/vaadin/ui/AbstractSplitPanel.java
+++ b/server/src/com/vaadin/ui/AbstractSplitPanel.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Iterator;
 
-import com.vaadin.event.ComponentEventListener;
+import com.vaadin.event.ConnectorEventListener;
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.server.Sizeable;
 import com.vaadin.shared.EventId;
@@ -477,7 +477,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
      * @see SplitterClickEvent
      * @since 6.2
      */
-    public interface SplitterClickListener extends ComponentEventListener {
+    public interface SplitterClickListener extends ConnectorEventListener {
 
         public static final Method clickMethod = ReflectTools.findMethod(
                 SplitterClickListener.class, "splitterClick",
diff --git a/server/src/com/vaadin/ui/Component.java b/server/src/com/vaadin/ui/Component.java
index afde1cdbdf..20fb10b5dc 100644
--- a/server/src/com/vaadin/ui/Component.java
+++ b/server/src/com/vaadin/ui/Component.java
@@ -17,9 +17,10 @@
 package com.vaadin.ui;
 
 import java.io.Serializable;
-import java.util.EventListener;
 import java.util.Locale;
 
+import com.vaadin.event.ConnectorEvent;
+import com.vaadin.event.ConnectorEventListener;
 import com.vaadin.event.FieldEvents;
 import com.vaadin.server.ClientConnector;
 import com.vaadin.server.ErrorMessage;
@@ -817,7 +818,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable {
      * 
      * @see Component#addListener(Listener)
      */
-    public interface Listener extends EventListener, Serializable {
+    public interface Listener extends ConnectorEventListener {
 
         /**
          * Notifies the listener of a component event.
diff --git a/server/src/com/vaadin/ui/LegacyComponent.java b/server/src/com/vaadin/ui/LegacyComponent.java
index f7c5194bfd..694ab3114e 100644
--- a/server/src/com/vaadin/ui/LegacyComponent.java
+++ b/server/src/com/vaadin/ui/LegacyComponent.java
@@ -15,8 +15,7 @@
  */
 package com.vaadin.ui;
 
-import java.util.EventListener;
-
+import com.vaadin.event.ConnectorEventListener;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
 import com.vaadin.server.VariableOwner;
@@ -35,7 +34,7 @@ import com.vaadin.server.VariableOwner;
  */
 @Deprecated
 public interface LegacyComponent extends VariableOwner, Component,
-        EventListener {
+        ConnectorEventListener {
 
     /**
      * <p>
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index d8e440a0bf..2887c71adf 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -20,7 +20,6 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EventListener;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
@@ -28,6 +27,7 @@ import java.util.Map;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ActionManager;
+import com.vaadin.event.ConnectorEventListener;
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
 import com.vaadin.navigator.Navigator;
@@ -101,7 +101,7 @@ public abstract class UI extends AbstractSingleComponentContainer implements
      * Interface for listening {@link UI.CleanupEvent UI cleanup events}.
      * 
      */
-    public interface CleanupListener extends EventListener {
+    public interface CleanupListener extends ConnectorEventListener {
 
         public static final Method cleanupMethod = ReflectTools.findMethod(
                 CleanupListener.class, "cleanup", CleanupEvent.class);