1 files changed, 65 insertions, 6 deletions

diff --git a/server/src/com/vaadin/data/util/IndexedContainer.java b/server/src/com/vaadin/data/util/IndexedContainer.java
index 5566b2f18c..e0a8fe1dc1 100644
--- a/server/src/com/vaadin/data/util/IndexedContainer.java
+++ b/server/src/com/vaadin/data/util/IndexedContainer.java
@@ -483,13 +483,35 @@ public class IndexedContainer extends
     }
 
     @Override
+    public void addPropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
+        super.addPropertySetChangeListener(listener);
+    }
+
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    @Override
     public void addListener(Container.PropertySetChangeListener listener) {
-        super.addListener(listener);
+        addPropertySetChangeListener(listener);
     }
 
     @Override
+    public void removePropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
+        super.removePropertySetChangeListener(listener);
+    }
+
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    @Override
     public void removeListener(Container.PropertySetChangeListener listener) {
-        super.removeListener(listener);
+        removePropertySetChangeListener(listener);
     }
 
     /*
@@ -499,13 +521,22 @@ public class IndexedContainer extends
      * vaadin.data.Property.ValueChangeListener)
      */
     @Override
-    public void addListener(Property.ValueChangeListener listener) {
+    public void addValueChangeListener(Property.ValueChangeListener listener) {
         if (propertyValueChangeListeners == null) {
             propertyValueChangeListeners = new LinkedList<Property.ValueChangeListener>();
         }
         propertyValueChangeListeners.add(listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Property.ValueChangeListener listener) {
+        addValueChangeListener(listener);
+    }
+
     /*
      * (non-Javadoc)
      * 
@@ -513,13 +544,22 @@ public class IndexedContainer extends
      * .vaadin.data.Property.ValueChangeListener)
      */
     @Override
-    public void removeListener(Property.ValueChangeListener listener) {
+    public void removeValueChangeListener(Property.ValueChangeListener listener) {
         if (propertyValueChangeListeners != null) {
             propertyValueChangeListeners.remove(listener);
         }
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Property.ValueChangeListener listener) {
+        removeValueChangeListener(listener);
+    }
+
+    /**
      * Sends a Property value change event to all interested listeners.
      * 
      * @param source
@@ -965,10 +1005,19 @@ public class IndexedContainer extends
          * com.vaadin.data.Property.ValueChangeListener)
          */
         @Override
-        public void addListener(Property.ValueChangeListener listener) {
+        public void addValueChangeListener(Property.ValueChangeListener listener) {
             addSinglePropertyChangeListener(propertyId, itemId, listener);
         }
 
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+         **/
+        @Deprecated
+        public void addListener(Property.ValueChangeListener listener) {
+            addValueChangeListener(listener);
+        }
+
         /*
          * (non-Javadoc)
          * 
@@ -976,10 +1025,20 @@ public class IndexedContainer extends
          * (com.vaadin.data.Property.ValueChangeListener)
          */
         @Override
-        public void removeListener(Property.ValueChangeListener listener) {
+        public void removeValueChangeListener(
+                Property.ValueChangeListener listener) {
             removeSinglePropertyChangeListener(propertyId, itemId, listener);
         }
 
+        /**
+         * @deprecated Since 7.0, replaced by
+         *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+         **/
+        @Deprecated
+        public void removeListener(Property.ValueChangeListener listener) {
+            removeValueChangeListener(listener);
+        }
+
         private IndexedContainer getHost() {
             return IndexedContainer.this;
         }