Java to Kotlin converter: minor corrections after code review

j2k/tests/testData/ast/nullability/FieldAssignedWithNull.java

@@ -3,6 +3,6 @@ class C {
     private String s = "";
 
     void foo() {
-        s = null
+        s = null;
     }
 }

j2k/tests/testData/ast/nullability/FieldInitializedWithNull.java

@@ -3,6 +3,6 @@ class C {
     private String s = null;
 
     void foo() {
-        s = "x"
+        s = "x";
     }
 }

j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg.java

@@ -3,6 +3,6 @@ class C {
     private void foo(String s){}
 
     void bar() {
-        foo(null)
+        foo(null);
     }
 }

j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.java

@@ -3,6 +3,6 @@ class C {
     private void foo(String s){}
 
     void bar(boolean b) {
-        foo(b ? "a" : null)
+        foo(b ? "a" : null);
     }
 }

j2k/tests/testData/ast/nullability/MethodResultComparedWithNull.java

@@ -6,7 +6,7 @@ interface I {
 class C {
     void foo(I i) {
         if (i.getString() == null) {
-            println("null")
+            println("null");
         }
     }
 }

j2k/tests/testData/ast/nullability/MethodReturnsNull.java

@@ -2,10 +2,10 @@
 class C {
     String foo(boolean b) {
         if (b) {
-            return "abc"
+            return "abc";
         }
         else {
-            return null
+            return null;
         }
     }
 }

j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.java

@@ -1,9 +1,6 @@
-import java.lang.Override;
-import java.lang.String;
-
 //file
 interface Getter {
-    String get()
+    String get();
 }
 
 class C {

j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.kt

@@ -1,5 +1,3 @@
-import java.lang.Override
-
 trait Getter {
     public fun get(): String
 }

j2k/tests/testData/ast/nullability/MethodReturnsNullInLocalClass.java.todo

@@ -0,0 +1,10 @@
+//file
+class C {
+    String foo() {
+        class Local {
+            String foo() { return null; }
+        };
+        new Local().foo();
+        return "";
+    }
+}

j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.java

@@ -1,6 +1,6 @@
 //file
 class C {
     String foo(boolean b) {
-        return b ? "abc" : null
+        return b ? "abc" : null;
     }
 }

j2k/tests/testData/ast/nullability/ParameterComparedWithNull.java

@@ -1,6 +1,6 @@
 //method
 void foo(String s) {
   if (s != null) {
-      zoo(s)
+      zoo(s);
   }
 }

j2k/tests/testData/ast/nullability/VariableAssignedWithNull.java

@@ -3,6 +3,6 @@
 void foo(boolean b) {
   String s = "abc";
   if (b) {
-      s = null
+      s = null;
   }
 }

j2k/tests/testData/ast/nullability/VariableComparedWithNull.java

@@ -1,8 +1,8 @@
 //method
 // !specifyLocalVariableTypeByDefault: true
 void foo() {
-  String s = bar()
+  String s = bar();
   if (s != null) {
-      zoo(s)
+      zoo(s);
   }
 }

j2k/tests/testData/ast/nullability/VariableInitializedWithNull.java

@@ -3,6 +3,6 @@
 void foo(boolean b) {
   String s = null;
   if (b) {
-      s = "abc"
+      s = "abc";
   }
 }