Add Filter parameter to DataProvider

Change-Id: Ic65b8decb3ac8d4dde9bca6cfb40a2a70f461e91

7 files changed, 20 insertions, 19 deletions

diff --git a/server/src/main/java/com/vaadin/ui/AbstractListing.java b/server/src/main/java/com/vaadin/ui/AbstractListing.java
index 99dd6e5eb1..f49d8715de 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractListing.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractListing.java
@@ -133,12 +133,12 @@ public abstract class AbstractListing<T> extends AbstractComponent
     }
 
     @Override
-    public void setDataProvider(DataProvider<T> dataProvider) {
+    public void setDataProvider(DataProvider<T, ?> dataProvider) {
         getDataCommunicator().setDataProvider(dataProvider);
     }
 
     @Override
-    public DataProvider<T> getDataProvider() {
+    public DataProvider<T, ?> getDataProvider() {
         return getDataCommunicator().getDataProvider();
     }
 
diff --git a/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java b/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java
index a3f99e7b27..eb61d2242d 100644
--- a/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java
+++ b/server/src/main/java/com/vaadin/ui/CheckBoxGroup.java
@@ -64,7 +64,7 @@ public class CheckBoxGroup<T> extends AbstractMultiSelect<T>
      *            the data provider, not null
      * @see Listing#setDataProvider(DataProvider)
      */
-    public CheckBoxGroup(String caption, DataProvider<T> dataProvider) {
+    public CheckBoxGroup(String caption, DataProvider<T, ?> dataProvider) {
         this(caption);
         setDataProvider(dataProvider);
     }
diff --git a/server/src/main/java/com/vaadin/ui/ComboBox.java b/server/src/main/java/com/vaadin/ui/ComboBox.java
index 60a229ba55..2270c1a181 100644
--- a/server/src/main/java/com/vaadin/ui/ComboBox.java
+++ b/server/src/main/java/com/vaadin/ui/ComboBox.java
@@ -158,8 +158,8 @@ public class ComboBox<T> extends AbstractSingleSelect<T> implements HasValue<T>,
     }
 
     /**
-     * Constructs a combo box with a static in-memory data provider with the given
-     * options.
+     * Constructs a combo box with a static in-memory data provider with the
+     * given options.
      *
      * @param caption
      *            the caption to show in the containing layout, null for no
@@ -180,7 +180,7 @@ public class ComboBox<T> extends AbstractSingleSelect<T> implements HasValue<T>,
      * @param dataProvider
      *            the data provider to use, not null
      */
-    public ComboBox(String caption, DataProvider<T> dataProvider) {
+    public ComboBox(String caption, DataProvider<T, ?> dataProvider) {
         this(caption);
         setDataProvider(dataProvider);
     }
diff --git a/server/src/main/java/com/vaadin/ui/ListSelect.java b/server/src/main/java/com/vaadin/ui/ListSelect.java
index e616fa2af3..00e0d9912d 100644
--- a/server/src/main/java/com/vaadin/ui/ListSelect.java
+++ b/server/src/main/java/com/vaadin/ui/ListSelect.java
@@ -61,7 +61,7 @@ public class ListSelect<T> extends AbstractMultiSelect<T> {
      * @param dataProvider
      *            the data provider, not {@code null}
      */
-    public ListSelect(String caption, DataProvider<T> dataProvider) {
+    public ListSelect(String caption, DataProvider<T, ?> dataProvider) {
         this(caption);
         setDataProvider(dataProvider);
     }
diff --git a/server/src/main/java/com/vaadin/ui/NativeSelect.java b/server/src/main/java/com/vaadin/ui/NativeSelect.java
index 2a696c75d4..46e72b02c6 100644
--- a/server/src/main/java/com/vaadin/ui/NativeSelect.java
+++ b/server/src/main/java/com/vaadin/ui/NativeSelect.java
@@ -34,12 +34,12 @@ import com.vaadin.shared.ui.nativeselect.NativeSelectState;
  * A simple drop-down select component. Represented on the client side by a
  * "native" HTML {@code <select>} element. Lacks advanced features such as lazy
  * loading, filtering, and adding new items.
- * 
+ *
  * @author Vaadin Ltd.
- * 
+ *
  * @param <T>
  *            the data item type
- * 
+ *
  * @see com.vaadin.ui.ComboBox
  */
 public class NativeSelect<T> extends AbstractSingleSelect<T>
@@ -56,7 +56,7 @@ public class NativeSelect<T> extends AbstractSingleSelect<T>
 
     /**
      * Creates a new {@code NativeSelect} with the given caption and no items.
-     * 
+     *
      * @param caption
      *            the component caption to set, null for no caption
      */
@@ -68,7 +68,7 @@ public class NativeSelect<T> extends AbstractSingleSelect<T>
     /**
      * Creates a new {@code NativeSelect} with the given caption, containing the
      * data items in the given collection.
-     * 
+     *
      * @param caption
      *            the component caption to set, null for no caption
      * @param items
@@ -82,13 +82,13 @@ public class NativeSelect<T> extends AbstractSingleSelect<T>
     /**
      * Creates a new {@code NativeSelect} with the given caption, using the
      * given {@code DataProvider} as the source of data items.
-     * 
+     *
      * @param caption
      *            the component caption to set, null for no caption
      * @param dataProvider
      *            the source of data items to use, not null
      */
-    public NativeSelect(String caption, DataProvider<T> dataProvider) {
+    public NativeSelect(String caption, DataProvider<T, ?> dataProvider) {
         this(caption);
         setDataProvider(dataProvider);
     }
diff --git a/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java b/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java
index 8949493d6f..13b8fedc72 100644
--- a/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java
+++ b/server/src/main/java/com/vaadin/ui/RadioButtonGroup.java
@@ -77,14 +77,14 @@ public class RadioButtonGroup<T> extends AbstractSingleSelect<T>
      *            the data provider, not null
      * @see Listing#setDataProvider(DataProvider)
      */
-    public RadioButtonGroup(String caption, DataProvider<T> dataProvider) {
+    public RadioButtonGroup(String caption, DataProvider<T, ?> dataProvider) {
         this(caption);
         setDataProvider(dataProvider);
     }
 
     /**
-     * Constructs a new RadioButtonGroup with caption and DataProvider containing
-     * given items.
+     * Constructs a new RadioButtonGroup with caption and DataProvider
+     * containing given items.
      *
      * @param caption
      *            the caption text
diff --git a/server/src/main/java/com/vaadin/ui/TwinColSelect.java b/server/src/main/java/com/vaadin/ui/TwinColSelect.java
index 0858a76830..2d6b97a99a 100644
--- a/server/src/main/java/com/vaadin/ui/TwinColSelect.java
+++ b/server/src/main/java/com/vaadin/ui/TwinColSelect.java
@@ -50,14 +50,15 @@ public class TwinColSelect<T> extends AbstractMultiSelect<T> {
     }
 
     /**
-     * Constructs a new TwinColSelect with caption and data provider for options.
+     * Constructs a new TwinColSelect with caption and data provider for
+     * options.
      *
      * @param caption
      *            the caption to set, can be {@code null}
      * @param dataProvider
      *            the data provider, not {@code null}
      */
-    public TwinColSelect(String caption, DataProvider<T> dataProvider) {
+    public TwinColSelect(String caption, DataProvider<T, ?> dataProvider) {
         this(caption);
         setDataProvider(dataProvider);
     }