From ac521e75eadb384e005d73ec5818e01b742cbe19 Mon Sep 17 00:00:00 2001 From: Błażej Kardyś Date: Fri, 29 Nov 2019 03:28:17 +0100 Subject: Parentless page navigation --- core/src/main/kotlin/pages/PageNodes.kt | 50 ++++++++++++++------------------- 1 file changed, 21 insertions(+), 29 deletions(-) (limited to 'core/src/main/kotlin/pages') diff --git a/core/src/main/kotlin/pages/PageNodes.kt b/core/src/main/kotlin/pages/PageNodes.kt index e8b66f4a..f1ad430f 100644 --- a/core/src/main/kotlin/pages/PageNodes.kt +++ b/core/src/main/kotlin/pages/PageNodes.kt @@ -3,11 +3,11 @@ package org.jetbrains.dokka.pages import org.jetbrains.dokka.model.DocumentationNode import org.jetbrains.dokka.Platform import org.jetbrains.dokka.links.DRI +import java.util.* interface PageNode { val name: String val content: ContentNode - val parent: PageNode? val dri: DRI val documentationNode: DocumentationNode? val embeddedResources: List @@ -21,33 +21,13 @@ interface PageNode { ): PageNode } -abstract class BasicPageNode(children: List) : PageNode { - - private lateinit var _parent: PageNode - override val parent: PageNode? by lazy { _parent } - override val children = children - - override fun equals(other: Any?): Boolean = - if (other is PageNode) { - dri == other.dri && name == other.name - } else false - - override fun hashCode(): Int = - (name + dri).hashCode() - - init { - children.forEach { if (it is BasicPageNode) it._parent = this } - } -} - class ModulePageNode( override val name: String, override val content: ContentNode, override val documentationNode: DocumentationNode?, - children: List, + override val children: List, override val embeddedResources: List = listOf() -) : BasicPageNode(children) { - override val parent: Nothing? = null +) : PageNode { override val dri: DRI = DRI.topLevel override fun modified( @@ -66,6 +46,18 @@ class ModulePageNode( fun transformPageNodeTree(operation: (PageNode) -> PageNode) = this.transformNode(operation) as ModulePageNode + + val parentMap: IdentityHashMap by lazy { + IdentityHashMap().apply { + fun addParent(parent: PageNode) { + parent.children.forEach { child -> + put(child, parent) + addParent(child) + } + } + addParent(this@ModulePageNode) + } + } } class PackagePageNode( @@ -73,9 +65,9 @@ class PackagePageNode( override val content: ContentNode, override val dri: DRI, override val documentationNode: DocumentationNode?, - children: List, + override val children: List, override val embeddedResources: List = listOf() -) : BasicPageNode(children) { +) : PageNode { override fun modified( name: String, @@ -92,9 +84,9 @@ class ClassPageNode( override val content: ContentNode, override val dri: DRI, override val documentationNode: DocumentationNode?, - children: List, + override val children: List, override val embeddedResources: List = listOf() -) : BasicPageNode(children) { +) : PageNode { override fun modified( name: String, @@ -111,9 +103,9 @@ class MemberPageNode( override val content: ContentNode, override val dri: DRI, override val documentationNode: DocumentationNode?, - children: List = emptyList(), + override val children: List = emptyList(), override val embeddedResources: List = listOf() -) : BasicPageNode(children) { +) : PageNode { override fun modified( name: String, -- cgit