aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/kotlin/Utilities
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2016-01-04 19:39:39 +0100
committerDmitry Jemerov <yole@jetbrains.com>2016-01-04 19:39:39 +0100
commit3b3c2841674d9b7044494d16d4396662d273f1f9 (patch)
tree268f6d3085b05da702d5d61eff505000cd9ea36a /core/src/main/kotlin/Utilities
parent0260b37dd051fc5d728820fa20b0ad7d94c33c0f (diff)
downloaddokka-3b3c2841674d9b7044494d16d4396662d273f1f9.tar.gz
dokka-3b3c2841674d9b7044494d16d4396662d273f1f9.tar.bz2
dokka-3b3c2841674d9b7044494d16d4396662d273f1f9.zip
cleanup: remove redundant 'public' modifiers
Diffstat (limited to 'core/src/main/kotlin/Utilities')
-rw-r--r--core/src/main/kotlin/Utilities/Html.kt2
-rw-r--r--core/src/main/kotlin/Utilities/ServiceLocator.kt6
2 files changed, 4 insertions, 4 deletions
diff --git a/core/src/main/kotlin/Utilities/Html.kt b/core/src/main/kotlin/Utilities/Html.kt
index ce3a1982..a5a93d9e 100644
--- a/core/src/main/kotlin/Utilities/Html.kt
+++ b/core/src/main/kotlin/Utilities/Html.kt
@@ -5,4 +5,4 @@ package org.jetbrains.dokka
* Replaces symbols reserved in HTML with their respective entities.
* Replaces & with &amp;, < with &lt; and > with &gt;
*/
-public fun String.htmlEscape(): String = replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
+fun String.htmlEscape(): String = replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
diff --git a/core/src/main/kotlin/Utilities/ServiceLocator.kt b/core/src/main/kotlin/Utilities/ServiceLocator.kt
index 7a5aff79..6c29d1cd 100644
--- a/core/src/main/kotlin/Utilities/ServiceLocator.kt
+++ b/core/src/main/kotlin/Utilities/ServiceLocator.kt
@@ -9,8 +9,8 @@ data class ServiceDescriptor(val name: String, val category: String, val descrip
class ServiceLookupException(message: String) : Exception(message)
-public object ServiceLocator {
- public fun <T : Any> lookup(clazz: Class<T>, category: String, implementationName: String): T {
+object ServiceLocator {
+ fun <T : Any> lookup(clazz: Class<T>, category: String, implementationName: String): T {
val descriptor = lookupDescriptor(category, implementationName)
val loadedClass = javaClass.classLoader.loadClass(descriptor.className)
val constructor = loadedClass.constructors
@@ -66,7 +66,7 @@ public object ServiceLocator {
}
}
-public inline fun <reified T : Any> ServiceLocator.lookup(category: String, implementationName: String): T = lookup(T::class.java, category, implementationName)
+inline fun <reified T : Any> ServiceLocator.lookup(category: String, implementationName: String): T = lookup(T::class.java, category, implementationName)
private val ZipEntry.fileName: String
get() = name.substringAfterLast("/", name)