1 files changed, 40 insertions, 4 deletions

diff --git a/server/src/com/vaadin/ui/AbstractComponentContainer.java b/server/src/com/vaadin/ui/AbstractComponentContainer.java
index 8dd440828b..cf3bf1d2b9 100644
--- a/server/src/com/vaadin/ui/AbstractComponentContainer.java
+++ b/server/src/com/vaadin/ui/AbstractComponentContainer.java
@@ -106,33 +106,69 @@ public abstract class AbstractComponentContainer extends AbstractComponent
 
     /* documented in interface */
     @Override
-    public void addListener(ComponentAttachListener listener) {
+    public void addComponentAttachListener(ComponentAttachListener listener) {
         addListener(ComponentContainer.ComponentAttachEvent.class, listener,
                 COMPONENT_ATTACHED_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addComponentAttachListener(com.vaadin.ui.ComponentContainer.ComponentAttachListener)}
+     **/
+    @Deprecated
+    public void addListener(ComponentAttachListener listener) {
+        addComponentAttachListener(listener);
+    }
+
     /* documented in interface */
     @Override
-    public void addListener(ComponentDetachListener listener) {
+    public void addComponentDetachListener(ComponentDetachListener listener) {
         addListener(ComponentContainer.ComponentDetachEvent.class, listener,
                 COMPONENT_DETACHED_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addComponentDetachListener(com.vaadin.ui.ComponentContainer.ComponentDetachListener)}
+     **/
+    @Deprecated
+    public void addListener(ComponentDetachListener listener) {
+        addComponentDetachListener(listener);
+    }
+
     /* documented in interface */
     @Override
-    public void removeListener(ComponentAttachListener listener) {
+    public void removeComponentAttachListener(ComponentAttachListener listener) {
         removeListener(ComponentContainer.ComponentAttachEvent.class, listener,
                 COMPONENT_ATTACHED_METHOD);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeComponentAttachListener(com.vaadin.ui.ComponentContainer.ComponentAttachListener)}
+     **/
+    @Deprecated
+    public void removeListener(ComponentAttachListener listener) {
+        removeComponentAttachListener(listener);
+    }
+
     /* documented in interface */
     @Override
-    public void removeListener(ComponentDetachListener listener) {
+    public void removeComponentDetachListener(ComponentDetachListener listener) {
         removeListener(ComponentContainer.ComponentDetachEvent.class, listener,
                 COMPONENT_DETACHED_METHOD);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeComponentDetachListener(com.vaadin.ui.ComponentContainer.ComponentDetachListener)}
+     **/
+    @Deprecated
+    public void removeListener(ComponentDetachListener listener) {
+        removeComponentDetachListener(listener);
+    }
+
+    /**
      * Fires the component attached event. This should be called by the
      * addComponent methods after the component have been added to this
      * container.