Remove all usages of @JvmStatic and add @JvmField where appropriate

Author: elizarov

kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/CancellableContinuation.kt

@@ -166,7 +166,7 @@ internal open class CancellableContinuationImpl<in T>(
         get() = delegate.context
 
     protected companion object {
-        @JvmStatic
+        @JvmField
         val DECISION: AtomicIntegerFieldUpdater<CancellableContinuationImpl<*>> =
                 AtomicIntegerFieldUpdater.newUpdater(CancellableContinuationImpl::class.java, "decision")
 

kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Job.kt

@@ -325,7 +325,6 @@ public open class JobSupport(active: Boolean) : AbstractCoroutineContextElement(
     private var parentHandle: DisposableHandle? = null
 
     protected companion object {
-        @JvmStatic
         private val STATE: AtomicReferenceFieldUpdater<JobSupport, Any?> =
             AtomicReferenceFieldUpdater.newUpdater(JobSupport::class.java, Any::class.java, "_state")
 
@@ -708,11 +707,11 @@ public open class JobSupport(active: Boolean) : AbstractCoroutineContextElement(
         }
 
         companion object {
-            @JvmStatic
+            @JvmField
             val ACTIVE: AtomicReferenceFieldUpdater<NodeList, Any?> =
                     AtomicReferenceFieldUpdater.newUpdater(NodeList::class.java, Any::class.java, "_active")
 
-            @JvmStatic
+            @JvmField
             val ACTIVE_STATE = Symbol("ACTIVE_STATE")
         }
 

kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/channels/AbstractChannel.kt

@@ -580,35 +580,30 @@ public abstract class AbstractChannel<E> : Channel<E> {
         private const val DEFAULT_CLOSE_MESSAGE = "Channel was closed"
 
         /** @suppress **This is unstable API and it is subject to change.** */
-        @JvmStatic
+        @JvmField
         val OFFER_SUCCESS: Any = Symbol("OFFER_SUCCESS")
 
         /** @suppress **This is unstable API and it is subject to change.** */
-        @JvmStatic
+        @JvmField
         val OFFER_FAILED: Any = Symbol("OFFER_FAILED")
 
         /** @suppress **This is unstable API and it is subject to change.** */
-        @JvmStatic
+        @JvmField
         val POLL_FAILED: Any = Symbol("POLL_FAILED")
 
         /** @suppress **This is unstable API and it is subject to change.** */
-        @JvmStatic
+        @JvmField
         val ENQUEUE_FAILED: Any = Symbol("ENQUEUE_FAILED")
 
-        @JvmStatic
         private val SELECT_STARTED: Any = Symbol("SELECT_STARTED")
 
-        @JvmStatic
         private val NULL_VALUE: Any = Symbol("NULL_VALUE")
 
-        @JvmStatic
         private val CLOSE_RESUMED: Any = Symbol("CLOSE_RESUMED")
 
-        @JvmStatic
         private val SEND_RESUMED = Symbol("SEND_RESUMED")
 
         /** @suppress **This is unstable API and it is subject to change.** */
-        @JvmStatic
         fun isClosed(result: Any?): Boolean = result is Closed<*>
     }
 

kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/internal/Atomic.kt

@@ -48,11 +48,9 @@ public abstract class AtomicOp : OpDescriptor() {
     private var _consensus: Any? = UNDECIDED
 
     companion object {
-        @JvmStatic
         private val CONSENSUS: AtomicReferenceFieldUpdater<AtomicOp, Any?> =
             AtomicReferenceFieldUpdater.newUpdater(AtomicOp::class.java, Any::class.java, "_consensus")
 
-        @JvmStatic
         private val UNDECIDED: Any = Symbol("UNDECIDED")
     }
 

kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/internal/LockFreeLinkedList.kt

@@ -75,13 +75,13 @@ public open class LockFreeLinkedListNode {
     private var _removedRef: Removed? = null // lazily cached removed ref to this
 
     private companion object {
-        @JvmStatic
+        @JvmField
         val NEXT: AtomicReferenceFieldUpdater<Node, Any> =
                 AtomicReferenceFieldUpdater.newUpdater(Node::class.java, Any::class.java, "_next")
-        @JvmStatic
+        @JvmField
         val PREV: AtomicReferenceFieldUpdater<Node, Any> =
                 AtomicReferenceFieldUpdater.newUpdater(Node::class.java, Any::class.java, "_prev")
-        @JvmStatic
+        @JvmField
         val REMOVED_REF: AtomicReferenceFieldUpdater<Node, Removed?> =
             AtomicReferenceFieldUpdater.newUpdater(Node::class.java, Removed::class.java, "_removedRef")
     }

kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/sync/Mutex.kt

@@ -111,32 +111,32 @@ internal class MutexImpl(locked: Boolean) : Mutex {
     private var _state: Any? = if (locked) EmptyLocked else EmptyUnlocked // shared objects while we have no waiters
 
     private companion object {
-        @JvmStatic
+        @JvmField
         val STATE: AtomicReferenceFieldUpdater<MutexImpl, Any?> =
             AtomicReferenceFieldUpdater.newUpdater(MutexImpl::class.java, Any::class.java, "_state")
 
-        @JvmStatic
+        @JvmField
         val LOCK_FAIL = Symbol("LOCK_FAIL")
 
-        @JvmStatic
+        @JvmField
         val ENQUEUE_FAIL = Symbol("ENQUEUE_FAIL")
 
-        @JvmStatic
+        @JvmField
         val UNLOCK_FAIL = Symbol("UNLOCK_FAIL")
 
-        @JvmStatic
+        @JvmField
         val SELECT_SUCCESS = Symbol("SELECT_SUCCESS")
 
-        @JvmStatic
+        @JvmField
         val LOCKED = Symbol("LOCKED")
 
-        @JvmStatic
+        @JvmField
         val UNLOCKED = Symbol("UNLOCKED")
 
-        @JvmStatic
+        @JvmField
         val EmptyLocked = Empty(LOCKED)
 
-        @JvmStatic
+        @JvmField
         val EmptyUnlocked = Empty(UNLOCKED)
 
     }

reactive/kotlinx-coroutines-reactive/src/main/kotlin/kotlinx/coroutines/experimental/reactive/Channel.kt

@@ -63,7 +63,7 @@ private class SubscriptionChannel<T> : LinkedListChannel<T>(), SubscriptionRecei
     var balance = 0
 
     private companion object {
-        @JvmStatic
+        @JvmField
         val BALANCE: AtomicIntegerFieldUpdater<SubscriptionChannel<*>> =
             AtomicIntegerFieldUpdater.newUpdater(SubscriptionChannel::class.java, "balance")
     }

reactive/kotlinx-coroutines-reactive/src/main/kotlin/kotlinx/coroutines/experimental/reactive/Publish.kt

@@ -70,7 +70,6 @@ private class PublisherCoroutine<T>(
     private var nRequested: Long = 0 // < 0 when closed (CLOSED or SIGNALLED)
 
     companion object {
-        @JvmStatic
         private val N_REQUESTED = AtomicLongFieldUpdater
                 .newUpdater(PublisherCoroutine::class.java, "nRequested")
 

reactive/kotlinx-coroutines-rx1/src/main/kotlin/kotlinx/coroutines/experimental/rx1/RxChannel.kt

@@ -68,7 +68,7 @@ private class SubscriptionChannel<T> : LinkedListChannel<T>(), SubscriptionRecei
     var balance = 0 // request balance from cancelled receivers
 
     private companion object {
-        @JvmStatic
+        @JvmField
         val BALANCE: AtomicIntegerFieldUpdater<SubscriptionChannel<*>> =
             AtomicIntegerFieldUpdater.newUpdater(SubscriptionChannel::class.java, "balance")
     }

reactive/kotlinx-coroutines-rx1/src/main/kotlin/kotlinx/coroutines/experimental/rx1/RxObservable.kt

@@ -16,10 +16,13 @@
 
 package kotlinx.coroutines.experimental.rx1
 
-import kotlinx.coroutines.experimental.*
+import kotlinx.coroutines.experimental.AbstractCoroutine
+import kotlinx.coroutines.experimental.Job
 import kotlinx.coroutines.experimental.channels.ClosedSendChannelException
 import kotlinx.coroutines.experimental.channels.ProducerScope
 import kotlinx.coroutines.experimental.channels.SendChannel
+import kotlinx.coroutines.experimental.handleCoroutineException
+import kotlinx.coroutines.experimental.newCoroutineContext
 import kotlinx.coroutines.experimental.selects.SelectInstance
 import kotlinx.coroutines.experimental.sync.Mutex
 import rx.Observable
@@ -69,7 +72,6 @@ private class RxObservableCoroutine<T>(
     private var nRequested: Long = 0 // < 0 when closed (CLOSED or SIGNALLED)
 
     companion object {
-        @JvmStatic
         private val N_REQUESTED = AtomicLongFieldUpdater
                 .newUpdater(RxObservableCoroutine::class.java, "nRequested")