aboutsummaryrefslogtreecommitdiff
path: root/src/Model
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-11-04 13:56:13 +0100
committerDmitry Jemerov <yole@jetbrains.com>2015-11-04 13:56:13 +0100
commit21dcc4a472f88dd3ce1a1e7d8406905552896d3c (patch)
tree90dcf22298be4741cb05d38a579cb41256d94db4 /src/Model
parentfb25c1eaf41ae314d19d6cda55446a2ab6b63715 (diff)
downloaddokka-21dcc4a472f88dd3ce1a1e7d8406905552896d3c.tar.gz
dokka-21dcc4a472f88dd3ce1a1e7d8406905552896d3c.tar.bz2
dokka-21dcc4a472f88dd3ce1a1e7d8406905552896d3c.zip
extract JavadocParser to a separate file; extract DeclarationLinkResolver out of DocumentationBuilder
Diffstat (limited to 'src/Model')
-rw-r--r--src/Model/PackageDocs.kt6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Model/PackageDocs.kt b/src/Model/PackageDocs.kt
index 99da327b..a1cfddf9 100644
--- a/src/Model/PackageDocs.kt
+++ b/src/Model/PackageDocs.kt
@@ -5,7 +5,7 @@ import org.intellij.markdown.MarkdownTokenTypes
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import java.io.File
-public class PackageDocs(val documentationBuilder: DocumentationBuilder?,
+public class PackageDocs(val linkResolver: DeclarationLinkResolver?,
val linkResolveContext: DeclarationDescriptor?,
val logger: DokkaLogger) {
public val moduleContent: MutableContent = MutableContent()
@@ -48,8 +48,8 @@ public class PackageDocs(val documentationBuilder: DocumentationBuilder?,
_packageContent.getOrPut(packageName) { -> MutableContent() }
private fun resolveContentLink(href: String): ContentBlock {
- if (linkResolveContext != null && documentationBuilder != null) {
- return documentationBuilder.resolveContentLink(linkResolveContext, href)
+ if (linkResolveContext != null && linkResolver != null) {
+ return linkResolver.resolveContentLink(linkResolveContext, href)
}
return ContentExternalLink("#")
}