J2K: adapted for default visibility modifier 'public'

2015-09-15 11:29:27 +03:00
parent 1ccbda6af4
commit c3ddd5d32b
477 changed files with 1359 additions and 1350 deletions
@@ -1,7 +1,7 @@
-class C {
+internal class C {
    private var s: String? = ""

-    fun foo() {
+    internal fun foo() {
        s = null
    }
 }
@@ -1,8 +1,8 @@
 // ERROR: Unresolved reference: x
-class C {
+internal class C {
    private val s = x()

-    fun foo() {
+    internal fun foo() {
        if (s == null) {
            print("null")
        }
@@ -1,6 +1,6 @@
-class C(private val s: String?) {
+internal class C(private val s: String?) {

-    fun foo() {
+    internal fun foo() {
        if (s != null) {
            print("not null")
        }
@@ -1,9 +1,9 @@
-class C {
-    public var s: String? = ""
+internal class C {
+    var s: String? = ""
 }

-class D {
-    fun foo(c: C) {
+internal class D {
+    internal fun foo(c: C) {
        if (null == c.s) {
            println("null")
        }
@@ -1,4 +1,4 @@
-class C(private val s: String?) {
+internal class C(private val s: String?) {

    init {
        if (s == null) {
@@ -1,7 +1,7 @@
-class C {
+internal class C {
    private var s: String? = null

-    fun foo() {
+    internal fun foo() {
        s = "x"
    }
 }
@@ -1,4 +1,4 @@
-class C : javaApi.Derived() {
+internal class C : javaApi.Derived() {
    override fun foo(s: String?): String? {
        return s
    }
@@ -1,8 +1,8 @@
-class C {
+internal class C {
    private fun foo(s: String?) {
    }

-    fun bar() {
+    internal fun bar() {
        foo(null)
    }
 }
@@ -1,10 +1,10 @@
-class C {
-    public fun foo(s: String?) {
+internal class C {
+    fun foo(s: String?) {
    }
 }

-class D {
-    fun bar(c: C) {
+internal class D {
+    internal fun bar(c: C) {
        c.foo(null)
    }
 }
@@ -1,8 +1,8 @@
-class C {
+internal class C {
    private fun foo(s: String?) {
    }

-    fun bar(b: Boolean) {
+    internal fun bar(b: Boolean) {
        foo(if (b) "a" else null)
    }
 }
@@ -1,9 +1,9 @@
-interface I {
-    public fun getString(): String?
+internal interface I {
+    fun getString(): String?
 }

-class C {
-    fun foo(i: I) {
+internal class C {
+    internal fun foo(i: I) {
        if (i.getString() == null) {
            println("null")
        }
@@ -1,9 +1,9 @@
-interface I {
-    public fun getString(): String?
+internal interface I {
+    fun getString(): String?
 }

-class C {
-    fun foo(i: I) {
+internal class C {
+    internal fun foo(i: I) {
        val result = i.getString()
        if (result != null) {
            print(result)
@@ -1,9 +1,9 @@
-interface I {
-    public fun getString(): String?
+internal interface I {
+    fun getString(): String?
 }

-class C {
-    fun foo(i: I) {
+internal class C {
+    internal fun foo(i: I) {
        val result = i.getString()
        if (result != null) {
            print(result)
@@ -1,9 +1,9 @@
-interface I {
-    public fun getString(): String
+internal interface I {
+    fun getString(): String
 }

-class C {
-    fun foo(i: I, b: Boolean) {
+internal class C {
+    internal fun foo(i: I, b: Boolean) {
        var result: String? = i.getString()
        if (b) result = null
        if (result != null) {
@@ -1,10 +1,10 @@
 // ERROR: Unresolved reference: x
-class C {
+internal class C {
    private val string = getString()

    companion object {

-        fun getString(): String? {
+        internal fun getString(): String? {
            return x()
        }
    }
@@ -1,5 +1,5 @@
-class C {
-    fun foo(b: Boolean): String? {
+internal class C {
+    internal fun foo(b: Boolean): String? {
        if (b) {
            return "abc"
        } else {
@@ -1,10 +1,10 @@
 // ERROR: Return type of 'get' is not a subtype of the return type of the overridden member 'public abstract fun get(): kotlin.String defined in Getter'
-interface Getter {
-    public fun get(): String
+internal interface Getter {
+    fun get(): String
 }

-class C {
-    fun foo(b: Boolean): String {
+internal class C {
+    internal fun foo(b: Boolean): String {
        val getter = object : Getter {
            override fun get(): String? {
                return null
@@ -1,7 +1,7 @@
-class C {
-    fun foo(): String {
-        class Local {
-            fun foo(): String? {
+internal class C {
+    internal fun foo(): String {
+        internal class Local {
+            internal fun foo(): String? {
                return null
            }
        }
@@ -1,5 +1,5 @@
-class C {
-    fun foo(b: Boolean): String? {
+internal class C {
+    internal fun foo(b: Boolean): String? {
        return if (b) "abc" else null
    }
 }
@@ -1,7 +1,7 @@
-class A {
-    var field = foo()
+internal class A {
+    internal var field = foo()

-    fun foo(): Int {
+    internal fun foo(): Int {
        return 1
    }
 }
@@ -1,9 +1,9 @@
-class C {
-    fun getString(b: Boolean): String? {
+internal class C {
+    internal fun getString(b: Boolean): String? {
        return if (b) "a" else null
    }

-    fun foo(): Int {
+    internal fun foo(): Int {
        return getString(true)!!.length()
    }
 }
@@ -1,4 +1,4 @@
-fun foo(s: String?, b: Boolean): Int {
+internal fun foo(s: String?, b: Boolean): Int {
    if (s == null) println("null")
    if (b) return s!!.length()
    return 10
@@ -1,11 +1,11 @@
 // ERROR: There's a cycle in the inheritance hierarchy for this type
 // ERROR: There's a cycle in the inheritance hierarchy for this type
-open class A : B() {
-    public open fun foo(s: String) {
+internal open class A : B() {
+    open fun foo(s: String) {
    }
 }

-open class B : A() {
-    public open fun foo(s: String) {
+internal open class B : A() {
+    open fun foo(s: String) {
    }
 }
@@ -1,22 +1,22 @@
-open class Base {
-    public open fun foo(s: String?): String? {
+internal open class Base {
+    open fun foo(s: String?): String? {
        return ""
    }

-    public open fun bar(s: String?): String? {
+    open fun bar(s: String?): String? {
        return if (s != null) s + 1 else null
    }

-    public open fun zoo(o: Any): String {
+    open fun zoo(o: Any): String {
        return ""
    }
 }

-interface I {
-    public fun zoo(o: Any?): String?
+internal interface I {
+    fun zoo(o: Any?): String?
 }

-class C : Base(), I {
+internal class C : Base(), I {
    override fun foo(s: String?): String? {
        return ""
    }
@@ -1,4 +1,4 @@
-fun foo(s: String?) {
+internal fun foo(s: String?) {
    if (s != null) {
        zoo(s)
    }
@@ -1,5 +1,5 @@
 // !specifyLocalVariableTypeByDefault: true
-fun foo(b: Boolean) {
+internal fun foo(b: Boolean) {
    var s: String? = "abc"
    if (b) {
        s = null
@@ -1,5 +1,5 @@
 // !specifyLocalVariableTypeByDefault: true
-fun foo() {
+internal fun foo() {
    val s: String? = bar()
    if (s != null) {
        zoo(s)
@@ -1,5 +1,5 @@
 // !specifyLocalVariableTypeByDefault: true
-fun foo(b: Boolean) {
+internal fun foo(b: Boolean) {
    var s: String? = null
    if (b) {
        s = "abc"
@@ -1,4 +1,4 @@
 // !specifyLocalVariableTypeByDefault: true
-fun foo(b: Boolean) {
+internal fun foo(b: Boolean) {
    val s: String? = (if (b) "abc" else null)
 }
@@ -1,5 +1,5 @@
-class A {
-    fun foo(s: String?): Int {
+internal class A {
+    internal fun foo(s: String?): Int {
        if (s != null) {
            return s.length()
        }