From 1be836a9564b51f246e5fcd5a7f248a2591695a7 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Mon, 2 Jun 2014 23:02:49 +0400 Subject: [PATCH] Java to Kotlin conversion: artificial constructor (when no primary detected) is generated private --- j2k/src/org/jetbrains/jet/j2k/Converter.kt | 2 +- j2k/tests/testData/ast/class/kt-639.ide.kt | 2 +- j2k/tests/testData/ast/class/kt-639.kt | 2 +- j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt | 2 +- j2k/tests/testData/ast/constructors/genericIdentifier.kt | 2 +- j2k/tests/testData/ast/constructors/identifier.ide.kt | 2 +- j2k/tests/testData/ast/constructors/identifier.kt | 2 +- .../testData/ast/constructors/withManyDefaultParams.ide.kt | 2 +- j2k/tests/testData/ast/constructors/withManyDefaultParams.kt | 2 +- j2k/tests/testData/ast/issues/kt-638.ide.kt | 2 +- j2k/tests/testData/ast/issues/kt-638.kt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.kt b/j2k/src/org/jetbrains/jet/j2k/Converter.kt index cec526e2acf..d3256aabe5f 100644 --- a/j2k/src/org/jetbrains/jet/j2k/Converter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/Converter.kt @@ -160,7 +160,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) { //TODO: comments? val parameters = finalOrWithEmptyInitializerFields.map { Parameter(Identifier("_" + it.identifier.name), it.`type`, Parameter.VarValModifier.None, listOf()) } - classBodyElements.add(PrimaryConstructor(this, MemberComments.Empty, setOf(), + classBodyElements.add(PrimaryConstructor(this, MemberComments.Empty, setOf(Modifier.PRIVATE), ParameterList(parameters), Block(createInitStatementsFromFields(finalOrWithEmptyInitializerFields)))) } diff --git a/j2k/tests/testData/ast/class/kt-639.ide.kt b/j2k/tests/testData/ast/class/kt-639.ide.kt index 59b051dc42b..ddaee0f171b 100644 --- a/j2k/tests/testData/ast/class/kt-639.ide.kt +++ b/j2k/tests/testData/ast/class/kt-639.ide.kt @@ -2,7 +2,7 @@ package demo import java.util.HashMap -class Test() { +class Test private() { class object { fun init(): Test { val __ = Test() diff --git a/j2k/tests/testData/ast/class/kt-639.kt b/j2k/tests/testData/ast/class/kt-639.kt index 0d8b30302a5..f4c2acbd06c 100644 --- a/j2k/tests/testData/ast/class/kt-639.kt +++ b/j2k/tests/testData/ast/class/kt-639.kt @@ -2,7 +2,7 @@ package demo import java.util.HashMap -open class Test() { +open class Test private() { class object { open fun init(): Test { val __ = Test() diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt index 245768fc8fa..6dd51cd9378 100644 --- a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt +++ b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt @@ -1,4 +1,4 @@ -public class Identifier(_myName: T, _myHasDollar: Boolean) { +public class Identifier private(_myName: T, _myHasDollar: Boolean) { private val myName: T private var myHasDollar: Boolean = false private var myNullable: Boolean = true diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.kt index aa178ffd8e3..361806f4065 100644 --- a/j2k/tests/testData/ast/constructors/genericIdentifier.kt +++ b/j2k/tests/testData/ast/constructors/genericIdentifier.kt @@ -1,4 +1,4 @@ -public open class Identifier(_myName: T?, _myHasDollar: Boolean) { +public open class Identifier private(_myName: T?, _myHasDollar: Boolean) { private val myName: T? private var myHasDollar: Boolean = false private var myNullable: Boolean = true diff --git a/j2k/tests/testData/ast/constructors/identifier.ide.kt b/j2k/tests/testData/ast/constructors/identifier.ide.kt index acb4921e3a0..779ed2a1463 100644 --- a/j2k/tests/testData/ast/constructors/identifier.ide.kt +++ b/j2k/tests/testData/ast/constructors/identifier.ide.kt @@ -1,4 +1,4 @@ -public class Identifier(_myName: String, _myHasDollar: Boolean) { +public class Identifier private(_myName: String, _myHasDollar: Boolean) { private val myName: String private var myHasDollar: Boolean = false private var myNullable: Boolean = true diff --git a/j2k/tests/testData/ast/constructors/identifier.kt b/j2k/tests/testData/ast/constructors/identifier.kt index f7867fa0dac..48afec47e58 100644 --- a/j2k/tests/testData/ast/constructors/identifier.kt +++ b/j2k/tests/testData/ast/constructors/identifier.kt @@ -1,4 +1,4 @@ -public open class Identifier(_myName: String?, _myHasDollar: Boolean) { +public open class Identifier private(_myName: String?, _myHasDollar: Boolean) { private val myName: String? private var myHasDollar: Boolean = false private var myNullable: Boolean = true diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt index 753f35d0367..9a6eae2954f 100644 --- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt +++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt @@ -1,4 +1,4 @@ -public class Test(_myName: String, _a: Boolean, _b: Double, _c: Float, _d: Long, _e: Int, _f: Short, _g: Char) { +public class Test private(_myName: String, _a: Boolean, _b: Double, _c: Float, _d: Long, _e: Int, _f: Short, _g: Char) { private val myName: String private var a: Boolean = false private var b: Double = 0.toDouble() diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt index 769593f33fc..9ef98c15e53 100644 --- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt +++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt @@ -1,4 +1,4 @@ -public open class Test(_myName: String?, _a: Boolean, _b: Double, _c: Float, _d: Long, _e: Int, _f: Short, _g: Char) { +public open class Test private(_myName: String?, _a: Boolean, _b: Double, _c: Float, _d: Long, _e: Int, _f: Short, _g: Char) { private val myName: String? private var a: Boolean = false private var b: Double = 0.toDouble() diff --git a/j2k/tests/testData/ast/issues/kt-638.ide.kt b/j2k/tests/testData/ast/issues/kt-638.ide.kt index 99183a98379..89273b835c8 100644 --- a/j2k/tests/testData/ast/issues/kt-638.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-638.ide.kt @@ -1,4 +1,4 @@ -public class Identifier(_myName: T, _myHasDollar: Boolean) { +public class Identifier private(_myName: T, _myHasDollar: Boolean) { private val myName: T private var myHasDollar: Boolean = false private var myNullable: Boolean = true diff --git a/j2k/tests/testData/ast/issues/kt-638.kt b/j2k/tests/testData/ast/issues/kt-638.kt index 2497bf8f81d..e99cb9fd469 100644 --- a/j2k/tests/testData/ast/issues/kt-638.kt +++ b/j2k/tests/testData/ast/issues/kt-638.kt @@ -1,4 +1,4 @@ -public open class Identifier(_myName: T?, _myHasDollar: Boolean) { +public open class Identifier private(_myName: T?, _myHasDollar: Boolean) { private val myName: T? private var myHasDollar: Boolean = false private var myNullable: Boolean = true