From 67d6bb9038ad65053acde73fd44e8f1b1202416e Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 31 Jan 2012 14:49:47 +0400
Subject: [PATCH] Move inner trait out of the class object

---
 jdk-headers/src/java/util/AbstractMap.kt |  2 --
 jdk-headers/src/java/util/Map.kt         | 12 +++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/jdk-headers/src/java/util/AbstractMap.kt b/jdk-headers/src/java/util/AbstractMap.kt
index 98e17b74b72..a235b545570 100644
--- a/jdk-headers/src/java/util/AbstractMap.kt
+++ b/jdk-headers/src/java/util/AbstractMap.kt
@@ -1,7 +1,5 @@
 package java.util
 
-import java.util.Map.Entry
-
 abstract public open class AbstractMap<erased K, erased V> protected () : java.util.Map<K, V>, java.lang.Object {
     override public fun size() : Int {}
     override public fun isEmpty() : Boolean {}
diff --git a/jdk-headers/src/java/util/Map.kt b/jdk-headers/src/java/util/Map.kt
index fc28c9fe226..13d7e09bcaa 100644
--- a/jdk-headers/src/java/util/Map.kt
+++ b/jdk-headers/src/java/util/Map.kt
@@ -12,17 +12,15 @@ public trait Map<erased K, erased V> {
     open fun clear() : Unit
     open fun keySet() : java.util.Set<K>
     open fun values() : java.util.Collection<V>
-    open fun entrySet() : java.util.Set<java.util.Map.Entry<K, V>>
+    open fun entrySet() : java.util.Set<Entry<K, V>>
 //    open fun equals(o : Any?) : Boolean
 //    open fun hashCode() : Int
 
-    class object {
-        trait Entry<K, V> {
-            open fun getKey() : K
-            open fun getValue() : V
-            open fun setValue(value : V) : V
+    trait Entry<K, V> {
+        open fun getKey() : K
+        open fun getValue() : V
+        open fun setValue(value : V) : V
 //            open fun equals(o : Any?) : Boolean
 //            open fun hashCode() : Int
-        }
     }
 }
\ No newline at end of file