azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move inner trait out of the class object

Browse Source
This commit is contained in:
Andrey Breslav
2012-01-31 14:49:47 +04:00
parent 1bca00ea96
commit 67d6bb9038
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jdk-headers/src/java/util/AbstractMap.kt
-2
View File
@@ -1,7 +1,5 @@
package java.util 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 { 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 size() : Int {}
override public fun isEmpty() : Boolean {} override public fun isEmpty() : Boolean {}
jdk-headers/src/java/util/Map.kt
+5 -7
View File
@@ -12,17 +12,15 @@ public trait Map<erased K, erased V> {
open fun clear() : Unit open fun clear() : Unit
open fun keySet() : java.util.Set<K> open fun keySet() : java.util.Set<K>
open fun values() : java.util.Collection<V> 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 equals(o : Any?) : Boolean
// open fun hashCode() : Int // open fun hashCode() : Int
class object { trait Entry<K, V> {
trait Entry<K, V> { open fun getKey() : K
open fun getKey() : K open fun getValue() : V
open fun getValue() : V open fun setValue(value : V) : V
open fun setValue(value : V) : V
// open fun equals(o : Any?) : Boolean // open fun equals(o : Any?) : Boolean
// open fun hashCode() : Int // open fun hashCode() : Int
}
} }
} }