J2K: adapted for default visibility modifier 'public'

j2k/testData/fileOrElement/issues/arrayLength.kt

@@ -1,5 +1,5 @@
-object Test {
-    public fun foo(args: Array<String>): Int {
+internal object Test {
+    fun foo(args: Array<String>): Int {
         return args.size()
     }
 }

j2k/testData/fileOrElement/issues/comments.kt

@@ -9,7 +9,7 @@ This is a block comment
 //one line comment of class
 //another one
 /*another doc*/
-class C {
+internal class C {
     // This is a class comment
 
     /**
@@ -20,25 +20,25 @@ class C {
     /**
      * This is a function doc comment.
      */
-    public fun foo() {
+    fun foo() {
         /* This is a function comment */
     }
 
     //simple one line comment for function
-    fun f1() {
+    internal fun f1() {
     }
 
     //simple one line comment for field
-    var j: Int = 0
+    internal var j: Int = 0
 
     //double c style
     //comment before function
-    fun f2() {
+    internal fun f2() {
     }
 
     //double c style
     //comment before field
-    var k: Int = 0
+    internal var k: Int = 0
 
     //combination
     /** of
@@ -48,7 +48,7 @@ class C {
      * different
      */
     //comments
-    fun f3() {
+    internal fun f3() {
     }
 
     //combination
@@ -59,8 +59,8 @@ class C {
      * different
      */
     //comments
-    var l: Int = 0
+    internal var l: Int = 0
 
     /*two*/ /*comments*//*line*/
-    var z: Int = 0
+    internal var z: Int = 0
 }

j2k/testData/fileOrElement/issues/doNotQualifyStatic.kt

@@ -1,8 +1,8 @@
-object Outer {
-    public var o: Any? = Object()
+internal object Outer {
+    var o: Any? = Object()
 
-    public class Nested {
-        public fun foo() {
+    class Nested {
+        fun foo() {
             o = null
         }
     }

j2k/testData/fileOrElement/issues/kt-1016.kt

@@ -1,3 +1,3 @@
 package demo
 
-class C(private val i: Int)
+internal class C(private val i: Int)

j2k/testData/fileOrElement/issues/kt-1048.kt

@@ -2,15 +2,15 @@
 // ERROR: Type inference failed: Not enough information to infer parameter K in constructor HashMap<K : kotlin.Any!, V : kotlin.Any!>() Please specify it explicitly.
 import java.util.HashMap
 
-class G<T : String>(t: T)
+internal class G<T : String>(t: T)
 
-public class Java {
-    fun test() {
+class Java {
+    internal fun test() {
         val m = HashMap()
         m.put(1, 1)
     }
 
-    fun test2() {
+    internal fun test2() {
         val m = HashMap()
         val g = G("")
         val g2 = G("")

j2k/testData/fileOrElement/issues/kt-1074.kt

@@ -1,7 +1,7 @@
 package demo
 
-object Test {
-    fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) {
+internal object Test {
+    internal fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) {
         if (fromIndex < 0)
             throw IndexOutOfBoundsException("fromIndex = " + fromIndex)
         if (toIndex > size)

j2k/testData/fileOrElement/issues/kt-5294.kt

@@ -1,4 +1,4 @@
-class X(private val list: List<X.Y>) {
+internal class X internal constructor(private val list: List<X.Y>) {
 
-    inner class Y
+    internal inner class Y
 }

j2k/testData/fileOrElement/issues/kt-5400.kt

@@ -1,8 +1,8 @@
 // ERROR: Property must be initialized or be abstract
-open class Base {
-    inner class Nested
+internal open class Base {
+    internal inner class Nested
 }
 
-class Derived : Base() {
-    var field: Base.Nested
+internal class Derived : Base() {
+    internal var field: Base.Nested
 }

j2k/testData/fileOrElement/issues/kt-543-boxed.kt

@@ -1,10 +1,10 @@
 package demo
 
-class Test {
-    fun putInt(i: Int?) {
+internal class Test {
+    internal fun putInt(i: Int?) {
     }
 
-    fun test() {
+    internal fun test() {
         val b = 10
         putInt(b.toInt())
 

j2k/testData/fileOrElement/issues/kt-543-mixed.kt

@@ -1,10 +1,10 @@
 package demo
 
-class Test {
-    fun putInt(i: Int?) {
+internal class Test {
+    internal fun putInt(i: Int?) {
     }
 
-    fun test() {
+    internal fun test() {
         val i = 10
         putInt(i)
     }

j2k/testData/fileOrElement/issues/kt-543.kt

@@ -1,10 +1,10 @@
 package demo
 
-class Test {
-    fun putInt(i: Int) {
+internal class Test {
+    internal fun putInt(i: Int) {
     }
 
-    fun test() {
+    internal fun test() {
         val b = 10
         putInt(b.toInt())
     }

j2k/testData/fileOrElement/issues/kt-638.kt

@@ -1,27 +1,27 @@
 // ERROR: Property must be initialized or be abstract
-public class Identifier<T> {
-    public val name: T
+class Identifier<T> {
+    val name: T
     private val myHasDollar: Boolean
     private var myNullable = true
 
-    public constructor(name: T) {
+    constructor(name: T) {
         this.name = name
     }
 
-    public constructor(name: T, isNullable: Boolean) {
+    constructor(name: T, isNullable: Boolean) {
         this.name = name
         myNullable = isNullable
     }
 
-    public constructor(name: T, hasDollar: Boolean, isNullable: Boolean) {
+    constructor(name: T, hasDollar: Boolean, isNullable: Boolean) {
         this.name = name
         myHasDollar = hasDollar
         myNullable = isNullable
     }
 }
 
-public object User {
-    JvmStatic public fun main(args: Array<String>) {
+object User {
+    JvmStatic fun main(args: Array<String>) {
         val i1 = Identifier("name", false, true)
         val i2 = Identifier("name", false)
         val i3 = Identifier("name")

j2k/testData/fileOrElement/issues/kt-696.kt

@@ -1,6 +1,6 @@
 package test
 
-open class Base {
+internal open class Base {
     override fun hashCode(): Int {
         return super.hashCode()
     }
@@ -14,7 +14,7 @@ open class Base {
     }
 }
 
-class Child : Base() {
+internal class Child : Base() {
     override fun hashCode(): Int {
         return super.hashCode()
     }

j2k/testData/fileOrElement/issues/kt-792-mixed.kt

@@ -1,8 +1,8 @@
 package demo
 
-class Test(i: Int?) {
+internal class Test internal constructor(i: Int?) {
 
-    fun test() {
+    internal fun test() {
         val i = 10
         Test(i)
     }

j2k/testData/fileOrElement/issues/kt-792.kt

@@ -1,8 +1,8 @@
 package demo
 
-class Test(i: Int) {
+internal class Test internal constructor(i: Int) {
 
-    fun test() {
+    internal fun test() {
         val b = 10
         Test(b.toInt())
     }

j2k/testData/fileOrElement/issues/kt-794-mixed.kt

@@ -1,11 +1,11 @@
 package demo
 
-class Test {
-    fun getInteger(i: Int?): Int? {
+internal class Test {
+    internal fun getInteger(i: Int?): Int? {
         return i
     }
 
-    fun test() {
+    internal fun test() {
         val i = getInteger(10)!!
     }
 }

j2k/testData/fileOrElement/issues/kt-794.kt

@@ -1,5 +1,5 @@
-class Test {
-    fun getInt(): Int {
+internal class Test {
+    internal fun getInt(): Int {
         val b = 10
         return b.toInt()
     }

j2k/testData/fileOrElement/issues/kt-807.kt

@@ -4,8 +4,8 @@
 // ERROR: Unresolved reference: close
 import java.io.*
 
-object FileRead {
-    JvmStatic public fun main(args: Array<String>) {
+internal object FileRead {
+    JvmStatic fun main(args: Array<String>) {
         try {
             val fstream = FileInputStream()
             val `in` = DataInputStream(fstream)

j2k/testData/fileOrElement/issues/kt-809-string.kt

@@ -1,20 +1,20 @@
 package demo
 
-class Container {
-    var myString = "1"
+internal class Container {
+    internal var myString = "1"
 }
 
-object One {
-    var myContainer = Container()
+internal object One {
+    internal var myContainer = Container()
 }
 
-class StringContainer(s: String)
+internal class StringContainer internal constructor(s: String)
 
-class Test {
-    fun putString(s: String) {
+internal class Test {
+    internal fun putString(s: String) {
     }
 
-    fun test() {
+    internal fun test() {
         putString(One.myContainer.myString)
         StringContainer(One.myContainer.myString)
     }

j2k/testData/fileOrElement/issues/kt-809.kt

@@ -1,20 +1,20 @@
 package demo
 
-class Container {
-    var myInt = 1
+internal class Container {
+    internal var myInt = 1
 }
 
-object One {
-    var myContainer = Container()
+internal object One {
+    internal var myContainer = Container()
 }
 
-class IntContainer(i: Int)
+internal class IntContainer internal constructor(i: Int)
 
-class Test {
-    fun putInt(i: Int) {
+internal class Test {
+    internal fun putInt(i: Int) {
     }
 
-    fun test() {
+    internal fun test() {
         putInt(One.myContainer.myInt)
         IntContainer(One.myContainer.myInt)
     }

j2k/testData/fileOrElement/issues/kt-820-field.kt

@@ -1,13 +1,13 @@
 package demo
 
-class Container {
-    var myInt = 1
+internal class Container {
+    internal var myInt = 1
 }
 
-object One {
-    var myContainer = Container()
+internal object One {
+    internal var myContainer = Container()
 }
 
-class Test {
-    var b = One.myContainer.myInt.toByte()
+internal class Test {
+    internal var b = One.myContainer.myInt.toByte()
 }

j2k/testData/fileOrElement/issues/kt-820-string.kt

@@ -1,5 +1,5 @@
-object Test {
-    public fun toFileSystemSafeName(name: String): String {
+internal object Test {
+    fun toFileSystemSafeName(name: String): String {
         val size = name.length()
         return name
     }

j2k/testData/fileOrElement/issues/kt-820.kt

@@ -1,15 +1,15 @@
 package demo
 
-class Container {
-    var myInt = 1
+internal class Container {
+    internal var myInt = 1
 }
 
-object One {
-    var myContainer = Container()
+internal object One {
+    internal var myContainer = Container()
 }
 
-class Test {
-    fun test() {
+internal class Test {
+    internal fun test() {
         val b = One.myContainer.myInt.toByte()
     }
 }

j2k/testData/fileOrElement/issues/kt-824-isDir.kt

@@ -5,8 +5,8 @@ import java.io.File
 /**
  * User: ignatov
  */
-public object Test {
-    public fun isDir(parent: File?): Boolean {
+object Test {
+    fun isDir(parent: File?): Boolean {
         if (parent == null || !parent.exists()) {
             return false
         }

j2k/testData/fileOrElement/issues/kt-824.kt

@@ -1,15 +1,15 @@
 package demo
 
-class Container {
-    var myBoolean = true
+internal class Container {
+    internal var myBoolean = true
 }
 
-object One {
-    var myContainer = Container()
+internal object One {
+    internal var myContainer = Container()
 }
 
-class Test {
-    fun test() {
+internal class Test {
+    internal fun test() {
         if (One.myContainer.myBoolean)
             println("Ok")
 

j2k/testData/fileOrElement/issues/kt-828.kt

@@ -1,5 +1,5 @@
-class Test {
-    fun test() {
+internal class Test {
+    internal fun test() {
         var res = true
         res = res and false
         res = res or false

j2k/testData/fileOrElement/issues/kt-836.kt

@@ -2,7 +2,7 @@ package com.voltvoodoo.saplo4j.model
 
 import java.io.Serializable
 
-public class Language(protected var code: String) : Serializable {
+class Language(protected var code: String) : Serializable {
 
     override fun toString(): String {
         return this.code
@@ -10,8 +10,8 @@ public class Language(protected var code: String) : Serializable {
 }
 
 
-open class Base {
-    open fun test() {
+internal open class Base {
+    internal open fun test() {
     }
 
     override fun toString(): String {
@@ -19,7 +19,7 @@ open class Base {
     }
 }
 
-class Child : Base() {
+internal class Child : Base() {
     override fun test() {
     }
 

j2k/testData/fileOrElement/issues/kt-837.kt

@@ -2,15 +2,15 @@ package com.voltvoodoo.saplo4j.model
 
 import java.io.Serializable
 
-public class Language(protected var code: String) : Serializable {
+class Language(protected var code: String) : Serializable {
 
-    public fun equals(other: Language): Boolean {
+    fun equals(other: Language): Boolean {
         return other.toString() == this.toString()
     }
 
     companion object {
-        public var ENGLISH: Language = Language("en")
-        public var SWEDISH: Language = Language("sv")
+        var ENGLISH: Language = Language("en")
+        var SWEDISH: Language = Language("sv")
         private val serialVersionUID = -2442762969929206780L
     }
 }

j2k/testData/fileOrElement/issues/kt-851.kt

@@ -1,8 +1,8 @@
-class Test {
-    fun putInt(i: Int) {
+internal class Test {
+    internal fun putInt(i: Int) {
     }
 
-    fun test() {
+    internal fun test() {
         val b = 10
         putInt(b.toInt())
     }

j2k/testData/fileOrElement/issues/kt-852.kt

@@ -1,7 +1,7 @@
 package demo
 
-class Test {
-    fun test(): String {
+internal class Test {
+    internal fun test(): String {
         val s1 = ""
         val s2 = ""
         val s3 = ""

j2k/testData/fileOrElement/issues/kt-871.kt

@@ -1,7 +1,7 @@
 package demo
 
-object Program {
-    JvmStatic public fun main(args: Array<String>) {
+internal object Program {
+    JvmStatic fun main(args: Array<String>) {
         println("Halo!")
     }
 }

j2k/testData/fileOrElement/issues/kt-879.kt

@@ -1,5 +1,5 @@
-object Test {
-    public fun getInt(i: Int): Int {
+internal object Test {
+    fun getInt(i: Int): Int {
         when (i) {
             0 -> return 0
             1 -> return 1

j2k/testData/fileOrElement/issues/kt-893.kt

@@ -1,7 +1,7 @@
 package demo
 
-class Test {
-    fun test() {
+internal class Test {
+    internal fun test() {
         for (i in 0..9) {
             println(i)
         }

j2k/testData/fileOrElement/issues/kt-899.kt

@@ -1,5 +1,5 @@
-class Test {
-    public fun printNumbers(number: Int) {
+internal class Test {
+    fun printNumbers(number: Int) {
         for (i in 2..Math.sqrt(number.toDouble()) + 1 - 1)
             println(i)
     }

j2k/testData/fileOrElement/issues/kt-963.kt

@@ -1,10 +1,10 @@
 // ERROR: Variable cannot be initialized before declaration
 package demo
 
-class C(a: Int) {
+internal class C(a: Int) {
     init {
         abc = a * 2
     }
 
-    var abc = 0
+    internal var abc = 0
 }

j2k/testData/fileOrElement/issues/qualifyStatic.kt

@@ -1,7 +1,7 @@
 import java.util.Calendar
 
-abstract class MyCalendar : Calendar() {
-    public fun foo() {
+internal abstract class MyCalendar : Calendar() {
+    fun foo() {
         val i = Calendar.ALL_STYLES
     }
 }

j2k/testData/fileOrElement/issues/spaceBeforeAssignment.kt

@@ -1,5 +1,5 @@
 import java.util.*
 
-class A {
-    var list: List<String> = ArrayList()
+internal class A {
+    internal var list: List<String> = ArrayList()
 }