J2K: do not produce redundant "internal" words for members in an internal class

This commit is contained in:
Valentin Kipyatkov
2015-09-16 21:50:01 +03:00
parent 367b32c309
commit 0cc2158ec1
260 changed files with 459 additions and 448 deletions
@@ -2,10 +2,10 @@
import java.util.*
internal class A<T> {
internal fun foo(nonMutableCollection: Collection<String>,
mutableCollection: MutableCollection<String>,
mutableSet: MutableSet<T>,
mutableMap: MutableMap<String, T>) {
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.*
internal class A {
internal fun foo(set: MutableSet<String>) {
fun foo(set: MutableSet<String>) {
bar(set)
}
internal fun bar(collection: MutableCollection<String>) {
fun bar(collection: MutableCollection<String>) {
collection.add("a")
}
}
@@ -1,11 +1,11 @@
import java.util.*
internal class A {
internal fun createCollection(): MutableCollection<String> {
fun createCollection(): MutableCollection<String> {
return ArrayList()
}
internal fun foo(): Collection<String> {
fun foo(): Collection<String> {
val collection = createCollection()
collection.add("a")
return collection
@@ -1,13 +1,13 @@
import java.util.*
internal class A internal constructor() {
internal class A {
private val collection: MutableCollection<String>
init {
collection = createCollection()
}
internal fun createCollection(): MutableCollection<String> {
fun createCollection(): MutableCollection<String> {
return ArrayList()
}
+2 -2
View File
@@ -1,11 +1,11 @@
import java.util.*
internal class A {
internal fun foo(collection: MutableCollection<String>) {
fun foo(collection: MutableCollection<String>) {
bar(collection)
}
internal fun bar(collection: MutableCollection<String>) {
fun bar(collection: MutableCollection<String>) {
if (collection.size() < 5) {
foo(collection)
} else {