1 files changed, 44 insertions, 4 deletions
diff --git a/server/src/com/vaadin/data/util/AbstractContainer.java b/server/src/com/vaadin/data/util/AbstractContainer.java
index fbce468bce..ff8fc90651 100644
--- a/server/src/com/vaadin/data/util/AbstractContainer.java
+++ b/server/src/com/vaadin/data/util/AbstractContainer.java
@@ -100,7 +100,8 @@ public abstract class AbstractContainer implements Container {
      * 
      * @see PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener)
      */
-    protected void addListener(Container.PropertySetChangeListener listener) {
+    protected void addPropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (getPropertySetChangeListeners() == null) {
             setPropertySetChangeListeners(new LinkedList<Container.PropertySetChangeListener>());
         }
@@ -108,6 +109,15 @@ public abstract class AbstractContainer implements Container {
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    protected void addListener(Container.PropertySetChangeListener listener) {
+        addPropertySetChangeListener(listener);
+    }
+
+    /**
      * Implementation of the corresponding method in
      * {@link PropertySetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
@@ -115,12 +125,22 @@ public abstract class AbstractContainer implements Container {
      * @see PropertySetChangeNotifier#removeListener(com.vaadin.data.Container.
      *      PropertySetChangeListener)
      */
-    protected void removeListener(Container.PropertySetChangeListener listener) {
+    protected void removePropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (getPropertySetChangeListeners() != null) {
             getPropertySetChangeListeners().remove(listener);
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    protected void removeListener(Container.PropertySetChangeListener listener) {
+        removePropertySetChangeListener(listener);
+    }
+
     // ItemSetChangeNotifier
 
     /**
@@ -130,7 +150,8 @@ public abstract class AbstractContainer implements Container {
      * 
      * @see ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener)
      */
-    protected void addListener(Container.ItemSetChangeListener listener) {
+    protected void addItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (getItemSetChangeListeners() == null) {
             setItemSetChangeListeners(new LinkedList<Container.ItemSetChangeListener>());
         }
@@ -138,19 +159,38 @@ public abstract class AbstractContainer implements Container {
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    protected void addListener(Container.ItemSetChangeListener listener) {
+        addItemSetChangeListener(listener);
+    }
+
+    /**
      * Implementation of the corresponding method in
      * {@link ItemSetChangeNotifier}, override with the corresponding public
      * method and implement the interface to use this.
      * 
      * @see ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener)
      */
-    protected void removeListener(Container.ItemSetChangeListener listener) {
+    protected void removeItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (getItemSetChangeListeners() != null) {
             getItemSetChangeListeners().remove(listener);
         }
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    protected void removeListener(Container.ItemSetChangeListener listener) {
+        removeItemSetChangeListener(listener);
+    }
+
+    /**
      * Sends a simple Property set change event to all interested listeners.
      */
     protected void fireContainerPropertySetChange() {