Unsorted replacements "jet" -> "kotlin"

#KT-2896 Fixed
This commit is contained in:
Alexander Udalov
2014-02-19 21:34:06 +04:00
parent ac71911720
commit 6b0fce8cd5
22 changed files with 185 additions and 190 deletions
@@ -760,7 +760,7 @@ class TemplateLinkRenderer(val annotated: KAnnotated, val template: KDocTemplate
// TODO really dirty hack alert!!!
// until the resolver is working, lets try adding a few prefixes :)
for (prefix in arrayList("java.lang", "java.util", "java.util.concurrent", "java.util.regex", "java.io",
"jet", "java.awt", "java.awt.event", "java.sql", "java.beans",
"java.awt", "java.awt.event", "java.sql", "java.beans",
"javax.swing", "javax.swing.event",
"org.w3c.dom",
"kotlin.template")) {
@@ -134,7 +134,7 @@ abstract class KDocTemplate() : TextTemplate() {
return if (c != null) {
val prefix = if (c.isAnnotation()) "@" else ""
val cname = c.name
if ((cname.startsWith("jet.Function") || cname.startsWith("jet.ExtensionFunction")) && arguments.isNotEmpty()) {
if ((cname.startsWith("kotlin.Function") || cname.startsWith("kotlin.ExtensionFunction")) && arguments.isNotEmpty()) {
val rt = arguments.last()
// TODO use drop()
val rest = arguments.subList(0, arguments.size - 1).orEmpty()
@@ -42,7 +42,6 @@ class KDocTest {
val ignorePackages = config.ignorePackages
ignorePackages.add("org.jetbrains.kotlin")
ignorePackages.add("java")
ignorePackages.add("jet")
ignorePackages.add("junit")
ignorePackages.add("sun")
ignorePackages.add("org")