diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineResult.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineResult.kt index 071d325bc0a..024f7bc09ac 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineResult.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineResult.kt @@ -14,54 +14,42 @@ * limitations under the License. */ -package org.jetbrains.kotlin.codegen.inline; +package org.jetbrains.kotlin.codegen.inline -import org.jetbrains.annotations.NotNull; +import java.util.HashMap +import java.util.HashSet -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +class InlineResult private constructor() { -public class InlineResult { + private val classesToRemove = HashSet() + private val changedTypes = HashMap() + val reifiedTypeParametersUsages = ReifiedTypeParametersUsages() - private final Set classesToRemove = new HashSet(); - private final Map changedTypes = new HashMap(); - private final ReifiedTypeParametersUsages reifiedTypeParametersUsages = new ReifiedTypeParametersUsages(); - - private InlineResult() { + fun addAllClassesToRemove(child: InlineResult): InlineResult { + classesToRemove.addAll(child.classesToRemove) + return this } - @NotNull - public static InlineResult create() { - return new InlineResult(); + fun addClassToRemove(classInternalName: String) { + classesToRemove.add(classInternalName) } - @NotNull - public InlineResult addAllClassesToRemove(@NotNull InlineResult child) { - classesToRemove.addAll(child.classesToRemove); - return this; + fun addChangedType(oldClassInternalName: String, newClassInternalName: String) { + changedTypes.put(oldClassInternalName, newClassInternalName) } - public void addClassToRemove(@NotNull String classInternalName) { - classesToRemove.add(classInternalName); + fun getClassesToRemove(): Set { + return classesToRemove } - public void addChangedType(@NotNull String oldClassInternalName, @NotNull String newClassInternalName) { - changedTypes.put(oldClassInternalName, newClassInternalName); + fun getChangedTypes(): Map { + return changedTypes } - @NotNull - public Set getClassesToRemove() { - return classesToRemove; - } - - public Map getChangedTypes() { - return changedTypes; - } - - @NotNull - public ReifiedTypeParametersUsages getReifiedTypeParametersUsages() { - return reifiedTypeParametersUsages; + companion object { + @JvmStatic + fun create(): InlineResult { + return InlineResult() + } } }