From fc875fe5f8bc52ac75053db097b3349465705732 Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Wed, 4 Mar 2020 17:04:50 +0100
Subject: Refactor Modifiers

---
 .../kotlin/converters/KotlinToJavaConverter.kt     | 30 +++++++---------------
 1 file changed, 9 insertions(+), 21 deletions(-)

(limited to 'plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt')

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 a8b45db0..7c66e91f 100644
--- a/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
+++ b/plugins/kotlin-as-java/src/main/kotlin/converters/KotlinToJavaConverter.kt
@@ -42,7 +42,7 @@ internal fun Package.asJava(): Package {
                 generics = emptyList(),
                 supertypes = PlatformDependent.empty(),
                 documentation = PlatformDependent.empty(),
-                modifier = WithAbstraction.Modifier.Final,
+                modifier = JavaModifier.Final,
                 platformData = platformData,
                 extra = PropertyContainer.empty()
             )
@@ -64,9 +64,9 @@ internal fun Property.asJava(isTopLevel: Boolean = false, relocateToClass: Strin
             dri.withClass(relocateToClass)
         },
         modifier = if (setter == null) {
-            WithAbstraction.Modifier.Final
+            JavaModifier.Final
         } else {
-            WithAbstraction.Modifier.Empty
+            JavaModifier.Empty
         },
         visibility = visibility.copy(
             map = visibility.mapValues { JavaVisibility.Private }
@@ -87,9 +87,9 @@ internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass
             },
             name = "get" + name.capitalize(),
             modifier = if (setter == null) {
-                WithAbstraction.Modifier.Final
+                JavaModifier.Final
             } else {
-                WithAbstraction.Modifier.Empty
+                JavaModifier.Empty
             },
             visibility = visibility.copy(
                 map = visibility.mapValues { JavaVisibility.Public }
@@ -105,9 +105,9 @@ internal fun Property.javaAccessors(isTopLevel: Boolean = false, relocateToClass
             },
             name = "set" + name.capitalize(),
             modifier = if (setter == null) {
-                WithAbstraction.Modifier.Final
+                JavaModifier.Final
             } else {
-                WithAbstraction.Modifier.Empty
+                JavaModifier.Empty
             },
             visibility = visibility.copy(
                 map = visibility.mapValues { JavaVisibility.Public }
@@ -189,7 +189,7 @@ internal fun Object.asJava(): Object = copy(
     properties = properties.map { it.asJava() } +
             Property(
                 name = "INSTANCE",
-                modifier = WithAbstraction.Modifier.Final,
+                modifier = JavaModifier.Final,
                 dri = dri.copy(callable = Callable("INSTANCE", null, emptyList())),
                 documentation = PlatformDependent.empty(),
                 sources = PlatformDependent.empty(),
@@ -281,16 +281,4 @@ private fun AdditionalModifiers.squash(second: AdditionalModifiers) =
     AdditionalModifiers((content + second.content).distinct())
 
 internal fun ClassId.classNames(): String =
-    shortClassName.identifier + (outerClassId?.classNames()?.let { ".$it" } ?: "")
-
-//fun TypeConstructor.asJava(): TypeReference =
-//    fullyQualifiedName.mapToJava()
-//        ?.let { tc.copy(fullyQualifiedName = it.asString(), params = tc.params.map { it.asJava() }) } ?: tc
-
-//fun TypeParam.asJava(): TypeReference = copy(bounds = bounds.map { it.asJava() })
-
-//fun TypeReference.asJava(): TypeReference = when (this) {
-//    is TypeConstructor -> asJava()
-//    is TypeParam -> asJava()
-//    else -> this
-//}
\ No newline at end of file
+    shortClassName.identifier + (outerClassId?.classNames()?.let { ".$it" } ?: "")
\ No newline at end of file
-- 
cgit