Merge branch '0.x' of https://github.com/ReactiveX/RxJavaFX into 0.x

Author: thomasnield

README.md

@@ -137,31 +137,29 @@ Subscription subscription = JavaFxObservable.fromObservableValueChanges(spinner.
         .subscribe(spinnerChangesLabel::setText);
 ```
 
-###ObservableList
+###ObservableList, ObservableMap, and ObservableSet
+
+There are several factories to emit many useful `ObservableList`, `ObservableMap`, and `ObservableSet` events as Observables. These all can be found as static factory methods in the `JavaFxObservable` static class. 
+
+
+|Factory Method|Parameter Type|Return Type|Description|
+|---|---|---|---
+|fromObservableList()|ObservableList<T>|Observable<ObservableList<T>>|Emits the entire `ObservableList` every time it changes|
+|fromObservableListAdds()|ObservableList<T>|Observable<T>|Emits additions to an `ObservableList`|
+|fromfromObservableListRemovals()|ObservableList<T>|Observable<T>|Emits removals from an `ObservableList`|
+|fromObservableListUpdates|ObservableList<T>|Observable<ListChange<T>>|Emits every item that was the result of a change to an `ObservableList`, with an `ADDED`, `REMOVED`, or `UPDATED` flag|
+|fromObservableListDistinctChanges()|ObservableList<T>| Observable<ListChange<R>>|Emits only *distinct* addtions and removals to an `ObservableList`|
+|fromObservableListDistinctChanges()|ObservableList<T>, Func1<T,R>| Observable<ListChange<R>>|Emits only *distinct* additions and removals to an `ObservableList` and emits the mapping|
+|fromObservableListDistinctChanges()|ObservableList<T>, Func1<T,R>| Observable<ListChange<R>>|Emits only *distinct* additions and removals to an `ObservableList` based on a mapping|
+|fromObservableMap()|ObservableMap<K,T>|Observable<ObservableMap<K,T>>|Emits the entire `ObservableMap` every time it changes|
+|fromObservableMapAdds()|ObservableMap&lt;K,T>|Observable&lt;Map.Entry&lt;K,T>>|Emits every `Map.Entry<K,T>` added to an `ObservableMap`|
+|fromObservableMapRemovals()|ObservableMap&lt;K,T>|Observable&lt;Map.Entry&lt;K,T>>|Emits every `Map.Entry<K,T>` removed from an `ObservableMap`|
+|fromObservableMapChanges()|ObservableMap&lt;K,T>|Observable&lt;MapChange&lt;K,T>>|Emits every key/value pair with an `ADDED` or `REMOVED` flag.|
+|fromObservableSet()|ObservableSet&lt;T>|Observable&lt;ObservableSet&lt;T>>|Emits the entire `ObservableSet` every time it changes|
+|fromObservableSetAdds()|ObservableSet&lt;T>|Observable&lt;T>|Emits every addition to an `ObservableSet`|
+|fromObservableSetRemovals()|ObservableSet&lt;T>|Observable&lt;T>|Emits every removal to an `ObservableSet`|
+|fromObservableSetChanges()|ObservableSet&lt;T>|Observable&lt;SetChange&lt;T>|Emits every item `ADDED` or `REMOVED` item from an `ObservableSet` with the corresponding flag|
 
-There are eight factories in `JavaFxObservable` for turning an `ObservableList` into an `Observable` of some form based on a `ListChange` event. 
-
-```java
-public static <T> Observable<ObservableList<T>> fromObservableList(final ObservableList<T> source
-
-public static <T> Observable<T> fromObservableListAdds(final ObservableList<T> source)
-
-public static <T> Observable<T> fromObservableListRemovals(final ObservableList<T> source)
-
-public static <T> Observable<T> fromObservableListUpdates(final ObservableList<T> source)
-
-public static <T> Observable<ListChange<T>> fromObservableListChanges(final ObservableList<T> source)
-
-public static <T> Observable<ListChange<T>> fromObservableListDistinctChanges(final ObservableList<T> source)
-
-public static <T,R> Observable<ListChange<T>> fromObservableListDistinctChanges(final ObservableList<T> source, Func1<T,R> mapper)
-
-public static <T,R> Observable<ListChange<R>> fromObservableListDistinctMappings(final ObservableList<T> source, Func1<T,R> mapper)
-```  
-
-The first factory`fromObservableList()` will simply emit the entire `ObservableList` every time there is `ListChange` event fired. The rest of the factories fire only items impacted by the `ListChange` events. The last three emit only *distinct* additions and removals, which can be helpful to emit only the first item with a given `hashcode()`/`equals()` and ignore dupe additions. When the last item (meaning no more dupes) is removed, only then will it fire the removal. 
-
-See the JavaDocs for a more detailed description of each one. 
 
 ###Binding
 You can convert an RxJava `Observable` into a JavaFX `Binding` by calling the `JavaFxSubscriber.toBinding()` factory. Calling the `dispose()` method on the `Binding` will handle the unsubscription from the `Observable`.  You can then take this `Binding` to bind other control properties to it. 

src/main/java/rx/javafx/sources/ObservableMapSource.java

@@ -28,7 +28,7 @@ public static <K,T> Observable<Entry<K,T>> fromObservableMapAdds(final Observabl
             MapChangeListener<K,T> listener = c -> {
 
                 if (c.wasAdded()) {
-                   subscriber.onNext(new SimpleEntry<>(c.getKey(),c.getValueAdded()));
+                   subscriber.onNext(new SimpleEntry<K,T>(c.getKey(),c.getValueAdded()));
                 }
 
             };
@@ -45,7 +45,7 @@ public static <K,T> Observable<Entry<K,T>> fromObservableMapRemovals(final Obser
             MapChangeListener<K,T> listener = c -> {
 
                 if (c.wasRemoved()) {
-                    subscriber.onNext(new SimpleEntry<>(c.getKey(),c.getValueRemoved()));
+                    subscriber.onNext(new SimpleEntry<K,T>(c.getKey(),c.getValueRemoved()));
                 }
 
             };
@@ -62,10 +62,10 @@ public static <K,T> Observable<MapChange<K,T>> fromObservableMapChanges(final Ob
             MapChangeListener<K,T> listener = c -> {
 
                 if (c.wasRemoved()) {
-                    subscriber.onNext(new MapChange<>(c.getKey(),c.getValueRemoved(),Flag.REMOVED));
+                    subscriber.onNext(new MapChange<K,T>(c.getKey(),c.getValueRemoved(),Flag.REMOVED));
                 }
                 if (c.wasAdded()) {
-                    subscriber.onNext(new MapChange<>(c.getKey(),c.getValueAdded(),Flag.ADDED));
+                    subscriber.onNext(new MapChange<K,T>(c.getKey(),c.getValueAdded(),Flag.ADDED));
                 }
 
             };

src/main/java/rx/javafx/sources/ObservableSetSource.java

@@ -54,10 +54,10 @@ public static <T> Observable<SetChange<T>> fromObservableSetChanges(final Observ
 
             SetChangeListener<T> listener = c -> {
                 if (c.wasRemoved()) {
-                    subscriber.onNext(new SetChange<>(c.getElementRemoved(), Flag.REMOVED));
+                    subscriber.onNext(new SetChange<T>(c.getElementRemoved(), Flag.REMOVED));
                 }
                 if (c.wasAdded()) {
-                    subscriber.onNext(new SetChange<>(c.getElementAdded(), Flag.ADDED));
+                    subscriber.onNext(new SetChange<T>(c.getElementAdded(), Flag.ADDED));
                 }
             };
             source.addListener(listener);