Skip to content

Commit 6a4189a

Browse files
committed
~: squash me
1 parent d53db42 commit 6a4189a

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

common/kotlinx-coroutines-core-common/src/internal/MainDispatcherFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import kotlinx.coroutines.experimental.*
88

99
@InternalCoroutinesApi // Emulating DI for Kotlin object's
1010
public interface MainDispatcherFactory {
11-
val loadPriority: Int get() = 0 // higher priority wins
11+
val loadPriority: Int // higher priority wins
1212

1313
fun createDispatcher(): MainCoroutineDispatcher
1414
}

ui/kotlinx-coroutines-android/src/HandlerDispatcher.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package kotlinx.coroutines.experimental.android
88

99
import android.os.*
10-
import android.support.annotation.VisibleForTesting
10+
import android.support.annotation.*
1111
import android.view.*
1212
import kotlinx.coroutines.experimental.*
1313
import kotlinx.coroutines.experimental.internal.MainDispatcherFactory
@@ -38,8 +38,12 @@ public sealed class HandlerDispatcher : MainCoroutineDispatcher(), Delay {
3838
public abstract override val immediate: HandlerDispatcher
3939
}
4040

41+
@Keep
4142
internal class AndroidDispatcherFactory : MainDispatcherFactory {
4243
override fun createDispatcher(): MainCoroutineDispatcher = Main
44+
45+
override val loadPriority: Int
46+
get() = Int.MAX_VALUE
4347
}
4448

4549
/**

ui/kotlinx-coroutines-swing/src/SwingDispatcher.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,17 @@ public sealed class SwingDispatcher : MainCoroutineDispatcher(), Delay {
5353
}
5454

5555
internal class SwingDispatcherFactory : MainDispatcherFactory {
56+
override val loadPriority: Int
57+
get() = 0
58+
5659
override fun createDispatcher(): MainCoroutineDispatcher = Swing
5760
}
5861

5962
private object ImmediateSwingDispatcher : SwingDispatcher() {
6063
override val immediate: MainCoroutineDispatcher
6164
get() = this
6265

63-
override fun isDispatchNeeded(context: CoroutineContext): Boolean = !Platform.isFxApplicationThread()
66+
override fun isDispatchNeeded(context: CoroutineContext): Boolean = !SwingUtilities.isEventDispatchThread()
6467

6568
override fun toString() = "Swing [immediate]"
6669
}

0 commit comments

Comments
 (0)