update package objects

Author: samuelgruetter

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/package.scala

@@ -18,13 +18,6 @@ package rx.lang
 import java.util.concurrent.TimeUnit
 import java.util.Date
 
-/* 
- * Note that:
- * -  Scala users cannot use Java's types with variance without always using writing
- *    e.g. rx.Notification[_ <: T], so we create aliases fixing the variance
- * -  For consistency, we create aliases for all types which Scala users need
- */
-
 /**
  * This package contains all classes that RxScala users need.
  * 
@@ -33,95 +26,6 @@ import java.util.Date
  */
 package object scala {
 
-  /*
-   * Here we're imitating C's preprocessor using Search & Replace.
-   * 
-   * To activate the code needed to get nice Scaladoc, do the following replacements:
-   *    /*//#ifdef SCALADOC    -->   //#ifdef SCALADOC
-   *    *///#else              -->   /*//#else
-   *    //#endif               -->   *///#endif
-   *
-   * To get back to the actual code, undo the above replacements.
-   * 
-   */
-
-  /*//#ifdef SCALADOC
-
-  /**
-   * Provides a mechanism for receiving push-based notifications.
-   *
-   * After an Observer calls an [[Observable]]'s `subscribe` method, the Observable
-   * calls the Observer's `onNext` method to provide notifications. A well-behaved Observable will
-   * call an Observer's `onCompleted` method exactly once or the Observer's `onError` method exactly once.
-   */
-  trait Observer[-T] {
-
-    /**
-     * Notifies the Observer that the [[Observable]] has finished sending push-based notifications.
-     *
-     * The [[Observable]] will not call this method if it calls `onError`.
-     */
-    def onCompleted(): Unit
-
-    /**
-     * Notifies the Observer that the [[Observable]] has experienced an error condition.
-     *
-     * If the [[Observable]] calls this method, it will not thereafter call `onNext` or `onCompleted`.
-     */
-    def onError(e: Throwable): Unit
-
-    /**
-     * Provides the Observer with new data.
-     *
-     * The [[Observable]] calls this closure 0 or more times.
-     *
-     * The [[Observable]] will not call this method again after it calls either `onCompleted` or `onError`.
-     */
-    def onNext(arg: T): Unit
-  }
-
-  /**
-   * Subscriptions are returned from all `Observable.subscribe` methods to allow unsubscribing.
-   * 
-   * This interface is the equivalent of `IDisposable` in the .NET Rx implementation.
-   */
-  trait Subscription {
-    /**
-     * Call this method to stop receiving notifications on the Observer that was registered when 
-     * this Subscription was received.
-     */
-    def unsubscribe(): Unit
-  }
-  
-  import language.implicitConversions
-  
-  private[scala] implicit def fakeSubscription2RxSubscription(s: Subscription): rx.Subscription = 
-    new rx.Subscription {
-      def unsubscribe() = s.unsubscribe()
-    }
-  private[scala] implicit def rxSubscription2FakeSubscription(s: rx.Subscription): Subscription = 
-    new Subscription {
-      def unsubscribe() = s.unsubscribe()
-    }
-
-  private[scala] implicit def schedulerActionToFunc2[T](action: (Scheduler, T) => Subscription) =
-    new rx.util.functions.Func2[rx.Scheduler, T, rx.Subscription] {
-      def call(s: rx.Scheduler, t: T): rx.Subscription = {
-        action(ImplicitFunctionConversions.javaSchedulerToScalaScheduler(s), t)
-      }
-    }  
-  
-  private[scala] implicit def fakeObserver2RxObserver[T](o: Observer[T]): rx.Observer[_ >: T] = ???
-  private[scala] implicit def rxObserver2fakeObserver[T](o: rx.Observer[_ >: T]): Observer[T] = ???
-  
-  *///#else
-
-  type Observer[-T] = rx.Observer[_ >: T]
-
-  type Subscription = rx.Subscription
-
-  //#endif
-
   /**
    * Allows to construct observables in a similar way as futures.
    * 
@@ -142,17 +46,3 @@ package object scala {
     Observable(1).observeOn(scheduler).map(_ => body)
   }
 }
-
-/*
-
-These classes are considered unnecessary for Scala users, so we don't create aliases for them:
-
-rx.plugins.RxJavaErrorHandler
-rx.plugins.RxJavaObservableExecutionHook
-rx.plugins.RxJavaPlugins
-
-rx.subscriptions.BooleanSubscription
-rx.subscriptions.CompositeSubscription
-rx.subscriptions.Subscriptions
-
-*/

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/subjects/package.scala

@@ -1,31 +1,6 @@
 package rx.lang.scala
 
 /**
- * Provides the type `Subject`.
+ * Subjects are Observers and Observables at the same time.
  */
-package object subjects {
-
-  /**
-   * A Subject is an Observable and an Observer at the same time. 
-   * 
-   * The Java Subject looks like this: 
-   * {{{
-   * public abstract class Subject<T,R> extends Observable<R> implements Observer<T>
-   * }}}
-   */
-  type Subject[-T, +R] = rx.subjects.Subject[_ >: T, _ <: R]
-
-  // For nicer scaladoc, we would like to present something like this:
-  /*
-  trait Observable[+R] {}
-  trait Observer[-T] {}
-  trait Subject[-T, +R] extends Observable[R] with Observer[T] { }
-  */
-  
-  // We don't make aliases to these types, because they are considered internal/not needed by users:
-  // rx.subjects.AsyncSubject
-  // rx.subjects.BehaviorSubject
-  // rx.subjects.PublishSubject
-  // rx.subjects.ReplaySubject
-
-}
+package object subjects {}

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/subscriptions/package.scala

@@ -0,0 +1,6 @@
+package rx.lang.scala
+
+/**
+ * Provides `Subscription`, and specialized versions of it.
+ */
+package object subscriptions {}