Content-Length: 1254007 | pFad | http://github.com/ReactiveX/RxJavaFX/commit/9f61f94844fcf49d54b9d9e8492f60b9056ae6a1

DD Merge pull request #94 from pvnhome/3.0.0 · ReactiveX/RxJavaFX@9f61f94 · GitHub
Skip to content

Commit 9f61f94

Browse files
thomasnieldthomasnield
authored
Merge pull request #94 from pvnhome/3.0.0
The project was adapted to RxJava v3.0.1
2 parents a4ba5cc + 74aa7e0 commit 9f61f94

28 files changed

+89
-91
lines changed

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ repositories {
4747
}
4848

4949
dependencies {
50-
compile 'io.reactivex.rxjava2:rxjava:2.2.4'
50+
compile 'io.reactivex.rxjava3:rxjava:3.0.1'
5151
compile "org.openjfx:javafx-base:11:${platform}"
5252
compile "org.openjfx:javafx-graphics:11:${platform}"
5353
compile "org.openjfx:javafx-controls:11:${platform}"

‎gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
GROUP=io.reactivex.rxjava2
2-
VERSION_NAME=2.11.0-RC34
1+
GROUP=io.reactivex.rxjava3
2+
VERSION_NAME=3.0.0
33
POM_NAME=RxJavaFX
44
POM_PACKAGING=jar
55
POM_DESCRIPTION=RxJava extensions for JavaFX

‎src/main/java/io/reactivex/rxjavafx/observables/JavaFxObservable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package io.reactivex.rxjavafx.observables;
1717

1818

19-
import io.reactivex.Maybe;
20-
import io.reactivex.Observable;
19+
import io.reactivex.rxjava3.core.Maybe;
20+
import io.reactivex.rxjava3.core.Observable;
2121
import io.reactivex.rxjavafx.sources.*;
2222
import javafx.beans.value.ObservableValue;
2323
import javafx.collections.ObservableList;

‎src/main/java/io/reactivex/rxjavafx/observers/BindingObserver.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
*/
1616
package io.reactivex.rxjavafx.observers;
1717

18-
import io.reactivex.Observer;
19-
import io.reactivex.disposables.Disposable;
20-
import io.reactivex.functions.Consumer;
21-
import io.reactivex.functions.Function;
22-
import io.reactivex.observables.ConnectableObservable;
18+
import io.reactivex.rxjava3.core.Observer;
19+
import io.reactivex.rxjava3.disposables.Disposable;
20+
import io.reactivex.rxjava3.functions.Consumer;
21+
import io.reactivex.rxjava3.functions.Function;
22+
import io.reactivex.rxjava3.observables.ConnectableObservable;
2323
import javafx.beans.binding.Binding;
2424
import javafx.beans.value.ObservableValue;
2525
import javafx.collections.ObservableList;
@@ -69,7 +69,7 @@ public void onNext(T t) {
6969
try {
7070
value = unmaskingFunction.apply(t);
7171
fireChange();
72-
} catch (Exception e) {
72+
} catch (Throwable e) {
7373
onError(e);
7474
}
7575
}

‎src/main/java/io/reactivex/rxjavafx/observers/BindingSubscriber.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616
package io.reactivex.rxjavafx.observers;
1717

18-
import io.reactivex.flowables.ConnectableFlowable;
19-
import io.reactivex.functions.Consumer;
20-
import io.reactivex.functions.Function;
18+
import io.reactivex.rxjava3.flowables.ConnectableFlowable;
19+
import io.reactivex.rxjava3.functions.Consumer;
20+
import io.reactivex.rxjava3.functions.Function;
2121
import javafx.beans.binding.Binding;
2222
import javafx.beans.value.ObservableValue;
2323
import javafx.collections.ObservableList;
@@ -70,7 +70,7 @@ public void onNext(T t) {
7070
try {
7171
value = unmaskingFunction.apply(t);
7272
fireChange();
73-
} catch (Exception e) {
73+
} catch (Throwable e) {
7474
onError(e);
7575
}
7676
}

‎src/main/java/io/reactivex/rxjavafx/observers/JavaFxObserver.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import java.util.Optional;
1919

20-
import io.reactivex.Observable;
21-
import io.reactivex.functions.Consumer;
22-
import io.reactivex.observables.ConnectableObservable;
23-
import io.reactivex.plugins.RxJavaPlugins;
20+
import io.reactivex.rxjava3.core.Observable;
21+
import io.reactivex.rxjava3.functions.Consumer;
22+
import io.reactivex.rxjava3.observables.ConnectableObservable;
23+
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2424
import io.reactivex.rxjavafx.observables.JavaFxObservable;
2525
import javafx.beans.binding.Binding;
2626
import javafx.beans.value.ObservableValue;

‎src/main/java/io/reactivex/rxjavafx/observers/JavaFxSubscriber.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package io.reactivex.rxjavafx.observers;
1717

18-
import io.reactivex.Flowable;
19-
import io.reactivex.flowables.ConnectableFlowable;
20-
import io.reactivex.functions.Consumer;
21-
import io.reactivex.plugins.RxJavaPlugins;
18+
import io.reactivex.rxjava3.core.Flowable;
19+
import io.reactivex.rxjava3.flowables.ConnectableFlowable;
20+
import io.reactivex.rxjava3.functions.Consumer;
21+
import io.reactivex.rxjava3.plugins.RxJavaPlugins;
2222
import io.reactivex.rxjavafx.observables.JavaFxObservable;
2323
import javafx.beans.binding.Binding;
2424
import javafx.beans.value.ObservableValue;

‎src/main/java/io/reactivex/rxjavafx/schedulers/JavaFxScheduler.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
*/
1616
package io.reactivex.rxjavafx.schedulers;
1717

18-
import io.reactivex.Scheduler;
19-
import io.reactivex.disposables.Disposable;
20-
import io.reactivex.disposables.Disposables;
18+
import io.reactivex.rxjava3.core.Scheduler;
19+
import io.reactivex.rxjava3.disposables.Disposable;
2120
import javafx.animation.KeyFrame;
2221
import javafx.animation.Timeline;
2322
import javafx.application.Platform;
@@ -118,7 +117,7 @@ public Disposable schedule(final Runnable action, long delayTime, TimeUnit unit)
118117
final Timeline timer = new Timeline(new KeyFrame(Duration.millis(delay), event -> schedule(queuedRunnable)));
119118
timer.play();
120119

121-
return Disposables.fromRunnable(() -> {
120+
return Disposable.fromRunnable(() -> {
122121
queuedRunnable.dispose();
123122
timer.stop();
124123
});
@@ -127,7 +126,7 @@ public Disposable schedule(final Runnable action, long delayTime, TimeUnit unit)
127126
@Override
128127
public Disposable schedule(final Runnable action) {
129128
if (isDisposed()) {
130-
return Disposables.disposed();
129+
return Disposable.disposed();
131130
}
132131

133132
final QueuedRunnable queuedRunnable = action instanceof QueuedRunnable ? (QueuedRunnable) action : new QueuedRunnable(action);

‎src/main/java/io/reactivex/rxjavafx/sources/ActionEventSource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package io.reactivex.rxjavafx.sources;
1717

18-
import io.reactivex.Observable;
19-
import io.reactivex.ObservableEmitter;
18+
import io.reactivex.rxjava3.core.Observable;
19+
import io.reactivex.rxjava3.core.ObservableEmitter;
2020
import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
2121
import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
2222
import javafx.event.ActionEvent;

‎src/main/java/io/reactivex/rxjavafx/sources/DialogSource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package io.reactivex.rxjavafx.sources;
1717

18-
import io.reactivex.Maybe;
19-
import io.reactivex.Single;
18+
import io.reactivex.rxjava3.core.Maybe;
19+
import io.reactivex.rxjava3.core.Single;
2020
import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
2121
import javafx.scene.control.Dialog;
2222

‎src/main/java/io/reactivex/rxjavafx/sources/NodeEventSource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package io.reactivex.rxjavafx.sources;
1717

18-
import io.reactivex.Observable;
19-
import io.reactivex.ObservableEmitter;
18+
import io.reactivex.rxjava3.core.Observable;
19+
import io.reactivex.rxjava3.core.ObservableEmitter;
2020
import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
2121
import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
2222
import javafx.event.Event;

‎src/main/java/io/reactivex/rxjavafx/sources/ObservableListSource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package io.reactivex.rxjavafx.sources;
1717

18-
import io.reactivex.Observable;
19-
import io.reactivex.ObservableOnSubscribe;
18+
import io.reactivex.rxjava3.core.Observable;
19+
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
2020
import io.reactivex.rxjavafx.observables.JavaFxObservable;
2121
import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
2222
import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
@@ -42,7 +42,7 @@ public static <T> Observable<ObservableList<T>> fromObservableList(final Observa
4242
if (source instanceof ListProperty<?>) {
4343
return JavaFxObservable.valuesOf((ListProperty<T>) source);
4444
} else {
45-
return mutations.startWith(source);
45+
return mutations.startWithArray(source);
4646
}
4747
}
4848

‎src/main/java/io/reactivex/rxjavafx/sources/ObservableMapSource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package io.reactivex.rxjavafx.sources;
1717

18-
import io.reactivex.Observable;
19-
import io.reactivex.ObservableOnSubscribe;
18+
import io.reactivex.rxjava3.core.Observable;
19+
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
2020
import io.reactivex.rxjavafx.observables.JavaFxObservable;
2121
import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
2222
import javafx.beans.property.ListProperty;
@@ -43,7 +43,7 @@ public static <K,T> Observable<ObservableMap<K,T>> fromObservableMap(final Obser
4343
if (source instanceof MapProperty<?,?>) {
4444
return JavaFxObservable.valuesOf((MapProperty<K,T>) source);
4545
} else {
46-
return mutations.startWith(source);
46+
return mutations.startWithArray(source);
4747
}
4848
}
4949

‎src/main/java/io/reactivex/rxjavafx/sources/ObservableSetSource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package io.reactivex.rxjavafx.sources;
1717

18-
import io.reactivex.Observable;
19-
import io.reactivex.ObservableOnSubscribe;
18+
import io.reactivex.rxjava3.core.Observable;
19+
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
2020
import io.reactivex.rxjavafx.observables.JavaFxObservable;
2121
import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
2222
import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
@@ -38,7 +38,7 @@ public static <T> Observable<ObservableSet<T>> fromObservableSet(final Observabl
3838
if (source instanceof SetProperty<?>) {
3939
return JavaFxObservable.valuesOf((SetProperty<T>) source);
4040
} else {
41-
return mutations.startWith(source);
41+
return mutations.startWithArray(source);
4242
}
4343
}
4444

‎src/main/java/io/reactivex/rxjavafx/sources/ObservableValueSource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package io.reactivex.rxjavafx.sources;
1717

18-
import io.reactivex.Observable;
19-
import io.reactivex.ObservableEmitter;
18+
import io.reactivex.rxjava3.core.Observable;
19+
import io.reactivex.rxjava3.core.ObservableEmitter;
2020
import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
2121
import javafx.beans.InvalidationListener;
2222
import javafx.beans.value.ChangeListener;

‎src/main/java/io/reactivex/rxjavafx/sources/SceneEventSource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package io.reactivex.rxjavafx.sources;
1717

18-
import io.reactivex.Observable;
19-
import io.reactivex.ObservableOnSubscribe;
18+
import io.reactivex.rxjava3.core.Observable;
19+
import io.reactivex.rxjava3.core.ObservableOnSubscribe;
2020
import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
2121
import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
2222
import javafx.event.Event;

‎src/main/java/io/reactivex/rxjavafx/sources/TimerSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package io.reactivex.rxjavafx.sources;
1717

18-
import io.reactivex.Observable;
18+
import io.reactivex.rxjava3.core.Observable;
1919
import javafx.animation.Animation;
2020
import javafx.animation.KeyFrame;
2121
import javafx.animation.Timeline;

‎src/main/java/io/reactivex/rxjavafx/sources/WindowEventSource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package io.reactivex.rxjavafx.sources;
1717

18-
import io.reactivex.Observable;
19-
import io.reactivex.ObservableEmitter;
18+
import io.reactivex.rxjava3.core.Observable;
19+
import io.reactivex.rxjava3.core.ObservableEmitter;
2020
import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
2121
import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
2222
import javafx.event.EventHandler;

‎src/main/java/io/reactivex/rxjavafx/subscriptions/CompositeBinding.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package io.reactivex.rxjavafx.subscriptions;
1717

18-
import io.reactivex.exceptions.Exceptions;
18+
import io.reactivex.rxjava3.exceptions.Exceptions;
1919
import javafx.beans.binding.Binding;
2020

2121
import java.util.*;

‎src/main/java/io/reactivex/rxjavafx/subscriptions/JavaFxSubscriptions.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@
1616
package io.reactivex.rxjavafx.subscriptions;
1717

1818

19-
import io.reactivex.Scheduler;
20-
import io.reactivex.disposables.Disposable;
21-
import io.reactivex.disposables.Disposables;
22-
import javafx.application.Platform;;
19+
import io.reactivex.rxjava3.core.Scheduler;
20+
import io.reactivex.rxjava3.disposables.Disposable;
21+
import javafx.application.Platform;
2322
import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
2423

2524

@@ -36,7 +35,7 @@ private JavaFxSubscriptions() {
3635
* @return an Disposable that always runs <code>unsubscribe</code> in the event dispatch thread.
3736
*/
3837
public static Disposable unsubscribeInEventDispatchThread(final Runnable unsubscribe) {
39-
return Disposables.fromRunnable(() -> {
38+
return Disposable.fromRunnable(() -> {
4039
if (Platform.isFxApplicationThread()) {
4140
unsubscribe.run();
4241
} else {

‎src/main/java/io/reactivex/rxjavafx/transformers/FxFlowableTransformers.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*/
1616
package io.reactivex.rxjavafx.transformers;
1717

18-
import io.reactivex.FlowableOperator;
19-
import io.reactivex.FlowableTransformer;
20-
import io.reactivex.exceptions.Exceptions;
21-
import io.reactivex.functions.Action;
22-
import io.reactivex.functions.Consumer;
23-
import io.reactivex.subscribers.ResourceSubscriber;
18+
import io.reactivex.rxjava3.core.FlowableOperator;
19+
import io.reactivex.rxjava3.core.FlowableTransformer;
20+
import io.reactivex.rxjava3.exceptions.Exceptions;
21+
import io.reactivex.rxjava3.functions.Action;
22+
import io.reactivex.rxjava3.functions.Consumer;
23+
import io.reactivex.rxjava3.subscribers.ResourceSubscriber;
2424
import javafx.application.Platform;
2525
import org.reactivestreams.Subscriber;
2626
import org.reactivestreams.Subscription;
@@ -190,7 +190,7 @@ public void onComplete() {
190190
try {
191191
if (ctObserver.doOnCompletedCountAction != null)
192192
ctObserver.doOnCompletedCountAction.accept(count);
193-
} catch (Exception e) {
193+
} catch (Throwable e) {
194194
Exceptions.throwIfFatal(e);
195195
onError(e);
196196
return;
@@ -206,7 +206,7 @@ public void onError(Throwable e) {
206206
try {
207207
if (ctObserver.doOnErrorCountAction != null)
208208
ctObserver.doOnErrorCountAction.accept(count);
209-
} catch(Exception e1) {
209+
} catch(Throwable e1) {
210210
Exceptions.throwIfFatal(e1);
211211
child.onError(e1);
212212
}
@@ -220,7 +220,7 @@ public void onNext(T t) {
220220
++count;
221221
if (ctObserver.doOnNextCountAction != null)
222222
ctObserver.doOnNextCountAction.accept(count);
223-
} catch(Exception e) {
223+
} catch(Throwable e) {
224224
Exceptions.throwIfFatal(e);
225225
onError(e);
226226
return;

‎src/main/java/io/reactivex/rxjavafx/transformers/FxObservableTransformers.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
package io.reactivex.rxjavafx.transformers;
1818

19-
import io.reactivex.ObservableOperator;
20-
import io.reactivex.ObservableTransformer;
21-
import io.reactivex.Observer;
22-
import io.reactivex.disposables.Disposable;
23-
import io.reactivex.exceptions.Exceptions;
24-
import io.reactivex.functions.Action;
25-
import io.reactivex.functions.Consumer;
26-
import io.reactivex.observers.ResourceObserver;
19+
import io.reactivex.rxjava3.core.ObservableOperator;
20+
import io.reactivex.rxjava3.core.ObservableTransformer;
21+
import io.reactivex.rxjava3.core.Observer;
22+
import io.reactivex.rxjava3.disposables.Disposable;
23+
import io.reactivex.rxjava3.exceptions.Exceptions;
24+
import io.reactivex.rxjava3.functions.Action;
25+
import io.reactivex.rxjava3.functions.Consumer;
26+
import io.reactivex.rxjava3.observers.ResourceObserver;
2727
import javafx.application.Platform;
2828

2929

@@ -183,7 +183,7 @@ public void onComplete() {
183183
try {
184184
if (ctObserver.doOnCompletedCountAction != null)
185185
ctObserver.doOnCompletedCountAction.accept(count);
186-
} catch (Exception e) {
186+
} catch (Throwable e) {
187187
Exceptions.throwIfFatal(e);
188188
onError(e);
189189
return;
@@ -199,7 +199,7 @@ public void onError(Throwable e) {
199199
try {
200200
if (ctObserver.doOnErrorCountAction != null)
201201
ctObserver.doOnErrorCountAction.accept(count);
202-
} catch(Exception e1) {
202+
} catch(Throwable e1) {
203203
Exceptions.throwIfFatal(e1);
204204
child.onError(e1);
205205
}
@@ -213,7 +213,7 @@ public void onNext(T t) {
213213
++count;
214214
if (ctObserver.doOnNextCountAction != null)
215215
ctObserver.doOnNextCountAction.accept(count);
216-
} catch(Exception e) {
216+
} catch(Throwable e) {
217217
Exceptions.throwIfFatal(e);
218218
onError(e);
219219
return;

0 commit comments

Comments
 (0)








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/ReactiveX/RxJavaFX/commit/9f61f94844fcf49d54b9d9e8492f60b9056ae6a1

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy