From 1cefaa46345cd13a36e12060118b1ab5f2936502 Mon Sep 17 00:00:00 2001
From: Andrzej Ratajczak <andrzej.ratajczak98@gmail.com>
Date: Thu, 27 Aug 2020 10:23:08 +0200
Subject: Apply requested changes

---
 .../src/main/kotlin/converters/KotlinToJavaConverter.kt               | 4 ++--
 .../src/main/kotlin/signatures/JavaSignatureProvider.kt               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/kotlin-as-java/src')

diff --git a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
index f169f89a..3fd9cf18 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -172,7 +172,7 @@ internal fun DClass.asJava(): DClass = copy(
 )
 
 private fun DTypeParameter.asJava(): DTypeParameter = copy(
-    variantTypeParameter = variantTypeParameter.withNewDri(dri.possiblyAsJava()),
+    variantTypeParameter = variantTypeParameter.withDri(dri.possiblyAsJava()),
     bounds = bounds.map { it.asJava() }
 )
 
@@ -296,4 +296,4 @@ private fun AdditionalModifiers.squash(second: AdditionalModifiers) =
     AdditionalModifiers(content + second.content)
 
 internal fun ClassId.classNames(): String =
-    shortClassName.identifier + (outerClassId?.classNames()?.let { ".$it" } ?: "")
\ No newline at end of file
+    shortClassName.identifier + (outerClassId?.classNames()?.let { ".$it" } ?: "")
diff --git a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
index d9b9dc5b..121c4def 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/signatures/JavaSignatureProvider.kt
@@ -141,7 +141,7 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
     private fun signature(t: DTypeParameter) =
         t.sourceSets.map {
             contentBuilder.contentFor(t, styles = t.stylesIfDeprecated(it), sourceSets = setOf(it)) {
-                text(t.name.substringAfterLast(".")) // Investigate if java classes can be somehow variant
+                text(t.name.substringAfterLast("."))
                 list(t.bounds, prefix = " extends ") {
                     signatureForProjection(it)
                 }
@@ -173,4 +173,4 @@ class JavaSignatureProvider(ctcc: CommentsToContentConverter, logger: DokkaLogge
         is PrimitiveJavaType -> text(p.name)
         is UnresolvedBound -> text(p.name)
     }
-}
\ No newline at end of file
+}
-- 
cgit