EasyObservableList improvements

CHANGELOG.md

@@ -4,7 +4,14 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 ### Added
 - Added support for JDK >= 9. [#21](https://github.com/tobiasdiez/EasyBind/issues/21)
+- Added `EasyObservableList#mapped` as fluid alternative to `EasyBind#map`
+- Added `EasyObservableList#filteredWrapped` as an alternative to `EasyObservableList#filtered` that returns an `EasyObservableList` instead of a `FilteredList`.
+  - This allows fluid method chaining without having to wrap the `FilteredList` using `EasyBind#wrapList` again.
+  - It is a temporary workaround that will be removed once https://github.com/openjdk/jfx/pull/278 is merged.
+
 ### Changed
+- `EasyBind#flatten` and `EasyBind#concat` now return an `EasyObservableList` instead of an `ObservableList`.
+
 ### Removed
 
 ## [2.0.0] - 2020-07-17

src/main/java/com/tobiasdiez/easybind/EasyBind.java

@@ -295,12 +295,12 @@ public static <T, U> EasyObservableList<U> map(ObservableList<? extends T> sourc
         return new MappedList<>(sourceList, f);
     }
 
-    public static <T> ObservableList<T> flatten(ObservableList<ObservableList<? extends T>> sources) {
+	public static <T> EasyObservableList<T> flatten(ObservableList<ObservableList<? extends T>> sources) {
         return new FlattenedList<>(sources);
     }
 
     @SafeVarargs
-    public static <T> ObservableList<T> concat(ObservableList<? extends T>... sources) {
+	public static <T> EasyObservableList<T> concat(ObservableList<? extends T>... sources) {
         return new FlattenedList<>(FXCollections.observableArrayList(sources));
     }
 

src/main/java/com/tobiasdiez/easybind/EasyObservableList.java

@@ -5,6 +5,7 @@
 import java.util.stream.Stream;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.Property;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
@@ -68,6 +69,28 @@ default FilteredList<E> filtered(ObservableValue<? extends Predicate<E>> predica
         filteredList.predicateProperty().bind(predicate);
         return filteredList;
     }
+
+	/*
+	 * Sadly, we cannot easily let {@link FilteredList} implement {@link EasyObservableList}, because that class is final. Neither can we return
+	 * both at once, as intersection types do not exist in Java. Therefore, the easiest way is to simply create two methods, one for each return
+	 * type.
+	 *
+	 * This method will be deleted once https://github.com/openjdk/jfx/pull/278 is merged
+	 */
+    default EasyObservableList<E> filteredWrapped(ObservableValue<? extends Predicate<E>> predicate) {
+    	return EasyBind.wrapList(filtered(predicate));
+    }
+
+    /**
+     * Creates a {@link MappedList} wrapper of this list using the specified mapping function.
+     *
+     * @param f the mapping function to transform the items
+     * @return new {@code MappedList}
+     * @see EasyBind#map(ObservableList, Function)
+     */
+    default <U> EasyObservableList<U> mapped(Function<? super E, ? extends U> f) {
+        return EasyBind.map(this, f);
+    }
 
     /**
      * @see EasyBind#valueAt(ObservableList, int)

src/main/java/com/tobiasdiez/easybind/FlattenedList.java

@@ -10,7 +10,7 @@
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableListBase;
 
-class FlattenedList<E> extends ObservableListBase<E> {
+class FlattenedList<E> extends ObservableListBase<E> implements EasyObservableList<E> {
     private final ObservableList<ObservableList<? extends E>> sourceLists;
 
     FlattenedList(ObservableList<ObservableList<? extends E>> sourceLists) {