Merge pull request #27 from pardom/composite-dispatcher-cleanup

Normalize naming. Don't enforce single dispatcher. Formatting.
pardom-zz · May 2, 2016 · 5e4d5dc · 5e4d5dc
2 parents 9fd4291 + ed98b2e
commit 5e4d5dc
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/android/src/main/kotlin/clean/news/flow/CompositeDispatcher.kt b/android/src/main/kotlin/clean/news/flow/CompositeDispatcher.kt
@@ -7,10 +7,10 @@ import flow.TraversalCallback
 import kotlin.reflect.KClass
 
 class CompositeDispatcher : KeyChanger() {
-	private val dispatchers = mutableMapOf<KClass<*>, KeyChanger>()
+	private val dispatchers = mutableMapOf<KClass<out Any>, KeyChanger>()
 
-	fun addDispatcher(clz: KClass<*>, dispatcher: KeyChanger) {
-		dispatchers.put(clz, dispatcher)
+	fun addDispatcher(cls: KClass<out Any>, dispatcher: KeyChanger) {
+		dispatchers.put(cls, dispatcher)
 	}
 
 	override fun changeKey(
@@ -20,17 +20,11 @@ class CompositeDispatcher : KeyChanger() {
 			incomingContexts: MutableMap<Any, Context>,
 			callback: TraversalCallback) {
 
-		val destination: Any = incomingState.getKey()
+		val destination = incomingState.getKey<Any>()
 
 		for ((cls, dispatcher) in dispatchers) {
 			if (cls.java.isAssignableFrom(destination.javaClass)) {
-				dispatcher.changeKey(
-						outgoingState,
-						incomingState,
-						direction,
-						incomingContexts,
-						callback)
-				return
+				dispatcher.changeKey(outgoingState, incomingState, direction, incomingContexts, callback)
 			}
 		}
 	}