J2K: adapted for default visibility modifier 'public'

This commit is contained in:
Valentin Kipyatkov
2015-09-15 11:29:27 +03:00
parent 1ccbda6af4
commit c3ddd5d32b
477 changed files with 1359 additions and 1350 deletions
@@ -1,11 +1,11 @@
// ERROR: Type mismatch: inferred type is T? but T was expected
import java.util.*
class A<T> {
fun foo(nonMutableCollection: Collection<String>,
mutableCollection: MutableCollection<String>,
mutableSet: MutableSet<T>,
mutableMap: MutableMap<String, T>) {
internal class A<T> {
internal fun foo(nonMutableCollection: Collection<String>,
mutableCollection: MutableCollection<String>,
mutableSet: MutableSet<T>,
mutableMap: MutableMap<String, T>) {
mutableCollection.addAll(nonMutableCollection)
mutableSet.add(mutableMap.remove("a"))
}
@@ -1,11 +1,11 @@
import java.util.*
class A {
fun foo(set: MutableSet<String>) {
internal class A {
internal fun foo(set: MutableSet<String>) {
bar(set)
}
fun bar(collection: MutableCollection<String>) {
internal fun bar(collection: MutableCollection<String>) {
collection.add("a")
}
}
@@ -1,11 +1,11 @@
import java.util.*
class A {
fun createCollection(): MutableCollection<String> {
internal class A {
internal fun createCollection(): MutableCollection<String> {
return ArrayList()
}
fun foo(): Collection<String> {
internal fun foo(): Collection<String> {
val collection = createCollection()
collection.add("a")
return collection
@@ -1,21 +1,21 @@
import java.util.*
class A {
internal class A internal constructor() {
private val collection: MutableCollection<String>
init {
collection = createCollection()
}
fun createCollection(): MutableCollection<String> {
internal fun createCollection(): MutableCollection<String> {
return ArrayList()
}
public fun foo() {
fun foo() {
collection.add("1")
}
public fun getCollection(): Collection<String> {
fun getCollection(): Collection<String> {
return collection
}
}
+1 -1
View File
@@ -2,7 +2,7 @@ package javaApi
import kotlinApi.KotlinClass
public abstract class C(field: Int) : KotlinClass(field) {
abstract class C(field: Int) : KotlinClass(field) {
override fun foo(mutableCollection: MutableCollection<String>, nullableCollection: Collection<Int>?): MutableList<Any> {
return super.foo(mutableCollection, nullableCollection)
+3 -3
View File
@@ -1,11 +1,11 @@
import java.util.*
class A {
fun foo(collection: MutableCollection<String>) {
internal class A {
internal fun foo(collection: MutableCollection<String>) {
bar(collection)
}
fun bar(collection: MutableCollection<String>) {
internal fun bar(collection: MutableCollection<String>) {
if (collection.size() < 5) {
foo(collection)
} else {