Reorg Scala Structure

- make Eclipse and Java/Scala interop happy

Author: benjchristensen

language-adaptors/rxjava-scala/src/examples/java/rx/lang/scala/examples/MovieLibUsage.java

@@ -1,12 +1,12 @@
 /**
  * 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
- *
+ * 
+ * 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.
@@ -18,7 +18,7 @@
 import rx.Observable;
 import rx.lang.scala.examples.Movie;
 import rx.lang.scala.examples.MovieLib;
-
+import rx.util.functions.Action1;
 import static rx.lang.scala.ImplicitFunctionConversions.toScalaObservable;
 
 public class MovieLibUsage {
@@ -29,13 +29,17 @@ public static void main(String[] args) {
                 new Movie(3000),
                 new Movie(1000),
                 new Movie(2000)
-        );
+                );
 
         MovieLib lib = new MovieLib(toScalaObservable(movies));
 
-        lib.longMovies().asJavaObservable().subscribe(m ->
-                System.out.println("A movie of length " + m.lengthInSeconds() + "s")
-        );
+        lib.longMovies().asJavaObservable().subscribe(new Action1<Movie>() {
+
+            @Override
+            public void call(Movie m) {
+                System.out.println("A movie of length " + m.lengthInSeconds() + "s");
+            }
+        });
     }
 
 }

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

@@ -21,6 +21,10 @@ 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/examples/scala/Olympics.scala renamed to language-adaptors/rxjava-scala/src/examples/scala/rx/lang/scala/examples/Olympics.scala

@@ -19,6 +19,10 @@ package rx.lang.scala
 
 import rx.util.functions.FuncN
 import rx.Observable.OnSubscribeFunc
+import rx.lang.scala.Notification
+import rx.lang.scala.ImplicitFunctionConversions
+import rx.lang.scala.Observer
+import rx.lang.scala.Scheduler
 
 
 /**

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

@@ -2,14 +2,14 @@ package rx.lang.scala
 
 import java.util.Date
 import scala.concurrent.duration.Duration
-import scala.language.postfixOps
 import ImplicitFunctionConversions.scalaFunction0ProducingUnitToAction0
 import ImplicitFunctionConversions.schedulerActionToFunc2
 import rx.util.functions.{Action0, Action1, Func2}
 import rx.lang.scala.subscriptions.Subscription
 
 /**
- * Represents an object that schedules units of work.
+ * Represents an object thatimport rx.lang.scala.ImplicitFunctionConversions
+ schedules units of work.
  */
 trait Scheduler {
   def asJavaScheduler: rx.Scheduler

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

@@ -1,5 +1,10 @@
 package rx.lang.scala
 
+import rx.lang.scala.ImplicitFunctionConversions
+
+import ImplicitFunctionConversions.scalaBooleanFunction1ToRxBooleanFunc1
+import ImplicitFunctionConversions.scalaFunction1ToRxFunc1
+
 // 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."

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

@@ -1,5 +1,7 @@
 package rx.lang.scala
 
+import rx.lang.scala.Observer
+
 /**
 * A Subject is an Observable and an Observer at the same time.
 */

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

@@ -1,5 +1,6 @@
 package rx.lang
 
+import rx.lang.scala.Scheduler
 package object scala {
 
   /**

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

@@ -16,13 +16,16 @@
 package rx.lang.scala.examples
 
 import org.scalatest.junit.JUnitSuite
-import scala.language.postfixOps
 import rx.lang.scala._
 import scala.concurrent.duration._
-import org.junit.{Before, Test, Ignore}
+import org.junit.Test
 import org.junit.Assert._
 import rx.lang.scala.concurrency.Schedulers
 import java.io.IOException
+import rx.lang.scala.examples.Olympics
+import rx.lang.scala.Notification.OnCompleted
+import rx.lang.scala.Notification.OnError
+import rx.lang.scala.Notification.OnNext
 
 //@Ignore // Since this doesn't do automatic testing, don't increase build time unnecessarily
 class RxScalaDemo extends JUnitSuite {

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

@@ -1,3 +1,5 @@
+package rx.lang.scala.examples
+
 import org.junit.{Assert, Test}
 import org.scalatest.junit.JUnitSuite
 import rx.lang.scala.subscriptions.{MultipleAssignmentSubscription, CompositeSubscription, BooleanSubscription, Subscription}

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

@@ -1,7 +1,8 @@
+package rx.lang.scala.examples
+
 import org.junit.{Ignore, Assert, Test}
 import org.scalatest.junit.JUnitSuite
 import rx.lang.scala.Observable
-import scala.Predef.String
 
 class UnitTestSuite extends JUnitSuite {