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

Don't put two superclasses on the supertype list

Browse Source
This commit is contained in:
Andrey Breslav
2012-01-31 15:12:23 +04:00
parent 67d6bb9038
commit b9bebb3ad4
9 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jdk-headers/src/java/util/AbstractCollection.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package java.util
abstract public open class AbstractCollection<erased E> protected () : java.util.Collection<E>, java.lang.Object {
abstract public open class AbstractCollection<erased E> protected () : java.util.Collection<E> {
abstract override public fun iterator() : java.util.Iterator<E>
abstract override public fun size() : Int
override public fun isEmpty() : Boolean {}
jdk-headers/src/java/util/AbstractMap.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package java.util
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> {
override public fun size() : Int {}
override public fun isEmpty() : Boolean {}
override public fun containsValue(value : Any?) : Boolean {}
jdk-headers/src/java/util/AbstractSequentialList.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package java.util
abstract public open class AbstractSequentialList<erased E> protected () : java.util.AbstractList<E>(), java.lang.Object {
abstract public open class AbstractSequentialList<erased E> protected () : java.util.AbstractList<E>() {
override public fun get(index : Int) : E {}
override public fun set(index : Int, element : E) : E {}
override public fun add(index : Int, element : E) : Unit {}
jdk-headers/src/java/util/AbstractSet.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package java.util
abstract public open class AbstractSet<erased E> protected () : java.util.AbstractCollection<E>(), java.util.Set<E>, java.lang.Object {
abstract public open class AbstractSet<erased E> protected () : java.util.AbstractCollection<E>(), java.util.Set<E> {
// override public fun equals(o : Any?) : Boolean
// override public fun hashCode() : Int
override public fun removeAll(c : java.util.Collection<*>) : Boolean {}
jdk-headers/src/java/util/HashMap.kt
+1 -2
View File
@@ -3,8 +3,7 @@ import java.io.*
public open class HashMap<erased K, erased V>(m : java.util.Map<out K, out V>) : java.util.AbstractMap<K, V>(),
java.util.Map<K, V>,
java.lang.Cloneable,
java.io.Serializable,
java.lang.Object {
java.io.Serializable {
public this() {}
public this(initialCapacity : Int) {}
public this(initialCapacity : Int, loadFactor : Float) {}
jdk-headers/src/java/util/HashSet.kt
+1 -2
View File
@@ -2,8 +2,7 @@ package java.util
public open class HashSet<erased E>(c : java.util.Collection<out E>) : java.util.AbstractSet<E>(),
java.util.Set<E>,
java.lang.Cloneable,
java.io.Serializable,
java.lang.Object {
java.io.Serializable {
public this() {}
public this(initialCapacity : Int) {}
public this(initialCapacity : Int, loadFactor : Float) {}
jdk-headers/src/java/util/LinkedHashMap.kt
+2 -2
View File
@@ -1,6 +1,6 @@
package java.util
import java.io.*
public open class LinkedHashMap<erased K, erased V>(m : java.util.Map<out K, out V>) : java.util.HashMap<K, V>(), java.util.Map<K, V>, java.lang.Object {
public open class LinkedHashMap<erased K, erased V>(m : java.util.Map<out K, out V>) : java.util.HashMap<K, V>(), java.util.Map<K, V> {
public this(initialCapacity : Int, loadFactor : Float) {}
public this(initialCapacity : Int) {}
public this() {}
jdk-headers/src/java/util/LinkedHashSet.kt
+1 -2
View File
@@ -2,8 +2,7 @@ package java.util
public open class LinkedHashSet<erased E>(c : java.util.Collection<out E>) : java.util.HashSet<E>(c),
java.util.Set<E>,
java.lang.Cloneable,
java.io.Serializable,
java.lang.Object {
java.io.Serializable {
public this(initialCapacity : Int, loadFactor : Float) {}
public this(initialCapacity : Int) {}
public this() {}
jdk-headers/src/java/util/LinkedList.kt
+1 -2
View File
@@ -3,8 +3,7 @@ public open class LinkedList<erased E>(c : java.util.Collection<out E>) : java.u
java.util.List<E>,
java.util.Deque<E>,
java.lang.Cloneable,
java.io.Serializable,
java.lang.Object {
java.io.Serializable {
public this() {}
override public fun getFirst() : E {}