move rx.lang.scala.subscriptions.Subscription to rx.lang.scala.Subscription (mirror Java package structure)

Author: samuelgruetter

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

@@ -20,11 +20,8 @@ import java.{ lang => jlang }
 import rx.lang.scala._
 import rx.util.functions._
 import scala.collection.Seq
-import rx.lang.scala.subscriptions.Subscription
 import java.{lang => jlang}
 import scala.language.implicitConversions
-import rx.lang.scala.Observer
-import rx.lang.scala.Scheduler
 
 /**
  * These function conversions convert between Scala functions and Rx `Func`s and `Action`s.

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

@@ -5,7 +5,7 @@ import scala.concurrent.duration.Duration
 import ImplicitFunctionConversions.scalaFunction0ProducingUnitToAction0
 import ImplicitFunctionConversions.schedulerActionToFunc2
 import rx.util.functions.{Action0, Action1, Func2}
-import rx.lang.scala.subscriptions.Subscription
+import rx.lang.scala.Subscription
 
 /**
  * Represents an object thatimport rx.lang.scala.ImplicitFunctionConversions

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

@@ -1,69 +1,64 @@
 /**
  * Copyright 2013 Netflix, Inc.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
-package rx.lang.scala {
+package rx.lang.scala
 
- /**
+/**
  * 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 {
+trait Subscription {
 
-    val asJavaSubscription: rx.Subscription
+  val asJavaSubscription: rx.Subscription
 
-   /**
-    * Call this method to stop receiving notifications on the Observer that was registered when
-    * this Subscription was received.
-    */
-    def unsubscribe(): Unit = asJavaSubscription.unsubscribe()
+  /**
+   * Call this method to stop receiving notifications on the Observer that was registered when
+   * this Subscription was received.
+   */
+  def unsubscribe(): Unit = asJavaSubscription.unsubscribe()
 
-   /**
-    * Checks if the subscription is unsubscribed.
-    */
-    def isUnsubscribed: Boolean
-  }
+  /**
+   * Checks if the subscription is unsubscribed.
+   */
+  def isUnsubscribed: Boolean
 }
 
-package rx.lang.scala.subscriptions {
-
-import rx.lang.scala.Subscription
-import java.util.concurrent.atomic.AtomicBoolean
-
-
 object Subscription {
-
+  import java.util.concurrent.atomic.AtomicBoolean
+  import rx.lang.scala.subscriptions._
+  
   /**
-   * Creates an [[rx.lang.scala.Subscription]] from an[[rx.Subscription]].
+   * Creates an [[rx.lang.scala.Subscription]] from an [[rx.Subscription]].
    */
   def apply(subscription: rx.Subscription): Subscription = {
-     subscription match {
-       case x: rx.subscriptions.BooleanSubscription            => new BooleanSubscription(x)
-       case x: rx.subscriptions.CompositeSubscription          => new CompositeSubscription(x)
-       case x: rx.subscriptions.MultipleAssignmentSubscription => new MultipleAssignmentSubscription(x)
-       case x: rx.subscriptions.SerialSubscription             => new SerialSubscription(x)
-       case x: rx.Subscription                                 => Subscription { x.unsubscribe() }
-     }
+    subscription match {
+      case x: rx.subscriptions.BooleanSubscription => new BooleanSubscription(x)
+      case x: rx.subscriptions.CompositeSubscription => new CompositeSubscription(x)
+      case x: rx.subscriptions.MultipleAssignmentSubscription => new MultipleAssignmentSubscription(x)
+      case x: rx.subscriptions.SerialSubscription => new SerialSubscription(x)
+      case x: rx.Subscription => Subscription { x.unsubscribe() }
+    }
   }
 
   /**
    * Creates an [[rx.lang.scala.Subscription]] that invokes the specified action when unsubscribed.
    */
-  def apply(u: => Unit): Subscription  = {
-    new Subscription () {
+  def apply(u: => Unit): Subscription = {
+    new Subscription() {
 
       private val unsubscribed = new AtomicBoolean(false)
       def isUnsubscribed = unsubscribed.get()
@@ -73,7 +68,7 @@ object Subscription {
       }
     }
   }
- }
+
 }
 
 

language-adaptors/rxjava-scala/src/test/scala/rx/lang/scala/subscriptions/SubscriptionTests.scala

@@ -4,6 +4,8 @@ import org.junit.Assert._
 import org.junit.Test
 import org.scalatest.junit.JUnitSuite
 
+import rx.lang.scala.Subscription
+
 class SubscriptionTests extends JUnitSuite {
 
   @Test