Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scala cleanup #1035

Merged
merged 2 commits into from
Apr 16, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -345,18 +345,17 @@ trait Observable[+T]
* An [[rx.lang.scala.Observable]] which produces connected non-overlapping buffers, which are emitted
* when the current [[rx.lang.scala.Observable]] created with the function argument produces an object.
*/
def buffer[Closing](closings: () => Observable[_ <: Closing]) : Observable[Seq[T]] = {
val f: Func0[_ <: rx.Observable[_ <: Closing]] = closings().asJavaObservable
val jObs: rx.Observable[_ <: java.util.List[_]] = asJavaObservable.buffer[Closing](f)
def buffer(closings: () => Observable[Any]) : Observable[Seq[T]] = {
val f: Func0[_ <: rx.Observable[_ <: Any]] = closings().asJavaObservable
val jObs: rx.Observable[_ <: java.util.List[_]] = asJavaObservable.buffer[Any](f)
Observable.jObsOfListToScObsOfSeq(jObs.asInstanceOf[rx.Observable[_ <: java.util.List[T]]])
}
/**
* Creates an Observable which produces buffers of collected values.
*
* This Observable produces buffers. Buffers are created when the specified `openings`
* Observable produces an object. Additionally the function argument
* is used to create an Observable which produces [[rx.lang.scala.util.Closing]] objects. When this
* Observable produces such an object, the associated buffer is emitted.
* Observable produces an object. That object is used to construct an Observable to emit buffers, feeding it into `closings` function.
* Buffers are emitted when the created Observable produces an object.
*
* @param openings
* The [[rx.lang.scala.Observable]] which, when it produces an object, will cause
Expand Down Expand Up @@ -566,10 +565,9 @@ trait Observable[+T]
}

/**
* Creates an Observable which produces windows of collected values. This Observable produces windows.
* Chunks are created when the specified `openings` Observable produces an object.
* Additionally the `closings` argument is used to create an Observable which produces [[rx.lang.scala.util.Closing]] objects.
* When this Observable produces such an object, the associated window is emitted.
* Creates an Observable which produces windows of collected values. Chunks are created when the specified `openings`
* Observable produces an object. That object is used to construct an Observable to emit windows, feeding it into `closings` function.
* Windows are emitted when the created Observable produces an object.
*
* @param openings
* The [[rx.lang.scala.Observable]] which when it produces an object, will cause
Expand Down