diff options
| author | John Ahlroos <john@vaadin.com> | 2013-03-21 16:43:31 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-03-22 14:32:37 +0000 |
| commit | b247017a184dd8603ec06d1c9798f123b447a585 (patch) | |
| tree | 6307e93ad13f91b5d661a6900290056e2d3ad84a /server/src/com/vaadin/data | |
| parent | de0761b03d7f1acf2aad8ac824d5cb49b75f9391 (diff) | |
| download | vaadin-framework-b247017a184dd8603ec06d1c9798f123b447a585.tar.gz vaadin-framework-b247017a184dd8603ec06d1c9798f123b447a585.zip | |
Added Container.hasContainerFilters() API #11234
Change-Id: I223dbc7a8419a5c4b58321b708e8bd7c8bb8134b
Diffstat (limited to 'server/src/com/vaadin/data')
5 files changed, 33 insertions, 1 deletions
diff --git a/server/src/com/vaadin/data/Container.java b/server/src/com/vaadin/data/Container.java index ddeac62d6d..4db346a015 100644 --- a/server/src/com/vaadin/data/Container.java +++ b/server/src/com/vaadin/data/Container.java @@ -953,6 +953,12 @@ public interface Container extends Serializable { */ public void removeAllContainerFilters(); + /** + * Returns true if any filters have been applied to the container + * + * @since 7.1 + */ + public boolean hasContainerFilters(); } /** diff --git a/server/src/com/vaadin/data/util/AbstractBeanContainer.java b/server/src/com/vaadin/data/util/AbstractBeanContainer.java index db1e1afe0d..c587cf5163 100644 --- a/server/src/com/vaadin/data/util/AbstractBeanContainer.java +++ b/server/src/com/vaadin/data/util/AbstractBeanContainer.java @@ -385,6 +385,11 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> extends removeFilter(filter); } + @Override + public boolean hasContainerFilters() { + return super.hasContainerFilters(); + } + /** * Make this container listen to the given property provided it notifies * when its value changes. diff --git a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java index 504b4081c1..940f2302f5 100644 --- a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java +++ b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java @@ -501,6 +501,15 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE } /** + * Checks if the container has filters + * + * @return Returns true if the container has container filters applied + */ + protected boolean hasContainerFilters() { + return !getFilters().isEmpty(); + } + + /** * Remove a specific container filter and re-filter the view (if necessary). * * This can be used to implement diff --git a/server/src/com/vaadin/data/util/IndexedContainer.java b/server/src/com/vaadin/data/util/IndexedContainer.java index 1df4dd9bfb..a54bf26e52 100644 --- a/server/src/com/vaadin/data/util/IndexedContainer.java +++ b/server/src/com/vaadin/data/util/IndexedContainer.java @@ -1190,4 +1190,9 @@ public class IndexedContainer extends removeFilter(filter); } + @Override + public boolean hasContainerFilters() { + return super.hasContainerFilters(); + } + } diff --git a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java index 64c16b2798..f8efdf0d4f 100644 --- a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java @@ -590,13 +590,20 @@ public class SQLContainer implements Container, Container.Filterable, /** * {@inheritDoc} */ - @Override public void removeAllContainerFilters() { filters.clear(); refresh(); } + /** + * {@inheritDoc} + */ + @Override + public boolean hasContainerFilters() { + return !filters.isEmpty(); + } + /**********************************************/ /** Methods from interface Container.Indexed **/ /**********************************************/ |