Skip to content

Implement fromObservableValueChanges #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/main/java/rx/javafx/sources/Change.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package rx.javafx.sources;

public final class Change<T> {
private final T oldVal;
private final T newVal;

public Change(T oldVal, T newVal) {
this.oldVal = oldVal;
this.newVal = newVal;
}
public T getOldVal() {
return oldVal;
}
public T getNewVal() {
return newVal;
}
}
31 changes: 18 additions & 13 deletions src/main/java/rx/javafx/sources/ObservableValueSource.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import javafx.beans.value.ObservableValue;
import rx.Observable;
import rx.Subscriber;
import rx.functions.Action0;
import rx.subscriptions.JavaFxSubscriptions;

public class ObservableValueSource {
Expand All @@ -18,25 +17,31 @@ public static <T> Observable<T> fromObservableValue(final ObservableValue<T> fxO
public void call(final Subscriber<? super T> subscriber) {
subscriber.onNext(fxObservable.getValue());

final ChangeListener<T> listener = new ChangeListener<T>() {
@Override
public void changed(final ObservableValue<? extends T> observableValue, final T prev, final T current) {
subscriber.onNext(current);
}
};
final ChangeListener<T> listener = (observableValue, prev, current) -> subscriber.onNext(current);

fxObservable.addListener(listener);

subscriber.add(JavaFxSubscriptions.unsubscribeInEventDispatchThread(new Action0() {
@Override
public void call() {
fxObservable.removeListener(listener);
}
}));
subscriber.add(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> fxObservable.removeListener(listener)));

}
});
}
/**
* @see rx.observables.JavaFxObservable#fromObservableValue
*/
public static <T> Observable<Change<T>> fromObservableValueChanges(final ObservableValue<T> fxObservable) {
return Observable.create(new Observable.OnSubscribe<Change<T>>() {
@Override
public void call(final Subscriber<? super Change<T>> subscriber) {

final ChangeListener<T> listener = (observableValue, prev, current) -> subscriber.onNext(new Change<>(prev,current));

fxObservable.addListener(listener);

subscriber.add(JavaFxSubscriptions.unsubscribeInEventDispatchThread(() -> fxObservable.removeListener(listener)));

}
});
}

}
12 changes: 12 additions & 0 deletions src/main/java/rx/observables/JavaFxObservable.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import javafx.event.EventType;
import javafx.scene.Node;
import rx.Observable;
import rx.javafx.sources.Change;
import rx.javafx.sources.NodeEventSource;
import rx.javafx.sources.ObservableValueSource;

Expand Down Expand Up @@ -50,4 +51,15 @@ public static <T extends Event> Observable<T> fromNodeEvents(final Node node, fi
public static <T> Observable<T> fromObservableValue(final ObservableValue<T> fxObservable) {
return ObservableValueSource.fromObservableValue(fxObservable);
}

/**
* Create an rx Observable from a javafx ObservableValue, and emits changes with old and new value pairs
*
* @param fxObservable the observed ObservableValue
* @param <T> the type of the observed value
* @return an Observable emitting values as the wrapped ObservableValue changes
*/
public static <T> Observable<Change<T>> fromObservableValueChanges(final ObservableValue<T> fxObservable) {
return ObservableValueSource.fromObservableValueChanges(fxObservable);
}
}