1 files changed, 22 insertions, 2 deletions
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() {