Deprecate JVM platform annotations in favor of capitilized themselves

j2k/testData/fileOrElement/classExpression/primitivesAndArrays.kt

@@ -1,5 +1,5 @@
 public object A {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
         println(Void.TYPE)
         println(Integer.TYPE)
         println(java.lang.Double.TYPE)

j2k/testData/fileOrElement/comments/commentsForConstructors.kt

@@ -1,5 +1,5 @@
 class A// this is a primary constructor
-jvmOverloads constructor(p: Int = 1) {
+JvmOverloads constructor(p: Int = 1) {
     private val v: Int
 
     init {

j2k/testData/fileOrElement/constructors/allCallsPrimary.kt

@@ -1,6 +1,6 @@
 package pack
 
-class C jvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0)
+class C JvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0)
 
 public object User {
     public fun main() {

j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt

@@ -1 +1 @@
-class C jvmOverloads constructor(private val string: String, a: Int = string.length())
+class C JvmOverloads constructor(private val string: String, a: Int = string.length())

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt

@@ -1,4 +1,4 @@
-class A jvmOverloads constructor(nested: A.Nested = A.Nested(A.Nested.FIELD)) {
+class A JvmOverloads constructor(nested: A.Nested = A.Nested(A.Nested.FIELD)) {
 
     class Nested(p: Int) {
         companion object {

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt

@@ -1,7 +1,7 @@
 // ERROR: Property must be initialized or be abstract
 import A.Nested
 
-class A jvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
+class A JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
 
     class Nested(p: Int) {
         companion object {

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt

@@ -3,7 +3,7 @@ package pack
 
 import pack.A.Nested
 
-class A jvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
+class A JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
 
     class Nested(p: Int) {
         companion object {

j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt

@@ -3,7 +3,7 @@ package pack
 
 import pack.A.*
 
-class A jvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
+class A JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
 
     class Nested(p: Int) {
         companion object {

j2k/testData/fileOrElement/constructors/parameterDefaults1.kt

@@ -1,6 +1,6 @@
 package pack
 
-class C jvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
+class C JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
 
     constructor(a: Int) : this(a, 0, 0, 0, 1) {
     }

j2k/testData/fileOrElement/constructors/parameterDefaults2.kt

@@ -1,6 +1,6 @@
 package pack
 
-class C jvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
+class C JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
 
     constructor(a1: Int, b1: Int, c1: Int) : this(a1, b1, c1, 0, 0) {
     }

j2k/testData/fileOrElement/constructors/parameterDefaults3.kt

@@ -1,6 +1,6 @@
 package pack
 
-class C jvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
+class C JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
 
     constructor(a: Int, b: Int, c: Int) : this(b, a, c, 0, 0) {
     }

j2k/testData/fileOrElement/constructors/parameterDefaults4.kt

@@ -1,3 +1,3 @@
 package pack
 
-class C jvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
+class C JvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)

j2k/testData/fileOrElement/constructors/parameterDefaults5.kt

@@ -1,3 +1,3 @@
 package pack
 
-class C jvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
+class C JvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)

j2k/testData/fileOrElement/constructors/parameterModification.kt

@@ -1,4 +1,4 @@
-class C jvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) {
+class C JvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) {
     private val field: Int
 
     init {

j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt

@@ -7,7 +7,7 @@ class A {
     public constructor() {
     }
 
-    jvmOverloads public constructor(p: Int, s: String, x: Int = 1) {
+    JvmOverloads public constructor(p: Int, s: String, x: Int = 1) {
         this.s = s
         this.x = x
     }

j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.kt

@@ -4,7 +4,7 @@ class A() {
     private val s = ""
     private val x = 0
 
-    jvmOverloads public constructor(p: Int, s: String, x: Int = 1) : this() {
+    JvmOverloads public constructor(p: Int, s: String, x: Int = 1) : this() {
         this.s = s
         this.x = x
     }

j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt

@@ -1 +1 @@
-public class C jvmOverloads constructor(c: C, public val x: Int = c.x)
+public class C JvmOverloads constructor(c: C, public val x: Int = c.x)

j2k/testData/fileOrElement/for/withContinue1.kt

@@ -1,5 +1,5 @@
 public object TestClass {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
         var i = 0
         while (i < 10) {
             if (i == 4 || i == 8) {

j2k/testData/fileOrElement/for/withContinue2.kt

@@ -1,5 +1,5 @@
 public object TestClass {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
         var i = 0
         var j = 1
         while (i < 10) {

j2k/testData/fileOrElement/for/withContinue3.kt

@@ -1,5 +1,5 @@
 public object TestClass {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
         var i = 1
         while (i < 1000) {
             if (i == 4 || i == 8) {

j2k/testData/fileOrElement/for/withContinueAndLabels.kt

@@ -1,5 +1,5 @@
 public object TestClass {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
         var i = 1
         OuterLoop1@ OuterLoop2@ while (i < 1000) {
             var j = 1

j2k/testData/fileOrElement/function/main.kt

@@ -1,2 +1,2 @@
-jvmStatic public fun main(args: Array<String>) {
+JvmStatic public fun main(args: Array<String>) {
 }

j2k/testData/fileOrElement/function/main2.kt

@@ -1,4 +1,4 @@
 public object A {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
     }
 }

j2k/testData/fileOrElement/function/mainAndNullabilitySetting.kt

@@ -1,5 +1,5 @@
 // !forceNotNullTypes: false
 public object A {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
     }
 }

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

@@ -21,7 +21,7 @@ public class Identifier<T> {
 }
 
 public object User {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public 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-807.kt

@@ -5,7 +5,7 @@
 import java.io.*
 
 object FileRead {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
         try {
             val fstream = FileInputStream()
             val `in` = DataInputStream(fstream)

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

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

j2k/testData/fileOrElement/overloads/Annotations.kt

@@ -1,7 +1,7 @@
 // ERROR: Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected
 // ERROR: Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected
 class A {
-    jvmOverloads fun foo(s: String? = null): Any {
+    JvmOverloads fun foo(s: String? = null): Any {
         println("s = " + s!!)
         return ""
     }

j2k/testData/fileOrElement/overloads/Simple.kt

@@ -1,9 +1,9 @@
 class A {
-    jvmOverloads fun foo(i: Int, c: Char = 'a', s: String = "") {
+    JvmOverloads fun foo(i: Int, c: Char = 'a', s: String = "") {
         println("foo$i$c$s")
     }
 
-    jvmOverloads fun bar(s: String? = null): Int {
+    JvmOverloads fun bar(s: String? = null): Int {
         println("s = " + s!!)
         return 0
     }

j2k/testData/fileOrElement/switch/comlicatedFallDown.kt

@@ -76,7 +76,7 @@ public object SwitchDemo {
         println(monthString)
     }
 
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
         for (i in 1..12)
             test(i)
     }

j2k/testData/fileOrElement/switch/emptySwitch.kt

@@ -1,5 +1,5 @@
 public object NonDefault {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
 
         val value = 3
         val valueString = ""

j2k/testData/fileOrElement/switch/fallDown.kt

@@ -1,7 +1,7 @@
 package switch_demo
 
 public object SwitchDemo {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
         val month = 8
         val monthString: String
         when (month) {

j2k/testData/fileOrElement/switch/fallDownWithBlocks.kt

@@ -1,5 +1,5 @@
 public object C {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
         when (args.size()) {
             1 -> {
                 run {

j2k/testData/fileOrElement/switch/kt-539.kt

@@ -1,7 +1,7 @@
 package switch_demo
 
 public object SwitchDemo {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
 
         val month = 8
         val monthString: String

j2k/testData/fileOrElement/switch/nondefault.kt

@@ -1,5 +1,5 @@
 public object NonDefault {
-    jvmStatic public fun main(args: Array<String>) {
+    JvmStatic public fun main(args: Array<String>) {
 
         val value = 3
         var valueString = ""