refactor package structure

package object scala and package scala now can coexist

Author: samuelgruetter

language-adaptors/rxjava-scala-java/src/main/java/rx/lang/scalaexamples/MovieLibUsage.java renamed to language-adaptors/rxjava-scala-java/src/main/java/rx/lang/scala/examples/MovieLibUsage.java

@@ -1,4 +1,4 @@
-package rx.lang.scalatests;
+package rx.lang.scala.examples;
 
 import org.junit.Test;
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scalaimpl/Observable.scala renamed to language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/Observable.scala

@@ -15,10 +15,12 @@
  */
 
 
-package rx.lang.scalaimpl
+package rx.lang.scala
 
 import org.scalatest.junit.JUnitSuite
 import scala.collection.Seq
+import rx.lang.scala.observables.BlockingObservable
+import rx.lang.scala.observables.ConnectableObservable
 
 
 /**
@@ -35,7 +37,7 @@ class Observable[+T](val asJava: rx.Observable[_ <: T])
   import rx.{Observable => JObservable}
   import rx.lang.scala.{Notification, Subscription, Scheduler, Observer}
   import rx.lang.scala.util._
-  import rx.lang.scalaimpl.ImplicitFunctionConversions._
+  import rx.lang.scala.internal.ImplicitFunctionConversions._
 
   /**
    * An {@link Observer} must call an Observable's {@code subscribe} method in order to
@@ -1438,15 +1440,15 @@ object Observable {
   import rx.{Observable => JObservable}
   import rx.lang.scala.{Notification, Subscription, Scheduler, Observer}
   import rx.lang.scala.util._
-  import rx.lang.scalaimpl.ImplicitFunctionConversions._
+  import rx.lang.scala.internal.ImplicitFunctionConversions._
 
-  private[scalaimpl] 
+  private[scala] 
   def jObsOfListToScObsOfSeq[T](jObs: rx.Observable[_ <: java.util.List[T]]): Observable[Seq[T]] = {
     val oScala1: Observable[java.util.List[T]] = new Observable[java.util.List[T]](jObs)
     oScala1.map((lJava: java.util.List[T]) => lJava.asScala)
   }
 
-  private[scalaimpl] 
+  private[scala] 
   def jObsOfJObsToScObsOfScObs[T](jObs: rx.Observable[_ <: rx.Observable[_ <: T]]): Observable[Observable[T]] = {
     val oScala1: Observable[rx.Observable[_ <: T]] = new Observable[rx.Observable[_ <: T]](jObs)
     oScala1.map((oJava: rx.Observable[_ <: T]) => new Observable[T](oJava))
@@ -1793,8 +1795,8 @@ object Observable {
 // Cannot yet have inner class because of this error message:
 // implementation restriction: nested class is not allowed in value class.
 // This restriction is planned to be removed in subsequent releases.  
-class WithFilter[+T] private[scalaimpl] (p: T => Boolean, wrapped: rx.Observable[_ <: T]) {
-  import rx.lang.scalaimpl.ImplicitFunctionConversions._
+class WithFilter[+T] private[scala] (p: T => Boolean, wrapped: rx.Observable[_ <: T]) {
+  import rx.lang.scala.internal.ImplicitFunctionConversions._
 
   def map[B](f: T => B): Observable[B] = new Observable[B](wrapped.filter(p).map(f))
   def flatMap[B](f: T => Observable[B]): Observable[B] = {

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

@@ -0,0 +1,18 @@
+package rx.lang.scala
+
+import rx.concurrency.CurrentThreadScheduler
+
+package object concurrency {
+  /*
+  TODO
+  rx.concurrency.CurrentThreadScheduler
+  rx.concurrency.ExecutorScheduler
+  rx.concurrency.ImmediateScheduler
+  rx.concurrency.NewThreadScheduler
+  rx.concurrency.Schedulers
+  rx.concurrency.TestScheduler
+ */
+  
+  lazy val CurrentThreadScheduler = rx.concurrency.CurrentThreadScheduler.getInstance()
+
+}

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scalatests/MovieLib.scala renamed to language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/examples/MovieLib.scala

@@ -1,4 +1,4 @@
-package rx.lang.scalatests
+package rx.lang.scala.examples
 
 import rx.lang.scala.Observable
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scalatests/RxScalaDemo.scala renamed to language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/examples/RxScalaDemo.scala

@@ -1,4 +1,4 @@
-package rx.lang.scalatests
+package rx.lang.scala.examples
 
 import org.scalatest.junit.JUnitSuite
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scalaimpl/ImplicitFunctionConversions.scala renamed to language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/internal/ImplicitFunctionConversions.scala

@@ -2,7 +2,7 @@
 /*
  * These function conversions are only used by the ScalaAdapter, users of RxScala don't need them.
  */
-package rx.lang.scalaimpl
+package rx.lang.scala.internal
 
 
 import java.{lang => jlang}

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scalaimpl/BlockingObservable.scala renamed to language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/observables/BlockingObservable.scala

@@ -1,4 +1,4 @@
-package rx.lang.scalaimpl
+package rx.lang.scala.observables
 
 import scala.collection.JavaConverters._
 

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scalaimpl/ConnectableObservable.scala renamed to language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/observables/ConnectableObservable.scala

@@ -1,10 +1,10 @@
-package rx.lang.scalaimpl
+package rx.lang.scala.observables
 
 
 class ConnectableObservable[+T](val asJava: rx.observables.ConnectableObservable[_ <: T]) extends AnyVal {
   import rx.lang.scala._
   import rx.lang.scala.util._
   import rx.{Observable => JObservable}
-  import rx.lang.scalaimpl.ImplicitFunctionConversions._
+  import rx.lang.scala.internal.ImplicitFunctionConversions._
 
 }

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

@@ -8,13 +8,8 @@ package rx.lang
  *    e.g. rx.Notification[_ <: T], so we create aliases fixing the variance
  * -  For consistency, we create aliases for all types
  * -  Type aliases cannot be at top level, they have to be inside an object or class
- * -  It's possible to make a "package object" instead of "object", but if there's a
- *    package with the same name as the package object, the gradle builder fails
- *    (the eclipse builder works). Using -Yresolve-term-conflict:package
- *    or -Yresolve-term-conflict:object as scalac options didn't help.
- *    See also http://stackoverflow.com/questions/8984730/package-contains-object-and-package-with-same-name
  */
-object scala {
+package object scala {
 
   type Notification[+T] = rx.Notification[_ <: T]
   object Notification {
@@ -23,36 +18,9 @@ object scala {
     def apply[T](t: Throwable): Notification[T] = new rx.Notification(t)
   }
 
-  type Observable[+T] = rx.lang.scalaimpl.Observable[T]
-  val Observable = rx.lang.scalaimpl.Observable
   type Observer[-T] = rx.Observer[_ >: T]  
   type Scheduler = rx.Scheduler
   type Subscription = rx.Subscription
-
-  object util {
-    type Closing = rx.util.Closing
-
-    // TODO rx.util.Closings
-
-    type CompositeException = rx.util.CompositeException
-
-    // TODO rx.util.Exceptions
-
-    // rx.util.OnErrorNotImplementedException TODO what's this?
-
-    type Opening = rx.util.Opening
-
-    // rx.util.Openings // TODO
-
-    // rx.util.Range // TODO do we need this? Or the Scala Range?
-
-    type Timestamped[+T] = rx.util.Timestamped[_ <: T]
-    object Timestamped {
-      def apply[T](timestampMillis: Long, value: T): Timestamped[T] = {
-        new rx.util.Timestamped(timestampMillis, value)
-      }
-    }
-  }
 
 }
 
@@ -62,13 +30,6 @@ TODO make aliases for these types because:
 * those which are covariant or contravariant do need an alias to get variance correct
 * the others for consistency
 
-rx.concurrency.CurrentThreadScheduler
-rx.concurrency.ExecutorScheduler
-rx.concurrency.ImmediateScheduler
-rx.concurrency.NewThreadScheduler
-rx.concurrency.Schedulers
-rx.concurrency.TestScheduler
-
 rx.observables.BlockingObservable
 rx.observables.ConnectableObservable
 rx.observables.GroupedObservable

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

@@ -0,0 +1,26 @@
+package rx.lang.scala
+
+package object util {
+  type Closing = rx.util.Closing
+
+  // TODO rx.util.Closings
+
+  type CompositeException = rx.util.CompositeException
+
+  // TODO rx.util.Exceptions
+
+  // rx.util.OnErrorNotImplementedException TODO what's this?
+
+  type Opening = rx.util.Opening
+
+  // rx.util.Openings // TODO
+
+  // rx.util.Range // TODO do we need this? Or the Scala Range?
+
+  type Timestamped[+T] = rx.util.Timestamped[_ <: T]
+  object Timestamped {
+    def apply[T](timestampMillis: Long, value: T): Timestamped[T] = {
+      new rx.util.Timestamped(timestampMillis, value)
+    }
+  }
+}