From 382f7df5b47b7b4fd5c9930b26a2e0ededdb17be Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 31 Mar 2016 16:31:07 +0200 Subject: Don't use @Inject on constructors with default parameter values. Resolves #49 --- core/src/main/kotlin/Formats/JekyllFormatService.kt | 10 ++++++---- core/src/main/kotlin/Formats/MarkdownFormatService.kt | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'core/src') diff --git a/core/src/main/kotlin/Formats/JekyllFormatService.kt b/core/src/main/kotlin/Formats/JekyllFormatService.kt index f81257d6..9271e3a9 100644 --- a/core/src/main/kotlin/Formats/JekyllFormatService.kt +++ b/core/src/main/kotlin/Formats/JekyllFormatService.kt @@ -2,12 +2,14 @@ package org.jetbrains.dokka import com.google.inject.Inject -open class JekyllFormatService - @Inject constructor(locationService: LocationService, - signatureGenerator: LanguageService, - linkExtension: String = "md") +open class JekyllFormatService(locationService: LocationService, + signatureGenerator: LanguageService, + linkExtension: String) : MarkdownFormatService(locationService, signatureGenerator, linkExtension) { + @Inject constructor(locationService: LocationService, + signatureGenerator: LanguageService): this(locationService, signatureGenerator, "md") + override fun appendNodes(location: Location, to: StringBuilder, nodes: Iterable) { to.appendln("---") appendFrontMatter(nodes, to) diff --git a/core/src/main/kotlin/Formats/MarkdownFormatService.kt b/core/src/main/kotlin/Formats/MarkdownFormatService.kt index 7a93801e..4f5b9751 100644 --- a/core/src/main/kotlin/Formats/MarkdownFormatService.kt +++ b/core/src/main/kotlin/Formats/MarkdownFormatService.kt @@ -3,11 +3,13 @@ package org.jetbrains.dokka import com.google.inject.Inject -open class MarkdownFormatService - @Inject constructor(locationService: LocationService, - signatureGenerator: LanguageService, - linkExtension: String = "md") +open class MarkdownFormatService(locationService: LocationService, + signatureGenerator: LanguageService, + linkExtension: String) : StructuredFormatService(locationService, signatureGenerator, "md", linkExtension) { + @Inject constructor(locationService: LocationService, + signatureGenerator: LanguageService): this(locationService, signatureGenerator, "md") + override fun formatBreadcrumbs(items: Iterable): String { return items.map { formatLink(it) }.joinToString(" / ") } -- cgit