From a5aaa3dadc29826c61a476e17114568bda84c042 Mon Sep 17 00:00:00 2001
From: Svetlana Isakova <svetlana.isakova@jetbrains.com>
Date: Tue, 14 Aug 2012 19:13:31 +0400
Subject: [PATCH] remove java's Iterator,Iterable from java script mirror to
 java standard library

---
 js/js.libraries/src/core/javalang.kt |  6 ------
 js/js.libraries/src/core/javautil.kt | 11 ++---------
 2 files changed, 2 insertions(+), 15 deletions(-)

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<T> {
-    public fun iterator() : java.util.Iterator<T> = 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<T> {
     fun compare(obj1 : T, obj2 : T) : Int;
 }
 
-library
-public trait Iterator<T> {
-    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<E>: Iterable<E> {
     open public fun size(): Int
     open public fun isEmpty(): Boolean
     open public fun contains(o: Any?): Boolean
-    override public fun iterator(): java.util.Iterator<E>
+    override public fun iterator(): Iterator<E>
     public fun toArray(): Array<E>
     // open public fun toArray<T>(a : Array<out T>) : Array<T>
     open public fun add(e: E): Boolean
@@ -40,7 +33,7 @@ public abstract class AbstractCollection<E>() : Collection<E> {
 
     override public fun isEmpty(): Boolean = js.noImpl
     override public fun contains(o: Any?): Boolean = js.noImpl
-    override public fun iterator(): java.util.Iterator<E> = js.noImpl
+    override public fun iterator(): Iterator<E> = js.noImpl
 
     override public fun add(e: E): Boolean = js.noImpl
     override public fun remove(o: Any?): Boolean = js.noImpl