From e5923ad8435ad8598060be56458a5442a336c176 Mon Sep 17 00:00:00 2001 From: Petri Heinonen Date: Thu, 23 Aug 2012 09:47:23 +0300 Subject: Refak addListener package com.vaadin.data.util --- .../vaadin/data/util/AbstractBeanContainer.java | 16 ++++- .../com/vaadin/data/util/AbstractContainer.java | 48 +++++++++++++-- .../data/util/AbstractInMemoryContainer.java | 27 +++++++- .../src/com/vaadin/data/util/AbstractProperty.java | 46 ++++++++++++-- .../data/util/ContainerHierarchicalWrapper.java | 58 +++++++++++++++--- .../vaadin/data/util/ContainerOrderedWrapper.java | 58 +++++++++++++++--- .../src/com/vaadin/data/util/IndexedContainer.java | 71 ++++++++++++++++++++-- .../src/com/vaadin/data/util/PropertysetItem.java | 24 +++++++- 8 files changed, 311 insertions(+), 37 deletions(-) (limited to 'server/src') 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 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,13 +100,23 @@ 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()); } getPropertySetChangeListeners().add(listener); } + /** + * @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 @@ -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,13 +150,23 @@ 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()); } getItemSetChangeListeners().add(listener); } + /** + * @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 @@ -144,12 +174,22 @@ public abstract class AbstractContainer implements Container { * * @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. */ 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 implements Property, * 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(); } readOnlyStatusChangeListeners.add(listener); } + /** + * @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. * @@ -135,12 +145,22 @@ public abstract class AbstractProperty implements Property, * 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. */ @@ -186,7 +206,7 @@ public abstract class AbstractProperty implements Property, } @Override - public void addListener(ValueChangeListener listener) { + public void addValueChangeListener(ValueChangeListener listener) { if (valueChangeListeners == null) { valueChangeListeners = new LinkedList(); } @@ -194,14 +214,32 @@ public abstract class AbstractProperty implements Property, } + /** + * @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); } } + /** + * @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. */ 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,52 +710,94 @@ 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 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 @@ -482,14 +482,36 @@ 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(); } 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,12 +544,21 @@ 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. * @@ -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,13 +200,23 @@ 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(); } propertySetChangeListeners.add(listener); } + /** + * @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. * @@ -214,12 +224,22 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, * 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. */ -- cgit v1.2.3