Skip to content

Commit a26b21d

Browse files
committed
Fix issue #1196 and some docs issues
1 parent 9b9e5d0 commit a26b21d

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ trait Scheduler {
3535
*
3636
* @return the scheduler's available degree of parallelism.
3737
*/
38-
def degreeOfParallelism: Int = asJavaScheduler.degreeOfParallelism
38+
def parallelism: Int = asJavaScheduler.parallelism()
3939

4040
/**
4141
* @return the scheduler's notion of current absolute time in milliseconds.

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/schedulers/ComputationScheduler.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import rx.lang.scala.Scheduler
55

66
object ComputationScheduler {
77
/**
8-
* {@link Scheduler} intended for computational work.
8+
* [[rx.lang.scala.Scheduler]] intended for computational work.
99
* <p>
1010
* This can be used for event-loops, processing callbacks and other computational work.
1111
* <p>
12-
* Do not perform IO-bound work on this scheduler. Use {@link IOScheduler()} instead.
12+
* Do not perform IO-bound work on this scheduler. Use [[rx.lang.scala.schedulers.IOScheduler]] instead.
1313
*
14-
* @return { @link Scheduler} for computation-bound work.
14+
* @return [[rx.lang.scala.Scheduler]] for computation-bound work.
1515
*/
1616
def apply(): ComputationScheduler = {
1717
new ComputationScheduler(rx.schedulers.Schedulers.computation())

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/schedulers/IOScheduler.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ import rx.lang.scala.Scheduler
1919

2020
object IOScheduler {
2121
/**
22-
* {@link Scheduler} intended for IO-bound work.
22+
* [[rx.lang.scala.Scheduler]] intended for IO-bound work.
2323
* <p>
24-
* The implementation is backed by an {@link Executor} thread-pool that will grow as needed.
24+
* The implementation is backed by an `Executor` thread-pool that will grow as needed.
2525
* <p>
2626
* This can be used for asynchronously performing blocking IO.
2727
* <p>
28-
* Do not perform computational work on this scheduler. Use {@link ComputationScheduler()} instead.
28+
* Do not perform computational work on this scheduler. Use [[rx.lang.scala.schedulers.ComputationScheduler]] instead.
2929
*
30-
* @return { @link ExecutorScheduler} for IO-bound work.
30+
* @return [[rx.lang.scala.Scheduler]] for IO-bound work
3131
*/
3232
def apply(): IOScheduler = {
3333
new IOScheduler(rx.schedulers.Schedulers.io)

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/schedulers/NewThreadScheduler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import rx.lang.scala.Scheduler
2020
object NewThreadScheduler {
2121

2222
/**
23-
* Returns a [[rx.lang.scala.Scheduler]] that creates a new {@link Thread} for each unit of work.
23+
* Returns a [[rx.lang.scala.Scheduler]] that creates a new `java.lang.Thread` for each unit of work.
2424
*/
2525
def apply(): NewThreadScheduler = {
2626
new NewThreadScheduler(rx.schedulers.Schedulers.newThread())

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/schedulers/TrampolineScheduler.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import rx.lang.scala.Scheduler
44

55
object TrampolineScheduler {
66
/**
7-
* {@link Scheduler} that queues work on the current thread to be executed after the current work completes.
7+
* [[rx.lang.scala.Scheduler]] that queues work on the current thread to be executed after the current work completes.
88
*/
99
def apply(): TrampolineScheduler = {
1010
new TrampolineScheduler(rx.schedulers.Schedulers.trampoline())

0 commit comments

Comments
 (0)