Trivial code movements

Author: AppliedDuality

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

@@ -59,16 +59,17 @@ trait Observer[-T] {
 
 object Observer {
   /**
-   * Assume that the underlying rx.Observer does not need to be wrapped
+   * Assume that the underlying rx.Observer does not need to be wrapped.
    */
   private [scala] def apply[T](observer: rx.Observer[T]) : Observer[T] = {
-     new Observer[T]() {
+     new Observer[T] {
 
        override def asJavaObserver = observer
 
-       def onCompleted(): Unit = asJavaObserver.onCompleted()
-       def onError(error: Throwable): Unit = asJavaObserver.onError(error)
        def onNext(value: T): Unit = asJavaObserver.onNext(value)
+       def onError(error: Throwable): Unit = asJavaObserver.onError(error)
+       def onCompleted(): Unit = asJavaObserver.onCompleted()
+
      }
    }
 }

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

@@ -27,14 +27,14 @@ trait Subject[-T, +R] extends Observable[R] with Observer[T] {
 
   // temporary hack to workaround bugs in rx Subjects
   override def asJavaObserver: rx.Observer[_ >: T] = new ObserverBase[T] {
+    protected def onNextCore(value: T) = asJavaSubject.onNext(value)
     protected def onErrorCore(error: Throwable) =  asJavaSubject.onError(error)
     protected def onCompletedCore() = asJavaSubject.onCompleted()
-    protected def onNextCore(value: T) = asJavaSubject.onNext(value)
   }
 
-  def onCompleted(): Unit = asJavaObserver.onCompleted()
-  def onError(error: Throwable): Unit = asJavaObserver.onError(error)
   def onNext(value: T): Unit = asJavaObserver.onNext(value)
+  def onError(error: Throwable): Unit = asJavaObserver.onError(error)
+  def onCompleted(): Unit = asJavaObserver.onCompleted()
 
 }