From 8c534f14296a92fedc3410fb48de51836cb92859 Mon Sep 17 00:00:00 2001 From: Szymon Świstun Date: Wed, 5 Feb 2020 12:07:21 +0100 Subject: merger for functions --- core/src/main/kotlin/pages/PageNodes.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 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 6b67a734..244d951e 100644 --- a/core/src/main/kotlin/pages/PageNodes.kt +++ b/core/src/main/kotlin/pages/PageNodes.kt @@ -24,6 +24,7 @@ interface ContentPage: PageNode { fun modified( name: String = this.name, content: ContentNode = this.content, + dri: Set = this.dri, embeddedResources: List = this.embeddedResources, children: List = this.children ): ContentPage @@ -63,7 +64,6 @@ abstract class RootPageNode: PageNode { class ModulePageNode( override val name: String, override val content: ContentNode, - override val documentable: Documentable?, override val children: List, override val embeddedResources: List = listOf() @@ -71,11 +71,12 @@ class ModulePageNode( override val dri: Set = setOf(DRI.topLevel) override fun modified(name: String, children: List): ModulePageNode = - modified(name = name, content = this.content, children = children) + modified(name = name, content = this.content, dri = dri, children = children) override fun modified( name: String, content: ContentNode, + dri: Set, embeddedResources: List, children: List ): ModulePageNode = @@ -98,6 +99,7 @@ class PackagePageNode( override fun modified( name: String, content: ContentNode, + dri: Set, embeddedResources: List, children: List ): PackagePageNode = @@ -119,6 +121,7 @@ class ClasslikePageNode( override fun modified( name: String, content: ContentNode, + dri: Set, embeddedResources: List, children: List ): ClasslikePageNode = @@ -135,11 +138,12 @@ class MemberPageNode( override val embeddedResources: List = listOf() ) : ContentPage { override fun modified(name: String, children: List): MemberPageNode = - modified(name = name, content = this.content, children = children) + modified(name = name, content = this.content, children = children) as MemberPageNode override fun modified( name: String, content: ContentNode, + dri: Set, embeddedResources: List, children: List ): MemberPageNode = -- cgit