refactor to new io.reactivex domain

thomasnield · thomasnield · commit b17bdaa0153f · 2017-02-25T17:02:39.000-06:00
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=2.0.0
+version=2.0.2
diff --git a/src/main/java/io/reactivex/rxjavafx/observables/JavaFxObservable.java b/src/main/java/io/reactivex/rxjavafx/observables/JavaFxObservable.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.observables;
+package io.reactivex.rxjavafx.observables;
 
 
 import io.reactivex.Observable;
+import io.reactivex.rxjavafx.sources.*;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableMap;
@@ -32,10 +33,8 @@
 import javafx.stage.Window;
 import javafx.stage.WindowEvent;
 import javafx.util.Duration;
-import rx.javafx.sources.*;
 
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 
diff --git a/src/main/java/io/reactivex/rxjavafx/observers/BindingObserver.java b/src/main/java/io/reactivex/rxjavafx/observers/BindingObserver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.observers;
+package io.reactivex.rxjavafx.observers;
 
 import com.sun.javafx.binding.ExpressionHelper;
 import io.reactivex.Observer;
diff --git a/src/main/java/io/reactivex/rxjavafx/observers/BindingSubscriber.java b/src/main/java/io/reactivex/rxjavafx/observers/BindingSubscriber.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.observers;
+package io.reactivex.rxjavafx.observers;
 
 import com.sun.javafx.binding.ExpressionHelper;
 import io.reactivex.flowables.ConnectableFlowable;
diff --git a/src/main/java/io/reactivex/rxjavafx/observers/JavaFxObserver.java b/src/main/java/io/reactivex/rxjavafx/observers/JavaFxObserver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.observers;
+package io.reactivex.rxjavafx.observers;
 
 import io.reactivex.Observable;
 import io.reactivex.functions.Consumer;
diff --git a/src/main/java/io/reactivex/rxjavafx/observers/JavaFxSubscriber.java b/src/main/java/io/reactivex/rxjavafx/observers/JavaFxSubscriber.java
@@ -13,13 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.observers;
+package io.reactivex.rxjavafx.observers;
 
 import io.reactivex.Flowable;
-import io.reactivex.Observable;
 import io.reactivex.flowables.ConnectableFlowable;
 import io.reactivex.functions.Consumer;
-import io.reactivex.observables.ConnectableObservable;
 import javafx.beans.binding.Binding;
 public enum JavaFxSubscriber {
     ;//no instances
diff --git a/src/main/java/io/reactivex/rxjavafx/schedulers/JavaFxScheduler.java b/src/main/java/io/reactivex/rxjavafx/schedulers/JavaFxScheduler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.schedulers;
+package io.reactivex.rxjavafx.schedulers;
 
 import io.reactivex.Scheduler;
 import io.reactivex.disposables.Disposable;
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/ActionEventSource.java b/src/main/java/io/reactivex/rxjavafx/sources/ActionEventSource.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableEmitter;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
+import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.scene.Node;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
-import rx.schedulers.JavaFxScheduler;
-import rx.subscriptions.JavaFxSubscriptions;
 
 public final class ActionEventSource {
     private ActionEventSource() {}
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/Change.java b/src/main/java/io/reactivex/rxjavafx/sources/Change.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 public final class Change<T> {
     private final T oldVal;
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/CompositeObservable.java b/src/main/java/io/reactivex/rxjavafx/sources/CompositeObservable.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 
 import io.reactivex.Observable;
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/DialogSource.java b/src/main/java/io/reactivex/rxjavafx/sources/DialogSource.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 import io.reactivex.Observable;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
 import javafx.scene.control.Dialog;
 import java.util.Optional;
-import rx.schedulers.JavaFxScheduler;
 
 public final class DialogSource {
     private DialogSource() {}
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/Flag.java b/src/main/java/io/reactivex/rxjavafx/sources/Flag.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 public enum Flag {
     ADDED,
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/ListChange.java b/src/main/java/io/reactivex/rxjavafx/sources/ListChange.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 /**
  * Holds an ADDED, REMOVED, or UPDATED flag with the associated value
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/MapChange.java b/src/main/java/io/reactivex/rxjavafx/sources/MapChange.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 public final class MapChange<K,T> {
     private final K key;
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/NodeEventSource.java b/src/main/java/io/reactivex/rxjavafx/sources/NodeEventSource.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableEmitter;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
+import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.scene.Node;
-import rx.schedulers.JavaFxScheduler;
-import rx.subscriptions.JavaFxSubscriptions;
 
 public class NodeEventSource {
     public static <T extends Event> Observable<T> fromNodeEvents(final Node source, final EventType<T> eventType) {
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/ObservableListSource.java b/src/main/java/io/reactivex/rxjavafx/sources/ObservableListSource.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
+import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import rx.schedulers.JavaFxScheduler;
-import rx.subscriptions.JavaFxSubscriptions;
 
 import java.util.HashMap;
 import java.util.function.Function;
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/ObservableMapSource.java b/src/main/java/io/reactivex/rxjavafx/sources/ObservableMapSource.java
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
 import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
 import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableMap;
-import rx.schedulers.JavaFxScheduler;
-import rx.subscriptions.JavaFxSubscriptions;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Map.Entry;
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/ObservableSetSource.java b/src/main/java/io/reactivex/rxjavafx/sources/ObservableSetSource.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
+import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
 import javafx.collections.ObservableSet;
 import javafx.collections.SetChangeListener;
-import rx.schedulers.JavaFxScheduler;
-import rx.subscriptions.JavaFxSubscriptions;
 
 public final class ObservableSetSource {
     private ObservableSetSource() {}
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/ObservableValueSource.java b/src/main/java/io/reactivex/rxjavafx/sources/ObservableValueSource.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableEmitter;
+import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
 import javafx.beans.InvalidationListener;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
-import rx.subscriptions.JavaFxSubscriptions;
 
 import java.util.Optional;
 
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/SceneEventSource.java b/src/main/java/io/reactivex/rxjavafx/sources/SceneEventSource.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableOnSubscribe;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
+import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.scene.Scene;
-import rx.schedulers.JavaFxScheduler;
-import rx.subscriptions.JavaFxSubscriptions;
 
 public final class SceneEventSource {
 
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/SetChange.java b/src/main/java/io/reactivex/rxjavafx/sources/SetChange.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 public final class SetChange<T> {
     private final T value;
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/TimerSource.java b/src/main/java/io/reactivex/rxjavafx/sources/TimerSource.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 import io.reactivex.Observable;
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
 import javafx.util.Duration;
-import rx.subscriptions.JavaFxSubscriptions;
+import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
 import java.util.concurrent.atomic.AtomicLong;
 
 public final class TimerSource {
diff --git a/src/main/java/io/reactivex/rxjavafx/sources/WindowEventSource.java b/src/main/java/io/reactivex/rxjavafx/sources/WindowEventSource.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 import io.reactivex.Observable;
 import io.reactivex.ObservableEmitter;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
+import io.reactivex.rxjavafx.subscriptions.JavaFxSubscriptions;
 import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.stage.Window;
 import javafx.stage.WindowEvent;
-import rx.schedulers.JavaFxScheduler;
-import rx.subscriptions.JavaFxSubscriptions;
 
 public final class WindowEventSource {
 
diff --git a/src/main/java/io/reactivex/rxjavafx/subscriptions/CompositeBinding.java b/src/main/java/io/reactivex/rxjavafx/subscriptions/CompositeBinding.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.subscriptions;
+package io.reactivex.rxjavafx.subscriptions;
 
 import io.reactivex.exceptions.Exceptions;
 import javafx.beans.binding.Binding;
diff --git a/src/main/java/io/reactivex/rxjavafx/subscriptions/JavaFxSubscriptions.java b/src/main/java/io/reactivex/rxjavafx/subscriptions/JavaFxSubscriptions.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.subscriptions;
+package io.reactivex.rxjavafx.subscriptions;
 
 
 import io.reactivex.Scheduler;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.disposables.Disposables;
 import javafx.application.Platform;;
-import rx.schedulers.JavaFxScheduler;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
 
 
 public final class JavaFxSubscriptions {
diff --git a/src/main/java/io/reactivex/rxjavafx/transformers/FxFlowableTransformers.java b/src/main/java/io/reactivex/rxjavafx/transformers/FxFlowableTransformers.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.transformers;
+package io.reactivex.rxjavafx.transformers;
 
 import io.reactivex.FlowableOperator;
 import io.reactivex.FlowableTransformer;
diff --git a/src/main/java/io/reactivex/rxjavafx/transformers/FxObservableTransformers.java b/src/main/java/io/reactivex/rxjavafx/transformers/FxObservableTransformers.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package rx.transformers;
+package io.reactivex.rxjavafx.transformers;
 
 import io.reactivex.ObservableOperator;
 import io.reactivex.ObservableTransformer;
diff --git a/src/test/java/io/reactivex/rxjavafx/schedulers/JavaFxSchedulerTest.java b/src/test/java/io/reactivex/rxjavafx/schedulers/JavaFxSchedulerTest.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.schedulers;
+package io.reactivex.rxjavafx.schedulers;
 
 import io.reactivex.Scheduler;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.embed.swing.JFXPanel;
diff --git a/src/test/java/io/reactivex/rxjavafx/sources/JavaFxObservableTest.java b/src/test/java/io/reactivex/rxjavafx/sources/JavaFxObservableTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.javafx.sources;
+package io.reactivex.rxjavafx.sources;
 
 import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
@@ -28,8 +28,8 @@
 import javafx.embed.swing.JFXPanel;
 import javafx.util.Duration;
 import org.junit.Test;
-import rx.observables.JavaFxObservable;
-import rx.schedulers.JavaFxScheduler;
+import io.reactivex.rxjavafx.observables.JavaFxObservable;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/test/java/io/reactivex/rxjavafx/subscriptions/BindingTest.java b/src/test/java/io/reactivex/rxjavafx/subscriptions/BindingTest.java
