Refak addListener package com.vaadin.data.util

8 files changed, 311 insertions, 37 deletions

diff --git a/server/src/com/vaadin/data/util/AbstractBeanContainer.java b/server/src/com/vaadin/data/util/AbstractBeanContainer.java
index 9cd4afa3c2..f0eca6a571 100644
--- a/server/src/com/vaadin/data/util/AbstractBeanContainer.java
+++ b/server/src/com/vaadin/data/util/AbstractBeanContainer.java
@@ -743,12 +743,24 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends
 
     @Override
     public void addListener(Container.PropertySetChangeListener listener) {
-        super.addListener(listener);
+        addPropertySetChangeListener(listener);
+    }
+
+    @Override
+    public void addPropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
+        super.addPropertySetChangeListener(listener);
     }
 
     @Override
     public void removeListener(Container.PropertySetChangeListener listener) {
-        super.removeListener(listener);
+        removePropertySetChangeListener(listener);
+    }
+
+    @Override
+    public void removePropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
+        super.removePropertySetChangeListener(listener);
     }
 
     @Override
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() {
diff --git a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
index fd2ced2d4a..6eea9cb421 100644
--- a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
+++ b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
@@ -324,15 +324,36 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     }
 
     // ItemSetChangeNotifier
-
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
     @Override
     public void addListener(Container.ItemSetChangeListener listener) {
-        super.addListener(listener);
+        addItemSetChangeListener(listener);
+    }
+
+    @Override
+    public void addItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
+        super.addItemSetChangeListener(listener);
     }
 
     @Override
+    public void removeItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
+        super.removeItemSetChangeListener(listener);
+    }
+
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    @Override
     public void removeListener(Container.ItemSetChangeListener listener) {
-        super.removeListener(listener);
+        removeItemSetChangeListener(listener);
     }
 
     // internal methods
diff --git a/server/src/com/vaadin/data/util/AbstractProperty.java b/server/src/com/vaadin/data/util/AbstractProperty.java
index f508156d05..6636996cd5 100644
--- a/server/src/com/vaadin/data/util/AbstractProperty.java
+++ b/server/src/com/vaadin/data/util/AbstractProperty.java
@@ -121,7 +121,8 @@ public abstract class AbstractProperty<T> implements Property<T>,
      *            the new Listener to be registered.
      */
     @Override
-    public void addListener(Property.ReadOnlyStatusChangeListener listener) {
+    public void addReadOnlyStatusChangeListener(
+            Property.ReadOnlyStatusChangeListener listener) {
         if (readOnlyStatusChangeListeners == null) {
             readOnlyStatusChangeListeners = new LinkedList<ReadOnlyStatusChangeListener>();
         }
@@ -129,19 +130,38 @@ public abstract class AbstractProperty<T> implements Property<T>,
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Property.ReadOnlyStatusChangeListener listener) {
+        addReadOnlyStatusChangeListener(listener);
+    }
+
+    /**
      * Removes a previously registered read-only status change listener.
      * 
      * @param listener
      *            the listener to be removed.
      */
     @Override
-    public void removeListener(Property.ReadOnlyStatusChangeListener listener) {
+    public void removeReadOnlyStatusChangeListener(
+            Property.ReadOnlyStatusChangeListener listener) {
         if (readOnlyStatusChangeListeners != null) {
             readOnlyStatusChangeListeners.remove(listener);
         }
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Property.ReadOnlyStatusChangeListener listener) {
+        removeReadOnlyStatusChangeListener(listener);
+    }
+
+    /**
      * Sends a read only status change event to all registered listeners.
      */
     protected void fireReadOnlyStatusChange() {
@@ -186,7 +206,7 @@ public abstract class AbstractProperty<T> implements Property<T>,
     }
 
     @Override
-    public void addListener(ValueChangeListener listener) {
+    public void addValueChangeListener(ValueChangeListener listener) {
         if (valueChangeListeners == null) {
             valueChangeListeners = new LinkedList<ValueChangeListener>();
         }
@@ -194,8 +214,17 @@ public abstract class AbstractProperty<T> implements Property<T>,
 
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(ValueChangeListener listener) {
+        addValueChangeListener(listener);
+    }
+
     @Override
-    public void removeListener(ValueChangeListener listener) {
+    public void removeValueChangeListener(ValueChangeListener listener) {
         if (valueChangeListeners != null) {
             valueChangeListeners.remove(listener);
         }
@@ -203,6 +232,15 @@ public abstract class AbstractProperty<T> implements Property<T>,
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(ValueChangeListener listener) {
+        removeValueChangeListener(listener);
+    }
+
+    /**
      * Sends a value change event to all registered listeners.
      */
     protected void fireValueChange() {
diff --git a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index 8f9000bce0..24d0a8d3a0 100644
--- a/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/server/src/com/vaadin/data/util/ContainerHierarchicalWrapper.java
@@ -710,53 +710,95 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical,
      * interface.
      */
     @Override
-    public void addListener(Container.ItemSetChangeListener listener) {
+    public void addItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (container instanceof Container.ItemSetChangeNotifier) {
             ((Container.ItemSetChangeNotifier) container)
-                    .addListener(new PiggybackListener(listener));
+                    .addItemSetChangeListener(new PiggybackListener(listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Container.ItemSetChangeListener listener) {
+        addItemSetChangeListener(listener);
+    }
+
     /*
      * Removes a Item set change listener from the object. Don't add a JavaDoc
      * comment here, we use the default documentation from implemented
      * interface.
      */
     @Override
-    public void removeListener(Container.ItemSetChangeListener listener) {
+    public void removeItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (container instanceof Container.ItemSetChangeNotifier) {
             ((Container.ItemSetChangeNotifier) container)
-                    .removeListener(new PiggybackListener(listener));
+                    .removeItemSetChangeListener(new PiggybackListener(listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Container.ItemSetChangeListener listener) {
+        removeItemSetChangeListener(listener);
+    }
+
     /*
      * Registers a new Property set change listener for this Container. Don't
      * add a JavaDoc comment here, we use the default documentation from
      * implemented interface.
      */
     @Override
-    public void addListener(Container.PropertySetChangeListener listener) {
+    public void addPropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (container instanceof Container.PropertySetChangeNotifier) {
             ((Container.PropertySetChangeNotifier) container)
-                    .addListener(new PiggybackListener(listener));
+                    .addPropertySetChangeListener(new PiggybackListener(
+                            listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Container.PropertySetChangeListener listener) {
+        addPropertySetChangeListener(listener);
+    }
+
     /*
      * Removes a Property set change listener from the object. Don't add a
      * JavaDoc comment here, we use the default documentation from implemented
      * interface.
      */
     @Override
-    public void removeListener(Container.PropertySetChangeListener listener) {
+    public void removePropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (container instanceof Container.PropertySetChangeNotifier) {
             ((Container.PropertySetChangeNotifier) container)
-                    .removeListener(new PiggybackListener(listener));
+                    .removePropertySetChangeListener(new PiggybackListener(
+                            listener));
         }
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Container.PropertySetChangeListener listener) {
+        removePropertySetChangeListener(listener);
+    }
+
+    /**
      * This listener 'piggybacks' on the real listener in order to update the
      * wrapper when needed. It proxies equals() and hashCode() to the real
      * listener so that the correct listener gets removed.
diff --git a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
index d332931008..bb904f4cda 100644
--- a/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
+++ b/server/src/com/vaadin/data/util/ContainerOrderedWrapper.java
@@ -510,52 +510,94 @@ public class ContainerOrderedWrapper implements Container.Ordered,
      * interface.
      */
     @Override
-    public void addListener(Container.ItemSetChangeListener listener) {
+    public void addItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (container instanceof Container.ItemSetChangeNotifier) {
             ((Container.ItemSetChangeNotifier) container)
-                    .addListener(new PiggybackListener(listener));
+                    .addItemSetChangeListener(new PiggybackListener(listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Container.ItemSetChangeListener listener) {
+        addItemSetChangeListener(listener);
+    }
+
     /*
      * Removes a Item set change listener from the object. Don't add a JavaDoc
      * comment here, we use the default documentation from implemented
      * interface.
      */
     @Override
-    public void removeListener(Container.ItemSetChangeListener listener) {
+    public void removeItemSetChangeListener(
+            Container.ItemSetChangeListener listener) {
         if (container instanceof Container.ItemSetChangeNotifier) {
             ((Container.ItemSetChangeNotifier) container)
-                    .removeListener(new PiggybackListener(listener));
+                    .removeItemSetChangeListener(new PiggybackListener(listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Container.ItemSetChangeListener listener) {
+        removeItemSetChangeListener(listener);
+    }
+
     /*
      * Registers a new Property set change listener for this Container. Don't
      * add a JavaDoc comment here, we use the default documentation from
      * implemented interface.
      */
     @Override
-    public void addListener(Container.PropertySetChangeListener listener) {
+    public void addPropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (container instanceof Container.PropertySetChangeNotifier) {
             ((Container.PropertySetChangeNotifier) container)
-                    .addListener(new PiggybackListener(listener));
+                    .addPropertySetChangeListener(new PiggybackListener(
+                            listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Container.PropertySetChangeListener listener) {
+        addPropertySetChangeListener(listener);
+    }
+
     /*
      * Removes a Property set change listener from the object. Don't add a
      * JavaDoc comment here, we use the default documentation from implemented
      * interface.
      */
     @Override
-    public void removeListener(Container.PropertySetChangeListener listener) {
+    public void removePropertySetChangeListener(
+            Container.PropertySetChangeListener listener) {
         if (container instanceof Container.PropertySetChangeNotifier) {
             ((Container.PropertySetChangeNotifier) container)
-                    .removeListener(new PiggybackListener(listener));
+                    .removePropertySetChangeListener(new PiggybackListener(
+                            listener));
         }
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Container.PropertySetChangeListener listener) {
+        removePropertySetChangeListener(listener);
+    }
+
     /*
      * (non-Javadoc)
      * 
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;
         }
diff --git a/server/src/com/vaadin/data/util/PropertysetItem.java b/server/src/com/vaadin/data/util/PropertysetItem.java
index e86d813809..6fba011d75 100644
--- a/server/src/com/vaadin/data/util/PropertysetItem.java
+++ b/server/src/com/vaadin/data/util/PropertysetItem.java
@@ -200,7 +200,8 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier,
      *            the new Listener to be registered.
      */
     @Override
-    public void addListener(Item.PropertySetChangeListener listener) {
+    public void addPropertySetChangeListener(
+            Item.PropertySetChangeListener listener) {
         if (propertySetChangeListeners == null) {
             propertySetChangeListeners = new LinkedList<PropertySetChangeListener>();
         }
@@ -208,19 +209,38 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier,
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addPropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(Item.PropertySetChangeListener listener) {
+        addPropertySetChangeListener(listener);
+    }
+
+    /**
      * Removes a previously registered property set change listener.
      * 
      * @param listener
      *            the Listener to be removed.
      */
     @Override
-    public void removeListener(Item.PropertySetChangeListener listener) {
+    public void removePropertySetChangeListener(
+            Item.PropertySetChangeListener listener) {
         if (propertySetChangeListeners != null) {
             propertySetChangeListeners.remove(listener);
         }
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removePropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(Item.PropertySetChangeListener listener) {
+        removePropertySetChangeListener(listener);
+    }
+
+    /**
      * Sends a Property set change event to all interested listeners.
      */
     private void fireItemPropertySetChange() {