remove getInstance() factory method calls

thomasnield · thomasnield · commit 4142b1131928 · 2017-02-23T18:27:00.000-06:00
diff --git a/README.md b/README.md
@@ -323,7 +323,7 @@ CompositeObservable<String> valueChanges = CompositeObservable<>(obs -> obs.repl
 
 ### JavaFX Scheduler
 
-When you update any JavaFX control, it must be done on the JavaFX Event Dispatch Thread. Fortunately, the `JavaFxScheduler` makes it trivial to take work off the JavaFX thread and put it back when the results are ready.  Below we can use the `observeOn()` to pass text value emissions to a computation thread where the text will be flipped. Then we can pass `JavaFxScheduler.getInstance()` to another `observeOn()` afterwards to put it back on the JavaFX thread. From there it will update the `flippedTextLabel`.
+When you update any JavaFX control, it must be done on the JavaFX Event Dispatch Thread. Fortunately, the `JavaFxScheduler` makes it trivial to take work off the JavaFX thread and put it back when the results are ready.  Below we can use the `observeOn()` to pass text value emissions to a computation thread where the text will be flipped. Then we can pass `JavaFxScheduler.platform()` to another `observeOn()` afterwards to put it back on the JavaFX thread. From there it will update the `flippedTextLabel`.
 
 ```java
 TextField textInput = new TextField();
@@ -334,7 +334,7 @@ Observable<String> textInputs =
 
 sub2 = textInputs.observeOn(Schedulers.computation())
         .map(s -> new StringBuilder(s).reverse().toString())
-        .observeOn(JavaFxScheduler.getInstance())
+        .observeOn(JavaFxScheduler.platform())
         .subscribe(fippedTextLabel::setText);
 ```
 
@@ -411,7 +411,7 @@ public class RxJavaFXTest extends Application {
 
         binding2 = JavaFxSubscriber.toBinding(textInputs.observeOn(Schedulers.computation())
                 .map(s -> new StringBuilder(s).reverse().toString())
-                .observeOn(JavaFxScheduler.getInstance()));
+                .observeOn(JavaFxScheduler.platform()));
 
         flippedTextLabel.textProperty().bind(binding2);
 
diff --git a/src/main/java/rx/javafx/sources/ActionEventSource.java b/src/main/java/rx/javafx/sources/ActionEventSource.java
@@ -39,7 +39,7 @@ public static Observable<ActionEvent> fromActionEvents(final ContextMenu source)
             source.addEventHandler(ActionEvent.ANY, handler);
 
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(ActionEvent.ANY, handler)));
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
     public static Observable<ActionEvent> fromActionEvents(final MenuItem source) {
         return Observable.create((ObservableEmitter<ActionEvent> subscriber) -> {
@@ -48,7 +48,7 @@ public static Observable<ActionEvent> fromActionEvents(final MenuItem source) {
             source.addEventHandler(ActionEvent.ANY, handler);
 
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(ActionEvent.ANY, handler)));
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
 
 }
diff --git a/src/main/java/rx/javafx/sources/DialogSource.java b/src/main/java/rx/javafx/sources/DialogSource.java
@@ -10,7 +10,7 @@ private DialogSource() {}
 
     public static <T> Observable<T> fromDialogSource(final Dialog<T> dialog) {
         return Observable.fromCallable(dialog::showAndWait)
-                .subscribeOn(JavaFxScheduler.getInstance())
+                .subscribeOn(JavaFxScheduler.platform())
                 .filter(Optional::isPresent)
                 .map(Optional::get);
     }
diff --git a/src/main/java/rx/javafx/sources/NodeEventSource.java b/src/main/java/rx/javafx/sources/NodeEventSource.java
@@ -33,6 +33,6 @@ public static <T extends Event> Observable<T> fromNodeEvents(final Node source,
             source.addEventHandler(eventType, handler);
 
             emitter.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(eventType, handler)));
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
 }
diff --git a/src/main/java/rx/javafx/sources/ObservableListSource.java b/src/main/java/rx/javafx/sources/ObservableListSource.java
@@ -34,7 +34,7 @@ public static <T> Observable<ObservableList<T>> fromObservableList(final Observa
             ListChangeListener<T> listener = c -> subscriber.onNext(source);
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
-        }).startWith(source).subscribeOn(JavaFxScheduler.getInstance());
+        }).startWith(source).subscribeOn(JavaFxScheduler.platform());
     }
 
     public static <T> Observable<T> fromObservableListAdds(final ObservableList<T> source) {
@@ -51,7 +51,7 @@ public static <T> Observable<T> fromObservableListAdds(final ObservableList<T> s
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
 
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
     public static <T> Observable<T> fromObservableListRemovals(final ObservableList<T> source) {
 
@@ -68,7 +68,7 @@ public static <T> Observable<T> fromObservableListRemovals(final ObservableList<
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
 
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
     public static <T> Observable<T> fromObservableListUpdates(final ObservableList<T> source) {
 
@@ -86,7 +86,7 @@ public static <T> Observable<T> fromObservableListUpdates(final ObservableList<T
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
 
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
     public static <T> Observable<ListChange<T>> fromObservableListChanges(final ObservableList<T> source) {
         return Observable.create((ObservableOnSubscribe<ListChange<T>>) subscriber -> {
@@ -109,7 +109,7 @@ public static <T> Observable<ListChange<T>> fromObservableListChanges(final Obse
             source.addListener(listener);
 
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
 
     public static <T> Observable<ListChange<T>> fromObservableListDistinctChanges(final ObservableList<T> source) {
@@ -135,7 +135,7 @@ public static <T> Observable<ListChange<T>> fromObservableListDistinctChanges(fi
             source.addListener(listener);
 
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
     public static <T,R> Observable<ListChange<T>> fromObservableListDistinctChanges(final ObservableList<T> source, Function<T,R> mapper) {
 
@@ -159,7 +159,7 @@ public static <T,R> Observable<ListChange<T>> fromObservableListDistinctChanges(
             };
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
     public static <T,R> Observable<ListChange<R>> fromObservableListDistinctMappings(final ObservableList<T> source, Function<T,R> mapper) {
 
@@ -186,7 +186,7 @@ public static <T,R> Observable<ListChange<R>> fromObservableListDistinctMappings
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
 
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
 
     private static final class DupeCounter<T> {
diff --git a/src/main/java/rx/javafx/sources/ObservableMapSource.java b/src/main/java/rx/javafx/sources/ObservableMapSource.java
@@ -20,7 +20,7 @@ public static <K,T> Observable<ObservableMap<K,T>> fromObservableMap(final Obser
             MapChangeListener<K,T> listener = c -> subscriber.onNext(source);
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
-        }).startWith(source).subscribeOn(JavaFxScheduler.getInstance());
+        }).startWith(source).subscribeOn(JavaFxScheduler.platform());
     }
 
     public static <K,T> Observable<Entry<K,T>> fromObservableMapAdds(final ObservableMap<K,T> source) {
@@ -37,7 +37,7 @@ public static <K,T> Observable<Entry<K,T>> fromObservableMapAdds(final Observabl
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
 
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
 
     public static <K,T> Observable<Entry<K,T>> fromObservableMapRemovals(final ObservableMap<K,T> source) {
@@ -54,7 +54,7 @@ public static <K,T> Observable<Entry<K,T>> fromObservableMapRemovals(final Obser
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
 
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
 
     public static <K,T> Observable<MapChange<K,T>> fromObservableMapChanges(final ObservableMap<K,T> source) {
@@ -74,6 +74,6 @@ public static <K,T> Observable<MapChange<K,T>> fromObservableMapChanges(final Ob
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
 
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
 }
diff --git a/src/main/java/rx/javafx/sources/ObservableSetSource.java b/src/main/java/rx/javafx/sources/ObservableSetSource.java
@@ -16,7 +16,7 @@ public static <T> Observable<ObservableSet<T>> fromObservableSet(final Observabl
             SetChangeListener<T> listener = c -> subscriber.onNext(source);
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
-        }).startWith(source).subscribeOn(JavaFxScheduler.getInstance());
+        }).startWith(source).subscribeOn(JavaFxScheduler.platform());
     }
 
     public static <T> Observable<T> fromObservableSetAdds(final ObservableSet<T> source) {
@@ -31,7 +31,7 @@ public static <T> Observable<T> fromObservableSetAdds(final ObservableSet<T> sou
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
 
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
 
     public static <T> Observable<T> fromObservableSetRemovals(final ObservableSet<T> source) {
@@ -46,7 +46,7 @@ public static <T> Observable<T> fromObservableSetRemovals(final ObservableSet<T>
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
 
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
 
     public static <T> Observable<SetChange<T>> fromObservableSetChanges(final ObservableSet<T> source) {
@@ -64,6 +64,6 @@ public static <T> Observable<SetChange<T>> fromObservableSetChanges(final Observ
             source.addListener(listener);
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));
 
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
 }
diff --git a/src/main/java/rx/javafx/sources/SceneEventSource.java b/src/main/java/rx/javafx/sources/SceneEventSource.java
@@ -35,6 +35,6 @@ public static <T extends Event> Observable<T> fromSceneEvents(final Scene source
 
                 subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(eventType, handler)));
 
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
 }
diff --git a/src/main/java/rx/javafx/sources/WindowEventSource.java b/src/main/java/rx/javafx/sources/WindowEventSource.java
@@ -37,6 +37,6 @@ public static <T extends WindowEvent> Observable<T> fromWindowEvents(final Windo
 
             subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(eventType, handler)));
 
-        }).subscribeOn(JavaFxScheduler.getInstance());
+        }).subscribeOn(JavaFxScheduler.platform());
     }
 }
diff --git a/src/main/java/rx/subscriptions/JavaFxSubscriptions.java b/src/main/java/rx/subscriptions/JavaFxSubscriptions.java
@@ -40,7 +40,7 @@ public static Disposable unsubscribeInEventDispatchThread(final Runnable unsubsc
             if (Platform.isFxApplicationThread()) {
                 unsubscribe.run();
             } else {
-                final Scheduler.Worker inner = JavaFxScheduler.getInstance().createWorker();
+                final Scheduler.Worker inner = JavaFxScheduler.platform().createWorker();
                 inner.schedule(() -> {
                     unsubscribe.run();
                     inner.dispose();
diff --git a/src/test/java/rx/javafx/sources/JavaFxObservableTest.java b/src/test/java/rx/javafx/sources/JavaFxObservableTest.java
@@ -66,7 +66,7 @@ public void testRxObservableListAdds() {
         CountDownLatch gate = new CountDownLatch(1);
 
         emissions.observeOn(Schedulers.io())
-                .observeOn(JavaFxScheduler.getInstance())
+                .observeOn(JavaFxScheduler.platform())
                 .take(3)
                 .toList()
                 .toObservable()
@@ -97,7 +97,7 @@ public void testRxObservableListRemoves() {
         CountDownLatch gate = new CountDownLatch(1);
 
         emissions.observeOn(Schedulers.io())
-                .observeOn(JavaFxScheduler.getInstance())
+                .observeOn(JavaFxScheduler.platform())
                 .take(2)
                 .toSortedList()
                 .toObservable()
@@ -137,7 +137,7 @@ class FlagAndCount {
 
         }
         emissions.observeOn(Schedulers.io())
-                .observeOn(JavaFxScheduler.getInstance())
+                .observeOn(JavaFxScheduler.platform())
                 .take(5)
                 .groupBy(ListChange::getFlag)
                 .flatMapSingle(grp -> grp.count().map(ct -> new FlagAndCount(grp.getKey(),ct)))
@@ -181,7 +181,7 @@ class FlagAndCount {
 
         }
         emissions.observeOn(Schedulers.io())
-                .observeOn(JavaFxScheduler.getInstance())
+                .observeOn(JavaFxScheduler.platform())
                 .take(3)
                 .groupBy(ListChange::getFlag)
                 .flatMapSingle(grp -> grp.count().map(ct -> new FlagAndCount(grp.getKey(),ct)))
@@ -227,7 +227,7 @@ class FlagAndCount {
 
         }
         emissions.observeOn(Schedulers.io())
-                .observeOn(JavaFxScheduler.getInstance())
+                .observeOn(JavaFxScheduler.platform())
                 .take(5)
                 .groupBy(ListChange::getFlag)
                 .flatMapSingle(grp -> grp.count().map(ct -> new FlagAndCount(grp.getKey(),ct)))
@@ -282,7 +282,7 @@ public String toString() {
         CountDownLatch gate = new CountDownLatch(1);
 
         emissions.observeOn(Schedulers.io())
-                .observeOn(JavaFxScheduler.getInstance())
+                .observeOn(JavaFxScheduler.platform())
                 .take(2)
                 .count()
                 .toObservable()
diff --git a/src/test/java/rx/subscriptions/BindingTest.java b/src/test/java/rx/subscriptions/BindingTest.java
@@ -24,10 +24,10 @@ public void testCompositeBinding() {
         Observable<Long> source = Observable.interval(1,TimeUnit.SECONDS);
         CountDownLatch unsubscribeWait = new CountDownLatch(2);
 
-        Binding<Long> binding1 = JavaFxSubscriber.toBinding(source.doOnDispose(unsubscribeWait::countDown).observeOn(JavaFxScheduler.getInstance()));
+        Binding<Long> binding1 = JavaFxSubscriber.toBinding(source.doOnDispose(unsubscribeWait::countDown).observeOn(JavaFxScheduler.platform()));
         bindings.add(binding1);
 
-        Binding<Long> binding2 = JavaFxSubscriber.toBinding(source.doOnDispose(unsubscribeWait::countDown).reduce(0L,(x,y) -> x + y).observeOn(JavaFxScheduler.getInstance()).toObservable());
+        Binding<Long> binding2 = JavaFxSubscriber.toBinding(source.doOnDispose(unsubscribeWait::countDown).reduce(0L,(x,y) -> x + y).observeOn(JavaFxScheduler.platform()).toObservable());
         bindings.add(binding2);
 
         try {

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static Observable<ActionEvent> fromActionEvents(final ContextMenu source)`
`39`	`39`	`source.addEventHandler(ActionEvent.ANY, handler);`
`40`	`40`
`41`	`41`	`subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(ActionEvent.ANY, handler)));`
`42`		`- }).subscribeOn(JavaFxScheduler.getInstance());`
	`42`	`+ }).subscribeOn(JavaFxScheduler.platform());`
`43`	`43`	`}`
`44`	`44`	`public static Observable<ActionEvent> fromActionEvents(final MenuItem source) {`
`45`	`45`	`return Observable.create((ObservableEmitter<ActionEvent> subscriber) -> {`
`@@ -48,7 +48,7 @@ public static Observable<ActionEvent> fromActionEvents(final MenuItem source) {`
`48`	`48`	`source.addEventHandler(ActionEvent.ANY, handler);`
`49`	`49`
`50`	`50`	`subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(ActionEvent.ANY, handler)));`
`51`		`- }).subscribeOn(JavaFxScheduler.getInstance());`
	`51`	`+ }).subscribeOn(JavaFxScheduler.platform());`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ private DialogSource() {}`
`10`	`10`
`11`	`11`	`public static <T> Observable<T> fromDialogSource(final Dialog<T> dialog) {`
`12`	`12`	`return Observable.fromCallable(dialog::showAndWait)`
`13`		`- .subscribeOn(JavaFxScheduler.getInstance())`
	`13`	`+ .subscribeOn(JavaFxScheduler.platform())`
`14`	`14`	`.filter(Optional::isPresent)`
`15`	`15`	`.map(Optional::get);`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ public static <T extends Event> Observable<T> fromNodeEvents(final Node source,`
`33`	`33`	`source.addEventHandler(eventType, handler);`
`34`	`34`
`35`	`35`	`emitter.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(eventType, handler)));`
`36`		`- }).subscribeOn(JavaFxScheduler.getInstance());`
	`36`	`+ }).subscribeOn(JavaFxScheduler.platform());`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static <K,T> Observable<ObservableMap<K,T>> fromObservableMap(final Obser`
`20`	`20`	`MapChangeListener<K,T> listener = c -> subscriber.onNext(source);`
`21`	`21`	`source.addListener(listener);`
`22`	`22`	`subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));`
`23`		`- }).startWith(source).subscribeOn(JavaFxScheduler.getInstance());`
	`23`	`+ }).startWith(source).subscribeOn(JavaFxScheduler.platform());`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public static <K,T> Observable<Entry<K,T>> fromObservableMapAdds(final ObservableMap<K,T> source) {`
`@@ -37,7 +37,7 @@ public static <K,T> Observable<Entry<K,T>> fromObservableMapAdds(final Observabl`
`37`	`37`	`source.addListener(listener);`
`38`	`38`	`subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));`
`39`	`39`
`40`		`- }).subscribeOn(JavaFxScheduler.getInstance());`
	`40`	`+ }).subscribeOn(JavaFxScheduler.platform());`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public static <K,T> Observable<Entry<K,T>> fromObservableMapRemovals(final ObservableMap<K,T> source) {`
`@@ -54,7 +54,7 @@ public static <K,T> Observable<Entry<K,T>> fromObservableMapRemovals(final Obser`
`54`	`54`	`source.addListener(listener);`
`55`	`55`	`subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));`
`56`	`56`
`57`		`- }).subscribeOn(JavaFxScheduler.getInstance());`
	`57`	`+ }).subscribeOn(JavaFxScheduler.platform());`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public static <K,T> Observable<MapChange<K,T>> fromObservableMapChanges(final ObservableMap<K,T> source) {`
`@@ -74,6 +74,6 @@ public static <K,T> Observable<MapChange<K,T>> fromObservableMapChanges(final Ob`
`74`	`74`	`source.addListener(listener);`
`75`	`75`	`subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));`
`76`	`76`
`77`		`- }).subscribeOn(JavaFxScheduler.getInstance());`
	`77`	`+ }).subscribeOn(JavaFxScheduler.platform());`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public static <T> Observable<ObservableSet<T>> fromObservableSet(final Observabl`
`16`	`16`	`SetChangeListener<T> listener = c -> subscriber.onNext(source);`
`17`	`17`	`source.addListener(listener);`
`18`	`18`	`subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));`
`19`		`- }).startWith(source).subscribeOn(JavaFxScheduler.getInstance());`
	`19`	`+ }).startWith(source).subscribeOn(JavaFxScheduler.platform());`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public static <T> Observable<T> fromObservableSetAdds(final ObservableSet<T> source) {`
`@@ -31,7 +31,7 @@ public static <T> Observable<T> fromObservableSetAdds(final ObservableSet<T> sou`
`31`	`31`	`source.addListener(listener);`
`32`	`32`	`subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));`
`33`	`33`
`34`		`- }).subscribeOn(JavaFxScheduler.getInstance());`
	`34`	`+ }).subscribeOn(JavaFxScheduler.platform());`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public static <T> Observable<T> fromObservableSetRemovals(final ObservableSet<T> source) {`
`@@ -46,7 +46,7 @@ public static <T> Observable<T> fromObservableSetRemovals(final ObservableSet<T>`
`46`	`46`	`source.addListener(listener);`
`47`	`47`	`subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));`
`48`	`48`
`49`		`- }).subscribeOn(JavaFxScheduler.getInstance());`
	`49`	`+ }).subscribeOn(JavaFxScheduler.platform());`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public static <T> Observable<SetChange<T>> fromObservableSetChanges(final ObservableSet<T> source) {`
`@@ -64,6 +64,6 @@ public static <T> Observable<SetChange<T>> fromObservableSetChanges(final Observ`
`64`	`64`	`source.addListener(listener);`
`65`	`65`	`subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeListener(listener)));`
`66`	`66`
`67`		`- }).subscribeOn(JavaFxScheduler.getInstance());`
	`67`	`+ }).subscribeOn(JavaFxScheduler.platform());`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ public static <T extends Event> Observable<T> fromSceneEvents(final Scene source`
`35`	`35`
`36`	`36`	`subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(eventType, handler)));`
`37`	`37`
`38`		`- }).subscribeOn(JavaFxScheduler.getInstance());`
	`38`	`+ }).subscribeOn(JavaFxScheduler.platform());`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ public static <T extends WindowEvent> Observable<T> fromWindowEvents(final Windo`
`37`	`37`
`38`	`38`	`subscriber.setDisposable(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> source.removeEventHandler(eventType, handler)));`
`39`	`39`
`40`		`- }).subscribeOn(JavaFxScheduler.getInstance());`
	`40`	`+ }).subscribeOn(JavaFxScheduler.platform());`
`41`	`41`	`}`
`42`	`42`	`}`