Skip to content

Commit 32f3fd7

Browse files
private vars in Scala do not start with underscore
1 parent 15bae11 commit 32f3fd7

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

language-adaptors/rxjava-scala/src/main/scala/rx/lang/scala/subscriptions/SerialSubscription.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ object SerialSubscription {
2929
class SerialSubscription private[scala] (val asJavaSubscription: rx.subscriptions.SerialSubscription)
3030
extends Subscription {
3131

32-
private val _isUnsubscribed = new AtomicBoolean(false)
32+
private val unsubscribed = new AtomicBoolean(false)
3333

3434
/**
3535
* Checks whether the subscription has been unsubscribed.
3636
*/
37-
def isUnsubscribed: Boolean = _isUnsubscribed.get()
37+
def isUnsubscribed: Boolean = unsubscribed.get()
3838

3939
/**
4040
* Unsubscribes this subscription, setting isUnsubscribed to true.
4141
*/
42-
override def unsubscribe(): Unit = { super.unsubscribe(); _isUnsubscribed.set(true) }
42+
override def unsubscribe(): Unit = { super.unsubscribe(); unsubscribed.set(true) }
4343

4444
def subscription_=(value: Subscription): Unit = asJavaSubscription.setSubscription(value.asJavaSubscription)
4545
def subscription: Subscription = Subscription(asJavaSubscription.getSubscription)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ object Subscription {
6565
def apply(u: => Unit): Subscription = {
6666
new Subscription () {
6767

68-
private val _isUnsubscribed = new AtomicBoolean(false)
69-
def isUnsubscribed = _isUnsubscribed.get()
68+
private val unsubscribed = new AtomicBoolean(false)
69+
def isUnsubscribed = unsubscribed.get()
7070

7171
val asJavaSubscription = new rx.Subscription {
72-
def unsubscribe() { u; _isUnsubscribed.set(true) }
72+
def unsubscribe() { u; unsubscribed.set(true) }
7373
}
7474
}
7575
}

0 commit comments

Comments
 (0)