From 614146749961ce6c481883880decf973827527de Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Mon, 10 Dec 2012 16:44:41 +0400
Subject: [PATCH] Fixing tests after annotations changed

---
 compiler/testData/loadJava/ClassDoesNotOverrideMethod.txt | 8 ++++----
 libraries/stdlib/src/kotlin/OrderingJVM.kt                | 4 ++--
 libraries/stdlib/src/kotlin/beans/Listeners.kt            | 2 +-
 libraries/stdlib/src/kotlin/dom/Dom.kt                    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/compiler/testData/loadJava/ClassDoesNotOverrideMethod.txt b/compiler/testData/loadJava/ClassDoesNotOverrideMethod.txt
index 8cfcda1c793..c949b097ff0 100644
--- a/compiler/testData/loadJava/ClassDoesNotOverrideMethod.txt
+++ b/compiler/testData/loadJava/ClassDoesNotOverrideMethod.txt
@@ -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
 }
diff --git a/libraries/stdlib/src/kotlin/OrderingJVM.kt b/libraries/stdlib/src/kotlin/OrderingJVM.kt
index 3a2d3ccb98a..71a09faf61a 100644
--- a/libraries/stdlib/src/kotlin/OrderingJVM.kt
+++ b/libraries/stdlib/src/kotlin/OrderingJVM.kt
@@ -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
diff --git a/libraries/stdlib/src/kotlin/beans/Listeners.kt b/libraries/stdlib/src/kotlin/beans/Listeners.kt
index 680025ff12c..db2d3a7424a 100644
--- a/libraries/stdlib/src/kotlin/beans/Listeners.kt
+++ b/libraries/stdlib/src/kotlin/beans/Listeners.kt
@@ -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)
         }
diff --git a/libraries/stdlib/src/kotlin/dom/Dom.kt b/libraries/stdlib/src/kotlin/dom/Dom.kt
index 9a97f87cd8e..bbe7034f66e 100644
--- a/libraries/stdlib/src/kotlin/dom/Dom.kt
+++ b/libraries/stdlib/src/kotlin/dom/Dom.kt
@@ -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