From 040d1693e8c3d4270cbcaf978acedf97a02fcbf8 Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Thu, 18 Sep 2014 16:00:20 +0400
Subject: [PATCH] Minor: revert semicolons after package declaration for java
 parts inside kt file.

---
 .../accidentalOverrides/phantomClashWithSamAdapter.kt         | 4 ++--
 .../testData/diagnostics/tests/generics/PseudoRawTypes.kt     | 4 ++--
 compiler/testData/diagnostics/tests/j+k/Simple.kt             | 2 +-
 compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt      | 2 +-
 .../diagnostics/tests/j+k/innerNestedClassFromJava.kt         | 2 +-
 .../tests/j+k/invisiblePackagePrivateInheritedMember.kt       | 4 ++--
 compiler/testData/diagnostics/tests/j+k/kt1402.kt             | 2 +-
 compiler/testData/diagnostics/tests/j+k/kt1431.kt             | 2 +-
 compiler/testData/diagnostics/tests/j+k/kt2890.kt             | 2 +-
 compiler/testData/diagnostics/tests/j+k/mutableIterator.kt    | 2 +-
 .../diagnostics/tests/j+k/packagePrivateClassStaticMember.kt  | 2 +-
 compiler/testData/diagnostics/tests/j+k/packageVisibility.kt  | 2 +-
 .../diagnostics/tests/j+k/privateNestedClassStaticMember.kt   | 2 +-
 .../diagnostics/tests/j+k/protectedStaticSamePackage.kt       | 2 +-
 .../diagnostics/tests/j+k/samInConstructorWithGenerics.kt     | 4 ++--
 .../tests/namedArguments/disallowForSamAdapterConstructor.kt  | 2 +-
 .../tests/namedArguments/disallowForSamAdapterFunction.kt     | 2 +-
 .../testData/diagnostics/tests/recovery/namelessInJava.kt     | 2 +-
 compiler/testData/diagnostics/tests/scopes/kt1942.kt          | 2 +-
 19 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.kt
index 66c67af328e..18fc072e7d6 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.kt
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.kt
@@ -1,7 +1,7 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: p/Sam.java
 
-package p
+package p;
 
 public interface Sam {
     void sam();
@@ -9,7 +9,7 @@ public interface Sam {
 
 // FILE: p/Foo.java
 
-package p
+package p;
 
 public class Foo {
     public void foo(Sam sam);
diff --git a/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.kt b/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.kt
index c08572c84b9..4716ee25328 100644
--- a/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.kt
+++ b/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.kt
@@ -1,12 +1,12 @@
 // FILE: java/util/Collection.java
-package java.util
+package java.util;
 
 public class Collection {
   public void foo() {}
 }
 
 // FILE: test/Usage.java
-package test
+package test;
 
 import java.util.*;
 
diff --git a/compiler/testData/diagnostics/tests/j+k/Simple.kt b/compiler/testData/diagnostics/tests/j+k/Simple.kt
index b2b4c576b0f..c82f272c811 100644
--- a/compiler/testData/diagnostics/tests/j+k/Simple.kt
+++ b/compiler/testData/diagnostics/tests/j+k/Simple.kt
@@ -1,5 +1,5 @@
 // FILE: aa/A.java
-package aa
+package aa;
 
 public class A {
     public void f() { }
diff --git a/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt b/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt
index ef5d0db1fae..d5fbdaf7186 100644
--- a/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt
+++ b/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt
@@ -1,5 +1,5 @@
 // FILE: a/Test.java
-package a
+package a;
 
 public class Test<T> {
   T t() {return null;}
diff --git a/compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.kt b/compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.kt
index b947abf915d..d7554c04d75 100644
--- a/compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.kt
+++ b/compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.kt
@@ -1,5 +1,5 @@
 // FILE: a/M.java
-package a
+package a;
 
 public class M {
     public class Inner {
diff --git a/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.kt b/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.kt
index c38d85bc119..6e5c5b08aa5 100644
--- a/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.kt
+++ b/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.kt
@@ -1,12 +1,12 @@
 // FILE: a/M.java
-package a
+package a;
 
 public class M {
     int m;
 }
 
 // FILE: b/F.java
-package b
+package b;
 
 import a.M;
 
diff --git a/compiler/testData/diagnostics/tests/j+k/kt1402.kt b/compiler/testData/diagnostics/tests/j+k/kt1402.kt
index 4ebf694794a..40e71ec651e 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt1402.kt
+++ b/compiler/testData/diagnostics/tests/j+k/kt1402.kt
@@ -1,5 +1,5 @@
 // FILE: a/M.java
-package a
+package a;
 
 public class M {
     public static class Inner {
diff --git a/compiler/testData/diagnostics/tests/j+k/kt1431.kt b/compiler/testData/diagnostics/tests/j+k/kt1431.kt
index 27c5d9161be..98384d3efeb 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt1431.kt
+++ b/compiler/testData/diagnostics/tests/j+k/kt1431.kt
@@ -1,6 +1,6 @@
 //FILE: a/C.java
 // KT-1431 StackOverflowException in IDE when using JavaFX builders
-package a
+package a;
 
 public class C<B extends C<B>> {
     public static C<?> create() { return null; }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2890.kt b/compiler/testData/diagnostics/tests/j+k/kt2890.kt
index 1c33950ab31..896834b93ce 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2890.kt
+++ b/compiler/testData/diagnostics/tests/j+k/kt2890.kt
@@ -1,5 +1,5 @@
 //FILE:_03_collections/CollectionTest.java
-package _03_collections
+package _03_collections;
 
 import java.util.List;
 
diff --git a/compiler/testData/diagnostics/tests/j+k/mutableIterator.kt b/compiler/testData/diagnostics/tests/j+k/mutableIterator.kt
index eeb873fdcd0..9f24f78c48c 100644
--- a/compiler/testData/diagnostics/tests/j+k/mutableIterator.kt
+++ b/compiler/testData/diagnostics/tests/j+k/mutableIterator.kt
@@ -1,5 +1,5 @@
 //FILE:a/JC.java
-package a
+package a;
 
 import java.util.Iterator;
 
diff --git a/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.kt b/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.kt
index 07315f94d9e..b93b076994c 100644
--- a/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.kt
+++ b/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.kt
@@ -2,7 +2,7 @@
 
 // FILE: foo/Bar.java
 
-package foo
+package foo;
 
 class Bar {
     static void baz() {}
diff --git a/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt b/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt
index 66aaa752109..6fe2702aa13 100644
--- a/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt
+++ b/compiler/testData/diagnostics/tests/j+k/packageVisibility.kt
@@ -1,5 +1,5 @@
 //FILE: a/MyJavaClass.java
-package a
+package a;
 
 class MyJavaClass {
     static int staticMethod() {
diff --git a/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt b/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt
index f3a4f456628..1abe80f449d 100644
--- a/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt
+++ b/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.kt
@@ -2,7 +2,7 @@
 
 // FILE: javaPackage/Foo.java
 
-package javaPackage
+package javaPackage;
 
 public class Foo {
     private static class Bar {
diff --git a/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.kt b/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.kt
index 2fce215fd6c..e51d7bc5689 100644
--- a/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.kt
+++ b/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.kt
@@ -1,6 +1,6 @@
 // FILE: test/JavaClass.java
 
-package test
+package test;
 
 public class JavaClass {
     protected static int field;
diff --git a/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.kt b/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.kt
index 63be502b865..23923ac11d8 100644
--- a/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.kt
+++ b/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.kt
@@ -1,12 +1,12 @@
 // FILE: j/OnSubscribe.java
-package j
+package j;
 
 public interface OnSubscribe<T> {
     void f();
 }
 
 // FILE: j/Observable.java
-package j
+package j;
 
 public class Observable<T> {
 
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt
index 60fa65281c8..8e681d78d2f 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt
@@ -1,6 +1,6 @@
 // FILE: test/J.java
 
-package test
+package test;
 
 public class J {
     public J(String s, Runnable r, Boolean z) {
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt
index 7a62fe7d22f..f1c57739a06 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt
@@ -1,6 +1,6 @@
 // FILE: test/J.java
 
-package test
+package test;
 
 public class J {
     public static void foo(String s, Runnable r, Boolean z) {
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessInJava.kt b/compiler/testData/diagnostics/tests/recovery/namelessInJava.kt
index 613f3d1cd2e..3110d8d69e7 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessInJava.kt
+++ b/compiler/testData/diagnostics/tests/recovery/namelessInJava.kt
@@ -1,6 +1,6 @@
 // FILE: p/Nameless.java
 
-package p
+package p;
 
 public class Nameless {
     void () {}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1942.kt b/compiler/testData/diagnostics/tests/scopes/kt1942.kt
index d7184d3860b..3dd654104cd 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1942.kt
+++ b/compiler/testData/diagnostics/tests/scopes/kt1942.kt
@@ -1,6 +1,6 @@
 //FILE:a/C.java
 //KT-1942 Package local members from Java are visible in subclasses
-package a
+package a;
 
 public class C {
     int myValue;