diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-10-30 12:24:33 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-10-30 12:24:33 +0100 |
| commit | f60beb6e45720ff44ba4e4db915f5e462fb3b907 (patch) | |
| tree | d19fcbb67842486cd111f26e9527027e94ac896f /src/Utilities/ServiceLocator.kt | |
| parent | af5cd353271120a6ef9853a3913d5e828747178e (diff) | |
| download | dokka-f60beb6e45720ff44ba4e4db915f5e462fb3b907.tar.gz dokka-f60beb6e45720ff44ba4e4db915f5e462fb3b907.tar.bz2 dokka-f60beb6e45720ff44ba4e4db915f5e462fb3b907.zip | |
fix Kotlin warnings
Diffstat (limited to 'src/Utilities/ServiceLocator.kt')
| -rw-r--r-- | src/Utilities/ServiceLocator.kt | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/Utilities/ServiceLocator.kt b/src/Utilities/ServiceLocator.kt index bc04238f..57d2f47b 100644 --- a/src/Utilities/ServiceLocator.kt +++ b/src/Utilities/ServiceLocator.kt @@ -15,8 +15,8 @@ public object ServiceLocator { val descriptor = lookupDescriptor(category, implementationName) val loadedClass = javaClass.classLoader.loadClass(descriptor.className) val constructor = loadedClass.constructors - .filter { it.parameterTypes.isEmpty() || (it.parameterTypes.size() == 1 && conf.javaClass.isInstance(it.parameterTypes[0])) } - .sortedByDescending { it.parameterTypes.size() } + .filter { it.parameterTypes.isEmpty() || (it.parameterTypes.size == 1 && conf.javaClass.isInstance(it.parameterTypes[0])) } + .sortedByDescending { it.parameterTypes.size } .firstOrNull() ?: throw ServiceLookupException("Class ${descriptor.className} has no corresponding constructor") val implementationRawType: Any = if (constructor.parameterTypes.isEmpty()) constructor.newInstance() else constructor.newInstance(constructor) @@ -81,20 +81,14 @@ public object ServiceLocator { } ?: emptyList() } -public inline fun <reified T : Any> ServiceLocator.lookup(category: String, implementationName: String, conf: DokkaGenerator): T = lookup(javaClass<T>(), category, implementationName, conf) -public inline fun <reified T : Any> ServiceLocator.lookupClass(category: String, implementationName: String): Class<T> = lookupClass(javaClass<T>(), category, implementationName) +public inline fun <reified T : Any> ServiceLocator.lookup(category: String, implementationName: String, conf: DokkaGenerator): T = lookup(T::class.java, category, implementationName, conf) +public inline fun <reified T : Any> ServiceLocator.lookupClass(category: String, implementationName: String): Class<T> = lookupClass(T::class.java, category, implementationName) public inline fun <reified T : Any> ServiceLocator.lookupOrNull(category: String, implementationName: String, conf: DokkaGenerator): T? = try { - lookup(javaClass<T>(), category, implementationName, conf) + lookup(T::class.java, category, implementationName, conf) } catch (any: Throwable) { null } -fun main(args: Array<String>) { - ServiceLocator.allServices("format").forEach { - println(it) - } -} - private val ZipEntry.fileName: String get() = name.substringAfterLast("/", name) |