Merge commit 'a52ceb96590333' into 7.1

Conflicts:
	theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java

Change-Id: I049a08a5d129b8072bf91554ca0eab0d44e537e3

1 files changed, 21 insertions, 1 deletions

diff --git a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index 64c16b2798..987466cdb7 100644
--- a/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/server/src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
@@ -590,13 +590,32 @@ public class SQLContainer implements Container, Container.Filterable,
     /**
      * {@inheritDoc}
      */
-
     @Override
     public void removeAllContainerFilters() {
         filters.clear();
         refresh();
     }
 
+    /**
+     * Returns true if any filters have been applied to the container.
+     * 
+     * @return true if the container has filters applied, false otherwise
+     * @since 7.1
+     */
+    public boolean hasContainerFilters() {
+        return !getContainerFilters().isEmpty();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.vaadin.data.Container.Filterable#getContainerFilters()
+     */
+    @Override
+    public Collection<Filter> getContainerFilters() {
+        return Collections.unmodifiableCollection(filters);
+    }
+
     /**********************************************/
     /** Methods from interface Container.Indexed **/
     /**********************************************/
@@ -1818,4 +1837,5 @@ public class SQLContainer implements Container, Container.Filterable,
     private static final Logger getLogger() {
         return Logger.getLogger(SQLContainer.class.getName());
     }
+
 }