From f6ac2b0f0a0183171aa2f6806ec67d8d21692a36 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Thu, 13 Aug 2020 09:59:39 +0200 Subject: Implement `ContentSourceSet` --- .../documentables/DefaultPageCreator.kt | 2 +- .../documentables/PageContentBuilder.kt | 28 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'plugins/base/src/main/kotlin/translators/documentables') diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt index 02f4b54e..04b29990 100644 --- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt +++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt @@ -159,7 +159,7 @@ open class DefaultPageCreator( } }, DCI(setOf(dri), ContentKind.Inheritors), - sourceSets.toSet(), + sourceSets.toContentSourceSets(), style = emptySet(), extra = mainExtra + SimpleAttr.header("Inheritors") ) diff --git a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt index b7927076..a556a96e 100644 --- a/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt +++ b/plugins/base/src/main/kotlin/translators/documentables/PageContentBuilder.kt @@ -73,7 +73,7 @@ open class PageContentBuilder( ) = ContentGroup( contents.toList(), DCI(mainDRI, kind), - sourceSets, + sourceSets.toContentSourceSets(), styles, extra ) @@ -88,10 +88,10 @@ open class PageContentBuilder( private val defaultHeaders get() = listOf( - contentFor(mainDRI, mainSourcesetData){ + contentFor(mainDRI, mainSourcesetData) { text("Name") }, - contentFor(mainDRI, mainSourcesetData){ + contentFor(mainDRI, mainSourcesetData) { text("Summary") } ) @@ -153,7 +153,7 @@ open class PageContentBuilder( defaultHeaders, operation(), DCI(mainDRI, kind), - sourceSets, styles, extra + sourceSets.toContentSourceSets(), styles, extra ) } @@ -188,7 +188,7 @@ open class PageContentBuilder( } }, DCI(mainDRI, kind), - sourceSets, styles, extra + sourceSets.toContentSourceSets(), styles, extra ) } } @@ -234,7 +234,7 @@ open class PageContentBuilder( listOf(createText(text, kind, sourceSets, styles, extra)), address, DCI(mainDRI, kind), - sourceSets + sourceSets.toContentSourceSets() ) fun link( @@ -250,7 +250,7 @@ open class PageContentBuilder( address = address, extra = PropertyContainer.empty(), dci = DCI(mainDRI, kind), - sourceSets = sourceSets, + sourceSets = sourceSets.toContentSourceSets(), style = emptySet() ) } @@ -267,7 +267,7 @@ open class PageContentBuilder( contentFor(mainDRI, sourceSets, kind, styles, extra, block).children, address, DCI(mainDRI, kind), - sourceSets + sourceSets.toContentSourceSets() ) } @@ -283,7 +283,7 @@ open class PageContentBuilder( DCI(mainDRI, kind), sourceSets ) - contents += ContentGroup(content, DCI(mainDRI, kind), sourceSets, styles, extra) + contents += ContentGroup(content, DCI(mainDRI, kind), sourceSets.toContentSourceSets(), styles, extra) } fun group( @@ -331,7 +331,7 @@ open class PageContentBuilder( ) { contents += PlatformHintedContent( buildGroup(dri, sourceSets, kind, styles, extra, block), - sourceSets + sourceSets.toContentSourceSets() ) } @@ -345,7 +345,7 @@ open class PageContentBuilder( ) { contents += PlatformHintedContent( buildGroup(setOf(dri), sourcesetData, kind, styles, extra, block), - sourcesetData + sourcesetData.toContentSourceSets() ) } @@ -356,7 +356,7 @@ open class PageContentBuilder( styles: Set