Merge remote-tracking branch 'origin/2.11.x' into 2.11.x

Author: Thomas Nield

README.md

@@ -10,7 +10,7 @@ RxJavaFX is a lightweight library to convert JavaFX events into [RxJava](https:/
 
 ## Master Build Status
 
-<a href='https://travis-ci.org/ReactiveX/RxJavaFX/builds'><img src='https://travis-ci.org/ReactiveX/RxJavaFX.svg?branch=0.x'></a>
+<a href='https://travis-ci.org/ReactiveX/RxJavaFX/builds'><img src='https://travis-ci.org/ReactiveX/RxJavaFX.svg?branch=2.11.x'></a>
 
 ## Documentation
 
@@ -278,121 +278,6 @@ If you are heavily dependent on RxJava, asynchronous processing, or do not want
 ## Notes for Kotlin 
 If you are building your JavaFX application with [Kotlin](https://kotlinlang.org/), check out [RxKotlinFX](https://github.com/thomasnield/RxKotlinFX) to leverage this library through Kotlin extension functions.
 
-## Comprehensive Example
-```java
-package io.reactivex.rxjavafx;
-
-import io.reactivex.Observable;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.rxjavafx.observables.JavaFxObservable;
-import io.reactivex.rxjavafx.observers.JavaFxObserver;
-import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
-import io.reactivex.schedulers.Schedulers;
-import javafx.application.Application;
-import javafx.beans.binding.Binding;
-import javafx.event.ActionEvent;
-import javafx.scene.Scene;
-import javafx.scene.control.*;
-import javafx.scene.layout.GridPane;
-import javafx.stage.Stage;
-
-public class RxJavaFXTest extends Application {
-
-    private final Button incrementBttn;
-    private final Label incrementLabel;
-    private final Binding<String> binding1;
-
-    private final TextField textInput;
-    private final Label flippedTextLabel;
-    private final Binding<String> binding2;
-
-    private final Spinner<Integer> spinner;
-    private final Label spinnerChangesLabel;
-    private final Disposable disposable;
-
-    public RxJavaFXTest() {
-
-        //initialize increment
-        //demoTurns button events into Binding
-        incrementBttn = new Button("Increment");
-        incrementLabel =  new Label("");
-
-        Observable<ActionEvent> bttnEvents =
-                JavaFxObservable.actionEventsOf(incrementBttn);
-
-        binding1 = bttnEvents.map(e -> 1).scan(0,(x, y) -> x + y)
-                .map(Object::toString)
-                .to(JavaFxObserver::toBinding);
-
-        incrementLabel.textProperty().bind(binding1);
-
-        //initialize text flipper
-        //Schedules on computation Scheduler for text flip calculation
-        //Then resumes on JavaFxScheduler thread to update Binding
-        textInput = new TextField();
-        flippedTextLabel = new Label();
-
-        Observable<String> textInputs =
-                JavaFxObservable.valuesOf(textInput.textProperty());
-
-        binding2 = textInputs.observeOn(Schedulers.computation())
-                .map(s -> new StringBuilder(s).reverse().toString())
-                .observeOn(JavaFxScheduler.platform())
-                .to(JavaFxObserver::toBinding);
-
-        flippedTextLabel.textProperty().bind(binding2);
-
-        //initialize Spinner value changes
-        //Emits Change items containing old and new value
-        //Uses RxJava Subscription instead of Binding just to show that option
-        SpinnerValueFactory<Integer> svf = new SpinnerValueFactory.IntegerSpinnerValueFactory(0, 100);
-        spinner = new Spinner<>();
-        spinner.setValueFactory(svf);
-        spinner.setEditable(true);
-
-        spinnerChangesLabel = new Label();
-        disposable = JavaFxObservable.changesOf(spinner.valueProperty())
-                .map(change -> "OLD: " + change.getOldVal() + " NEW: " + change.getNewVal())
-                .subscribe(spinnerChangesLabel::setText);
-
-    }
-
-    @Override
-    public void start(Stage primaryStage) throws Exception {
-
-        GridPane gridPane = new GridPane();
-
-        gridPane.setHgap(10);
-        gridPane.setVgap(10);
-
-        gridPane.add(incrementBttn,0,0);
-        gridPane.add(incrementLabel,1,0);
-
-        gridPane.add(textInput,0,1);
-        gridPane.add(flippedTextLabel, 1,1);
-
-        gridPane.add(spinner,0,2);
-        gridPane.add(spinnerChangesLabel,1,2);
-
-        Scene scene = new Scene(gridPane);
-
-
-        primaryStage.setWidth(275);
-        primaryStage.setScene(scene);
-        primaryStage.show();
-    }
-
-    @Override
-    public void stop() throws Exception {
-        super.stop();
-
-        binding1.dispose();
-        binding2.dispose();
-        disposable.dispose();
-    }
-}
-```
-
 ## Bugs and Feedback
 
 For bugs, questions and discussions please use the [Github Issues](https://github.com/ReactiveX/RxJavaFX/issues).