diff --git a/js/js.libraries/src/core/javalang.kt b/js/js.libraries/src/core/javalang.kt index c27193b5412..ecbf2ebead4 100644 --- a/js/js.libraries/src/core/javalang.kt +++ b/js/js.libraries/src/core/javalang.kt @@ -1,14 +1,8 @@ package java.lang import java.io.IOException -import java.util.Iterator import js.library -library -public trait Iterable { - public fun iterator() : java.util.Iterator = js.noImpl -} - library open public class Exception() : Throwable() {} diff --git a/js/js.libraries/src/core/javautil.kt b/js/js.libraries/src/core/javautil.kt index a3123bc288c..cb796f9da76 100644 --- a/js/js.libraries/src/core/javautil.kt +++ b/js/js.libraries/src/core/javautil.kt @@ -10,19 +10,12 @@ public trait Comparator { fun compare(obj1 : T, obj2 : T) : Int; } -library -public trait Iterator { - open public fun next() : T = js.noImpl - open public fun hasNext() : Boolean = js.noImpl - open public fun remove() : Unit = js.noImpl -} - library public trait Collection: Iterable { open public fun size(): Int open public fun isEmpty(): Boolean open public fun contains(o: Any?): Boolean - override public fun iterator(): java.util.Iterator + override public fun iterator(): Iterator public fun toArray(): Array // open public fun toArray(a : Array) : Array open public fun add(e: E): Boolean @@ -40,7 +33,7 @@ public abstract class AbstractCollection() : Collection { override public fun isEmpty(): Boolean = js.noImpl override public fun contains(o: Any?): Boolean = js.noImpl - override public fun iterator(): java.util.Iterator = js.noImpl + override public fun iterator(): Iterator = js.noImpl override public fun add(e: E): Boolean = js.noImpl override public fun remove(o: Any?): Boolean = js.noImpl