azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-5287 J2K: Convert class with private constructor and static functions to "object" instead of class with "class object"

Browse Source 
#KT-5287 Fixed
This commit is contained in:
Valentin Kipyatkov
2015-03-27 13:55:47 +03:00
parent 6dbb13c32d
commit f19eb20803
63 changed files with 550 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/testData/fileOrElement/switch/comlicatedFallDown.kt
+75 -77
View File
@@ -1,86 +1,84 @@
package demo
public class SwitchDemo {
companion object {
public fun print(o: Any) {
System.out.println(o)
}
public object SwitchDemo {
public fun print(o: Any) {
System.out.println(o)
}
public fun test(i: Int) {
var monthString = "<empty>"
when (i) {
1 -> {
print(1)
print(2)
print(3)
print(4)
print(5)
}
2 -> {
print(2)
print(3)
print(4)
print(5)
}
3 -> {
print(3)
print(4)
print(5)
}
4 -> {
print(4)
print(5)
}
5 -> print(5)
6 -> {
print(6)
print(7)
print(8)
print(9)
print(10)
print(11)
monthString = "December"
}
7 -> {
print(7)
print(8)
print(9)
print(10)
print(11)
monthString = "December"
}
8 -> {
print(8)
print(9)
print(10)
print(11)
monthString = "December"
}
9 -> {
print(9)
print(10)
print(11)
monthString = "December"
}
10 -> {
print(10)
print(11)
monthString = "December"
}
11 -> {
print(11)
monthString = "December"
}
12 -> monthString = "December"
else -> monthString = "Invalid month"
public fun test(i: Int) {
var monthString = "<empty>"
when (i) {
1 -> {
print(1)
print(2)
print(3)
print(4)
print(5)
}
System.out.println(monthString)
2 -> {
print(2)
print(3)
print(4)
print(5)
}
3 -> {
print(3)
print(4)
print(5)
}
4 -> {
print(4)
print(5)
}
5 -> print(5)
6 -> {
print(6)
print(7)
print(8)
print(9)
print(10)
print(11)
monthString = "December"
}
7 -> {
print(7)
print(8)
print(9)
print(10)
print(11)
monthString = "December"
}
8 -> {
print(8)
print(9)
print(10)
print(11)
monthString = "December"
}
9 -> {
print(9)
print(10)
print(11)
monthString = "December"
}
10 -> {
print(10)
print(11)
monthString = "December"
}
11 -> {
print(11)
monthString = "December"
}
12 -> monthString = "December"
else -> monthString = "Invalid month"
}
System.out.println(monthString)
}
public fun main(args: Array<String>) {
for (i in 1..12)
test(i)
}
public fun main(args: Array<String>) {
for (i in 1..12)
test(i)
}
}
j2k/testData/fileOrElement/switch/emptySwitch.kt
+6 -8
View File
@@ -1,14 +1,12 @@
public class NonDefault {
companion object {
public fun main(args: Array<String>) {
public object NonDefault {
public fun main(args: Array<String>) {
val value = 3
val valueString = ""
when (value) {
val value = 3
val valueString = ""
when (value) {
}
System.out.println(valueString)
}
System.out.println(valueString)
}
}
j2k/testData/fileOrElement/switch/fallDown.kt
+8 -10
View File
@@ -1,16 +1,14 @@
package switch_demo
public class SwitchDemo {
companion object {
public fun main(args: Array<String>) {
val month = 8
val monthString: String
when (month) {
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> monthString = "December"
else -> monthString = "Invalid month"
}
System.out.println(monthString)
public object SwitchDemo {
public fun main(args: Array<String>) {
val month = 8
val monthString: String
when (month) {
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> monthString = "December"
else -> monthString = "Invalid month"
}
System.out.println(monthString)
}
}
j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt
+13 -15
View File
@@ -1,23 +1,21 @@
public class C {
companion object {
public fun main(args: Array<String>) {
when (args.size()) {
1 -> {
run {
val a = 1
System.out.print("1")
}
run {
val a = 2
System.out.print("2")
}
public object C {
public fun main(args: Array<String>) {
when (args.size()) {
1 -> {
run {
val a = 1
System.out.print("1")
}
2 -> {
run {
val a = 2
System.out.print("2")
}
}
2 -> {
val a = 2
System.out.print("2")
}
}
}
}
j2k/testData/fileOrElement/switch/kt-539.kt
+19 -21
View File
@@ -1,28 +1,26 @@
package switch_demo
public class SwitchDemo {
companion object {
public fun main(args: Array<String>) {
public object SwitchDemo {
public fun main(args: Array<String>) {
val month = 8
val monthString: String
when (month) {
1 -> monthString = "January"
2 -> monthString = "February"
3 -> monthString = "March"
4 -> monthString = "April"
5 -> monthString = "May"
6 -> monthString = "June"
7 -> monthString = "July"
8 -> monthString = "August"
9 -> monthString = "September"
10 -> monthString = "October"
11 -> monthString = "November"
12 -> monthString = "December"
else -> monthString = "Invalid month"
}
System.out.println(monthString)
val month = 8
val monthString: String
when (month) {
1 -> monthString = "January"
2 -> monthString = "February"
3 -> monthString = "March"
4 -> monthString = "April"
5 -> monthString = "May"
6 -> monthString = "June"
7 -> monthString = "July"
8 -> monthString = "August"
9 -> monthString = "September"
10 -> monthString = "October"
11 -> monthString = "November"
12 -> monthString = "December"
else -> monthString = "Invalid month"
}
System.out.println(monthString)
}
}
j2k/testData/fileOrElement/switch/nondefault.kt
+9 -11
View File
@@ -1,16 +1,14 @@
public class NonDefault {
companion object {
public fun main(args: Array<String>) {
public object NonDefault {
public fun main(args: Array<String>) {
val value = 3
var valueString = ""
when (value) {
1 -> valueString = "ONE"
2 -> valueString = "TWO"
3 -> valueString = "THREE"
}
System.out.println(valueString)
val value = 3
var valueString = ""
when (value) {
1 -> valueString = "ONE"
2 -> valueString = "TWO"
3 -> valueString = "THREE"
}
System.out.println(valueString)
}
}