Reverted explicitly specifying visibility modifier while override

compiler/testData/codegen/classes/classObjectInterface.jet

@@ -2,7 +2,7 @@ class C() {
   fun getInstance(): Runnable = C
 
   class object: Runnable {
-    public override fun run(): Unit { }
+    override fun run(): Unit { }
   }
 }
 

compiler/testData/codegen/controlStructures/forUserType.jet

@@ -78,25 +78,25 @@ fun box() : String {
 }
 
 class MyCollection1(): java.lang.Iterable<Int> {
-    public override fun iterator(): java.util.Iterator<Int> = MyIterator()
+    override fun iterator(): java.util.Iterator<Int> = MyIterator()
 
     class MyIterator(): java.util.Iterator<Int> {
         var k : Int = 5
 
-        public override fun next() : Int = k--
-        public override fun hasNext() = k > 0
-        public override fun remove() {}
+        override fun next() : Int = k--
+        override fun hasNext() = k > 0
+        override fun remove() {}
     }
 }
 
 class MyCollection2(): Iterable<Int> {
-    public override fun iterator(): Iterator<Int> = MyIterator()
+    override fun iterator(): Iterator<Int> = MyIterator()
 
     class MyIterator(): Iterator<Int> {
         var k : Int = 5
 
-        public override fun next() : Int = k--
-        public override val hasNext : Boolean
+        override fun next() : Int = k--
+        override val hasNext : Boolean
           get() = k > 0
     }
 }

compiler/testData/codegen/controlStructures/sync.jet

@@ -3,7 +3,7 @@ import java.util.concurrent.atomic.*
 
 fun thread(block: ()->Unit ) {
     val thread = object: Thread() {
-        public override fun run() {
+        override fun run() {
             block()
         }
     }

compiler/testData/codegen/objects/objectLiteral.jet

@@ -1,7 +1,7 @@
 class C(x: Int, val y : Int) {
   fun initChild(var x: Int) : java.lang.Object {
     return object : java.lang.Object() {
-      public override fun toString(): String? {
+      override fun toString(): String? {
           x = x + y
           return "child" + x
       }

compiler/testData/codegen/objects/objectLiteralInClosure.jet

@@ -3,7 +3,7 @@ package p
 class C(val y : Int) {
   val initChild = { ->
     object : java.lang.Object() {
-      public override fun toString(): String {
+      override fun toString(): String {
           return "child" + y
       }
     }

compiler/testData/codegen/regressions/kt1136.kt

@@ -2,7 +2,7 @@ import java.util.ArrayList
 
 public object SomeObject {
     private val workerThread = object : Thread() {
-        public override fun run() {
+        override fun run() {
             foo()
         }
     }

compiler/testData/codegen/regressions/kt1157.kt

@@ -2,7 +2,7 @@ public object SomeClass {
     var bug: Any = ""
 
     private val workerThread = object : Thread() {
-        public override fun run() {
+        override fun run() {
             try {
               foo()
               bug = "none"

compiler/testData/codegen/regressions/kt1159.kt

@@ -1,6 +1,6 @@
 public object RefreshQueue {
     private val workerThread: Thread = Thread(object : Runnable {
-        public override fun run() {
+        override fun run() {
             workerThread.isInterrupted()
         }
     });

compiler/testData/codegen/regressions/kt1168.kt

@@ -7,9 +7,9 @@ public abstract class BaseClass() {
 }
 
 public class Subclass : BaseClass() {
-    protected override val kind : String = "Physical"
+    override val kind : String = "Physical"
 
-    protected override val kind2 : String = " kind2"
+    override val kind2 : String = " kind2"
 }
 
 fun box():String = if(Subclass().debug() == "Physical kind2") "OK" else "fail"

compiler/testData/codegen/regressions/kt299.jet

@@ -1,5 +1,5 @@
 class MyRange1() : Range<Int> {
-    public override fun contains(item: Int) = true
+    override fun contains(item: Int) = true
 }
 
 class MyRange2() {

compiler/testData/codegen/regressions/kt344.jet

@@ -163,7 +163,7 @@ fun t11(var x: Int) : Int {
 fun t12(x: Int) : Int {
     var y = x
     val runnable = object : Runnable {
-        public override fun run () {
+        override fun run () {
             y = y + 1
         }
     }

compiler/testData/codegen/regressions/kt533.kt

@@ -95,11 +95,11 @@ fun LinkedList<Int>.sum(f : (Int, Int) -> Int) : Int {
 }
 
 fun <T> List<T>.backwards() : Iterable<T> = object : Iterable<T> {
-  public override fun iterator() : jet.Iterator<T> =
+  override fun iterator() : jet.Iterator<T> =
       object : jet.Iterator<T> {
           var current = size()
-          public override fun next() : T = get(--current)
-          public override val hasNext : Boolean get() = current > 0
+          override fun next() : T = get(--current)
+          override val hasNext : Boolean get() = current > 0
       }
 }
 

compiler/testData/codegen/regressions/kt887.jet

@@ -1,5 +1,5 @@
 class Book(val name: String) : Comparable<Book> {
-  public override fun compareTo(other: Book) = name.compareTo(other.name)
+  override fun compareTo(other: Book) = name.compareTo(other.name)
 }
 
 fun box() = if(Book("239").compareTo(Book("932")) != 0) "OK" else "fail"

compiler/testData/codegen/regressions/kt940.kt

@@ -3,13 +3,13 @@ import java.util.*
 fun box() : String {
     val w = object : Comparator<String?> {
 
-        public override fun compare(o1 : String?, o2 : String?) : Int {
+        override fun compare(o1 : String?, o2 : String?) : Int {
             val l1 : Int = o1?.length ?: 0
             val l2 = o2?.length ?: 0
             return l1 - l2
         }
 
-         public override fun equals(obj: Any?): Boolean = obj === this
+         override fun equals(obj: Any?): Boolean = obj === this
     }
 
     w.compare("aaa", "bbb")

compiler/testData/codegen/super/basicmethodSuperClass.jet

@@ -1,7 +1,7 @@
 import java.util.ArrayList
 
 class N() : ArrayList<Any>() {
-    public override fun add(el: Any)  : Boolean {
+    override fun add(el: Any)  : Boolean {
         if (!super<ArrayList>.add(el)) {
             throw Exception()
         }

compiler/testData/codegen/traits/simple.jet

@@ -3,7 +3,7 @@ trait SimpleClass : java.lang.Object {
 }
 
 class SimpleClassImpl() : SimpleClass {
-   public override fun toString() = "SimpleClassImpl"
+   override fun toString() = "SimpleClassImpl"
 }
 
 fun box() : String {

compiler/testData/codegen/traits/stdlib.jet

@@ -3,7 +3,7 @@ trait ISized {
 }
 
 trait javaUtilIterator<T> : java.util.Iterator<T> {
-    public override fun remove() : Unit {
+    override fun remove() : Unit {
         throw UnsupportedOperationException()
     }
 }
@@ -11,9 +11,9 @@ trait javaUtilIterator<T> : java.util.Iterator<T> {
 class MyIterator<T>(val array : ReadOnlyArray<T>) : javaUtilIterator<T> {
     private var index = 0
 
-    public override fun hasNext() : Boolean = index < array.size
+    override fun hasNext() : Boolean = index < array.size
 
-    public override fun next() : T = array.get(index++)
+    override fun next() : T = array.get(index++)
 }
 
 trait ReadOnlyArray<out T> : ISized, java.lang.Iterable<T> {
@@ -23,7 +23,7 @@ trait ReadOnlyArray<out T> : ISized, java.lang.Iterable<T> {
     fun check(v: Any) =  v is T
   }
 
-  public override fun iterator() : java.util.Iterator<T> = MyIterator<T>(this)
+  override fun iterator() : java.util.Iterator<T> = MyIterator<T>(this)
 }
 
 trait WriteOnlyArray<in T> : ISized {

compiler/testData/diagnostics/tests/PrimaryConstructors.jet

@@ -1,4 +1,3 @@
-
 class X {
   val <!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>x<!> : Int
 }
@@ -18,12 +17,12 @@ class Z : Y() {
 
 class MyIterable<T> : Iterable<T>
 {
-    public override fun iterator(): Iterator<T>  = MyIterator()
+    override fun iterator(): Iterator<T>  = MyIterator()
 
     class MyIterator : Iterator<T>
     {
-        public override val hasNext: Boolean = false
-        public override fun next(): T {
+        override val hasNext: Boolean = false
+        override fun next(): T {
             throw UnsupportedOperationException()
         }
     }

compiler/testData/diagnostics/tests/extensions/GenericIterator.jet

@@ -1,10 +1,10 @@
 import java.util.Enumeration
 
 inline fun <T> java.util.Enumeration<T>.iterator() = object: Iterator<T> {
-  public override val hasNext: Boolean
+  override val hasNext: Boolean
     get() = hasMoreElements()
 
-  public override fun next() = nextElement()
+  override fun next() = nextElement()
 }
 
 fun <T : Any> T?.iterator() = object {

compiler/testData/diagnostics/tests/regressions/kt588.jet

@@ -6,7 +6,7 @@ class Test() : Thread("Test") {
 
         }
     }
-    public override fun run() {
+    override fun run() {
         init2()      // unresolved
         Test.init2() // ok
     }

libraries/kunit/src/main/kotlin/junit/JUnit.kt

@@ -4,23 +4,23 @@ import kotlin.test.Asserter
 import org.junit.Assert
 
 class JUnitAsserter : Asserter {
-    public override fun assertEquals(message : String, expected : Any?, actual : Any?) {
+    override fun assertEquals(message : String, expected : Any?, actual : Any?) {
         Assert.assertEquals(message, expected, actual)
     }
 
-    public override fun assertNotNull(message : String, actual : Any?) {
+    override fun assertNotNull(message : String, actual : Any?) {
         Assert.assertNotNull(message, actual)
     }
 
-    public override fun assertNull(message : String, actual : Any?) {
+    override fun assertNull(message : String, actual : Any?) {
         Assert.assertNull(message, actual)
     }
 
-    public override fun assertTrue(message : String, actual : Boolean) {
+    override fun assertTrue(message : String, actual : Boolean) {
         Assert.assertTrue(message, actual)
     }
 
-    public override fun fail(message : String) {
+    override fun fail(message : String) {
         Assert.fail(message)
     }
 }

libraries/stdlib/src/kotlin/Standard.kt

@@ -25,7 +25,7 @@ public inline fun <T> java.util.Iterator<T>.iterator() : java.util.Iterator<T> =
 Helper to make java.util.Enumeration usable in for
 */
 public fun <erased T> java.util.Enumeration<T>.iterator(): Iterator<T> = object: Iterator<T> {
-    public override val hasNext: Boolean
+    override val hasNext: Boolean
     get() = hasMoreElements()
 
     public override fun next() : T = nextElement().sure()
@@ -114,4 +114,4 @@ public inline fun Throwable.printStackTrace(writer: PrintWriter): Unit {
 public inline fun Throwable.printStackTrace(stream: PrintStream): Unit {
     val jlt = this as java.lang.Throwable
     jlt.printStackTrace(stream)
-}
+}

libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt

@@ -35,15 +35,15 @@ abstract class FunctionalList<T>(public val size: Int) {
             return head
         }
 
-        public override val hasNext: Boolean
+        override val hasNext: Boolean
         get() = !cur.empty
     }
 
     class object {
         class Empty<T>() : FunctionalList<T>(0) {
-            public override val head: T
+            override val head: T
             get() = throw java.util.NoSuchElementException()
-            public override val tail: FunctionalList<T>
+            override val tail: FunctionalList<T>
             get() = throw java.util.NoSuchElementException()
         }
 

libraries/stdlib/src/kotlin/dom/Dom.kt

@@ -201,7 +201,7 @@ fun Node.nextSiblings() : Iterator<Node> = NextSiblingIterator(this)
 
 class NextSiblingIterator(var node: Node) : AbstractIterator<Node>() {
 
-    protected override fun computeNext(): Unit {
+    override fun computeNext(): Unit {
         val next = node.getNextSibling()
         if (next != null) {
             setNext(next)
@@ -215,7 +215,7 @@ fun Node.previousSiblings() : Iterator<Node> = PreviousSiblingIterator(this)
 
 class PreviousSiblingIterator(var node: Node) : AbstractIterator<Node>() {
 
-    protected override fun computeNext(): Unit {
+    override fun computeNext(): Unit {
         val next = node.getPreviousSibling()
         if (next != null) {
             setNext(next)
@@ -323,7 +323,7 @@ fun NodeList?.toXmlString(xmlDeclaration: Boolean = false): String {
 }
 
 class NodeListAsList(val nodeList: NodeList): AbstractList<Node>() {
-    public override fun get(index: Int): Node {
+    override fun get(index: Int): Node {
         val node = nodeList.item(index)
         if (node == null) {
             throw IndexOutOfBoundsException("NodeList does not contain a node at index: " + index)
@@ -332,11 +332,11 @@ class NodeListAsList(val nodeList: NodeList): AbstractList<Node>() {
         }
     }
 
-    public override fun size(): Int = nodeList.getLength()
+    override fun size(): Int = nodeList.getLength()
 }
 
 class ElementListAsList(val nodeList: NodeList): AbstractList<Element>() {
-    public override fun get(index: Int): Element {
+    override fun get(index: Int): Element {
         val node = nodeList.item(index)
         if (node is Element) {
             return node
@@ -349,7 +349,7 @@ class ElementListAsList(val nodeList: NodeList): AbstractList<Element>() {
         }
     }
 
-    public override fun size(): Int = nodeList.getLength()
+    override fun size(): Int = nodeList.getLength()
 
 }
 

libraries/stdlib/src/kotlin/io/JIO.kt

@@ -172,7 +172,7 @@ public inline fun <T: Closeable, R> T.use(block: (T)-> R) : R {
 /** Returns an [Iterator] of bytes over an input stream */
 public fun InputStream.iterator() : ByteIterator =
 object: ByteIterator() {
-    public override val hasNext : Boolean
+    override val hasNext : Boolean
     get() = available() > 0
 
     public override fun nextByte() : Byte = read().toByte()
@@ -238,7 +238,7 @@ class LineIterator(val reader: BufferedReader) : Iterator<String> {
     private var nextValue: String? = null
     private var done = false
 
-    public override val hasNext: Boolean
+    override val hasNext: Boolean
     get() {
         if (nextValue == null && !done) {
             nextValue = reader.readLine()

libraries/stdlib/src/kotlin/support/AbstractIterator.kt

@@ -17,7 +17,7 @@ public abstract class AbstractIterator<T>: java.util.Iterator<T> {
     private var state: State = State.NotReady
     private var next: T? = null
 
-    public override fun hasNext(): Boolean {
+    override fun hasNext(): Boolean {
         require(state != State.Failed)
         return when (state) {
             State.Done -> false
@@ -26,13 +26,13 @@ public abstract class AbstractIterator<T>: java.util.Iterator<T> {
         }
     }
 
-    public override fun next(): T {
+    override fun next(): T {
         if (!hasNext()) throw NoSuchElementException()
         state = State.NotReady
         return next.sure()
     }
 
-    public override fun remove() {
+    override fun remove() {
         throw UnsupportedOperationException()
     }
 

libraries/stdlib/test/CollectionTest.kt

@@ -389,7 +389,7 @@ class CollectionTest {
     class IterableWrapper<T>(collection : java.lang.Iterable<T>) : java.lang.Iterable<T> {
         private val collection = collection
 
-        public override fun iterator(): java.util.Iterator<T> {
+        override fun iterator(): java.util.Iterator<T> {
             return collection.iterator().sure()
         }
     }

libraries/stdlib/test/CompareTest.kt

@@ -43,10 +43,10 @@ class CompareTest {
 
     Test fun sortUsingCustomComparator() {
         val c = object : Comparator<Item>{
-            public override fun compare(o1: Item?, o2: Item?): Int {
+            override fun compare(o1: Item?, o2: Item?): Int {
                 return compareBy(o1, o2, {(it: Item) -> it.name}, {(it: Item) -> it.rating})
             }
-            public override fun equals(obj: Any?): Boolean {
+            override fun equals(obj: Any?): Boolean {
                 return this == obj
             }
         }

libraries/stdlib/test/Test.kt

@@ -17,13 +17,13 @@ class TestBuilt<T>(name: String, val builder: TestBuilder<T>, val test: TestBuil
         get() = myState.sure()
         set(newState: T) { myState = newState }
 
-    public override fun countTestCases(): Int = 1
+    override fun countTestCases(): Int = 1
 
-    protected override fun setUp() = this.(builder.setUp)()
+    override fun setUp() = this.(builder.setUp)()
 
-    protected override fun tearDown() = this.(builder.tearDown)()
+    override fun tearDown() = this.(builder.tearDown)()
 
-    protected override fun runTest() = this.(test)()
+    override fun runTest() = this.(test)()
 }
 
 open class TestBuilder<T>(name: String) {

libraries/stdlib/test/concurrent/SerialFunAndTupleTest.kt

@@ -10,7 +10,7 @@ import junit.framework.TestCase
 import junit.framework.Assert
 
 class Serial(val a : String) : java.lang.Object(), Serializable {
-    public override fun toString() = a
+    override fun toString() = a
 }
 
 class SerialTest() : TestCase() {

libraries/stdlib/test/properties/PropertiesTest.kt

@@ -28,7 +28,7 @@ class Customer() : ChangeSupport() {
 class MyChangeListener() : ChangeListener {
     val events = ArrayList<ChangeEvent>()
 
-    public override fun onPropertyChange(event: ChangeEvent): Unit {
+    override fun onPropertyChange(event: ChangeEvent): Unit {
         println("Property changed: $event")
         events.add(event)
     }