Merge branch 'master' into layoutgraph

Conflicts:
	client/src/com/vaadin/client/ComponentLocator.java
	client/src/com/vaadin/client/ui/AbstractComponentConnector.java

1 files changed, 50 insertions, 8 deletions

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.