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

Fixing tests after annotations changed

Browse Source
This commit is contained in:
Andrey Breslav
2012-12-10 16:44:41 +04:00
parent 5ad7be38bc
commit 6141467499
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/loadJava/ClassDoesNotOverrideMethod.txt
+4 -4
View File
@@ -2,8 +2,8 @@ namespace test
public abstract class test.ClassDoesNotOverrideMethod : java.util.Date {
public final /*constructor*/ fun <init>(): test.ClassDoesNotOverrideMethod
public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date?): jet.Boolean
public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date?): jet.Boolean
public open override /*1*/ /*fake_override*/ fun after(/*0*/ p0: java.util.Date): jet.Boolean
public open override /*1*/ /*fake_override*/ fun before(/*0*/ p0: java.util.Date): jet.Boolean
public open override /*1*/ /*fake_override*/ fun compareTo(/*0*/ p0: java.util.Date): jet.Int
public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getDate(): jet.Int
public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun getDay(): jet.Int
@@ -21,6 +21,6 @@ public abstract class test.ClassDoesNotOverrideMethod : java.util.Date {
public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setSeconds(/*0*/ p0: jet.Int): jet.Tuple0
public open override /*1*/ /*fake_override*/ fun setTime(/*0*/ p0: jet.Long): jet.Tuple0
public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun setYear(/*0*/ p0: jet.Int): jet.Tuple0
public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun toGMTString(): jet.String?
public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun toLocaleString(): jet.String?
public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun toGMTString(): jet.String
public open jet.deprecated(value = "Deprecated in Java") override /*1*/ /*fake_override*/ fun toLocaleString(): jet.String
}
libraries/stdlib/src/kotlin/OrderingJVM.kt
+2 -2
View File
@@ -58,7 +58,7 @@ private class FunctionComparator<T>(vararg val functions: T.() -> Any?): Compar
return "FunctionComparator${functions.toList()}"
}
public override fun compare(o1: T?, o2: T?): Int {
public override fun compare(o1: T, o2: T): Int {
return compareBy<T>(o1, o2, *functions)
}
@@ -79,7 +79,7 @@ private class Function2Comparator<T>(val compareFn: (T,T) -> Int): Comparator<T
return "Function2Comparator${compareFn}"
}
public override fun compare(a: T?, b: T?): Int {
public override fun compare(a: T, b: T): Int {
if (a === b) return 0
if (a == null) return - 1
if (b == null) return 1
libraries/stdlib/src/kotlin/beans/Listeners.kt
+1 -1
View File
@@ -11,7 +11,7 @@ import java.beans.*
inline fun propertyChangeListener(fn: (PropertyChangeEvent) -> Unit): PropertyChangeListener = FunctionPropertyChangeListener(fn)
private class FunctionPropertyChangeListener(val fn: (PropertyChangeEvent) -> Unit) : PropertyChangeListener {
public override fun propertyChange(e: PropertyChangeEvent?) {
public override fun propertyChange(e: PropertyChangeEvent) {
if (e != null) {
(fn)(e)
}
libraries/stdlib/src/kotlin/dom/Dom.kt
+1 -1
View File
@@ -410,7 +410,7 @@ Adds a newly created text node to an element which either already has an owner D
*/
fun Element.addText(text: String?, doc: Document? = null): Element {
if (text != null) {
val child = this.ownerDocument(doc).createTextNode(text)
val child = this.ownerDocument(doc).createTextNode(text)!!
this.appendChild(child)
}
return this