From 592b0e9c37bdedc28de1be2c2bf91423a32eef9a Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 3 Jul 2012 21:36:04 +0400 Subject: [PATCH] Specify visibility in some files in jslibs --- js/js.libraries/src/core/javalang.kt | 14 +++++++------- js/js.libraries/src/core/javautil.kt | 12 ++++++------ js/js.libraries/src/junit/core.kt | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/js/js.libraries/src/core/javalang.kt b/js/js.libraries/src/core/javalang.kt index 8d05e318787..4f35357e6f4 100644 --- a/js/js.libraries/src/core/javalang.kt +++ b/js/js.libraries/src/core/javalang.kt @@ -5,8 +5,8 @@ import java.util.Iterator import js.library library -trait Iterable { - fun iterator() : java.util.Iterator = js.noImpl +public trait Iterable { + public fun iterator() : java.util.Iterator = js.noImpl } library @@ -32,15 +32,15 @@ public class NumberFormatException(message: String = "") : Exception() {} library public trait Runnable { - open fun run() : Unit; + public open fun run() : Unit; } public trait Comparable { - fun compareTo(that: T): Int + public fun compareTo(that: T): Int } public trait Appendable { - open fun append(csq: CharSequence?): Appendable? - open fun append(csq: CharSequence?, start: Int, end: Int): Appendable? - open fun append(c: Char): Appendable? + public open fun append(csq: CharSequence?): Appendable? + public open fun append(csq: CharSequence?, start: Int, end: Int): Appendable? + public open fun append(c: Char): Appendable? } diff --git a/js/js.libraries/src/core/javautil.kt b/js/js.libraries/src/core/javautil.kt index 4d517118c95..3323285902d 100644 --- a/js/js.libraries/src/core/javautil.kt +++ b/js/js.libraries/src/core/javautil.kt @@ -17,13 +17,13 @@ public trait Iterator { open public fun remove() : Unit = js.noImpl } -val Collections = object { +public object Collections { library("collectionsMax") public fun max(col : Collection, comp : Comparator) : T = js.noImpl // TODO should be immutable! - private val emptyList = ArrayList() - private val emptyMap = HashMap() + public val emptyList: List = ArrayList() + public val emptyMap: Map = HashMap() public val EMPTY_LIST: List get() = emptyList() @@ -142,7 +142,7 @@ public trait Map { // open public fun equals(o : Any?) : Boolean // open public fun hashCode() : Int - trait Entry { + public trait Entry { open public fun getKey() : K open public fun getValue() : V open public fun setValue(value : V) : V @@ -191,6 +191,6 @@ public class NoSuchElementException() : Exception() {} library public trait Enumeration { - open fun hasMoreElements() : Boolean - open fun nextElement() : E + open public fun hasMoreElements() : Boolean + open public fun nextElement() : E } \ No newline at end of file diff --git a/js/js.libraries/src/junit/core.kt b/js/js.libraries/src/junit/core.kt index 09964020077..5d9b66e5028 100644 --- a/js/js.libraries/src/junit/core.kt +++ b/js/js.libraries/src/junit/core.kt @@ -1,5 +1,5 @@ package org.junit; native -annotation class Test(name : String = "") {} +public annotation class Test(name : String = "") {}