diff --git a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Creatures.kt b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Creatures.kt index c91e2484624..4984ead30df 100644 --- a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Creatures.kt +++ b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Creatures.kt @@ -226,14 +226,14 @@ class CanvasState(val canvas: HTMLCanvasElement) { jq(canvas).mousemove { if (selection != null) { - selection.sure().pos = mousePos(it) - dragOff + selection!!.pos = mousePos(it) - dragOff valid = false } } jq(canvas).mouseup { if (selection != null) { - selection.sure().selected = false + selection!!.selected = false } selection = null valid = false @@ -254,7 +254,7 @@ class CanvasState(val canvas: HTMLCanvasElement) { var offset = Vector() var element: HTMLElement? = canvas while (element != null) { - val el: HTMLElement = element.sure() + val el: HTMLElement = element!! offset += Vector(el.offsetLeft, el.offsetTop) element = el.offsetParent } diff --git a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Traffic light.kt b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Traffic light.kt index 35c31895899..eabc4564391 100644 --- a/js/js.translator/testFiles/webDemoCanvasExamples/cases/Traffic light.kt +++ b/js/js.translator/testFiles/webDemoCanvasExamples/cases/Traffic light.kt @@ -430,7 +430,7 @@ class CanvasState(val canvas: HTMLCanvasElement) { var offset = Vector() var element: HTMLElement? = canvas while (element != null) { - val el: HTMLElement = element.sure() + val el: HTMLElement = element!! offset += Vector(el.offsetLeft, el.offsetTop) element = el.offsetParent } diff --git a/js/js.translator/testFiles/webDemoExamples2/cases/builder.kt b/js/js.translator/testFiles/webDemoExamples2/cases/builder.kt index 2bae4e90e95..78cab743d76 100644 --- a/js/js.translator/testFiles/webDemoExamples2/cases/builder.kt +++ b/js/js.translator/testFiles/webDemoExamples2/cases/builder.kt @@ -128,7 +128,7 @@ class P() : BodyTag("p") class H1() : BodyTag("h1") class A() : BodyTag("a") { public var href : String - get() = attributes["href"].sure() + get() = attributes["href"]!! set(value) { attributes["href"] = value } diff --git a/js/js.translator/testFiles/webDemoExamples2/cases/life.kt b/js/js.translator/testFiles/webDemoExamples2/cases/life.kt index a525dc79193..6f1da594f5a 100644 --- a/js/js.translator/testFiles/webDemoExamples2/cases/life.kt +++ b/js/js.translator/testFiles/webDemoExamples2/cases/life.kt @@ -139,7 +139,7 @@ fun makeField(s : String) : Field { val l1 : Int = o1.size val l2 = o2.size l1 - l2 - }).sure() + })!! val data = Array(lines.size) {Array(w.size) {false}} // workaround @@ -160,7 +160,7 @@ fun makeField(s : String) : Field { } // An excerpt from the Standard Library -val String?.indices : IntRange get() = IntRange(0, this.sure().size) +val String?.indices : IntRange get() = IntRange(0, this!!.size) fun MutableMap.set(k : K, v : V) { put(k, v) } diff --git a/js/js.translator/testFiles/webDemoExamples2/cases/maze.kt b/js/js.translator/testFiles/webDemoExamples2/cases/maze.kt index 4467dee98a8..52d86463ef9 100644 --- a/js/js.translator/testFiles/webDemoExamples2/cases/maze.kt +++ b/js/js.translator/testFiles/webDemoExamples2/cases/maze.kt @@ -171,12 +171,12 @@ fun printMaze(str : String) { * OOOOOOOOOOOOOOOOO */ fun makeMaze(s : String) : Maze { - val lines = s.split("\n").sure() + val lines = s.split("\n")!! val w = max(lines.toList(), comparator {o1, o2 -> val l1 : Int = o1?.size ?: 0 val l2 = o2?.size ?: 0 l1 - l2 - }).sure() + })!! val data = Array>(lines.size) {Array(w.size) {false}} var start : #(Int, Int)? = null @@ -184,7 +184,7 @@ fun makeMaze(s : String) : Maze { for (line in lines.indices) { for (x in lines[line].indices) { - val c = lines[line].sure()[x] + val c = lines[line]!![x] data[line][x] = c == 'O' when (c) { 'I' -> start = #(line, x) @@ -202,12 +202,12 @@ fun makeMaze(s : String) : Maze { throw IllegalArgumentException("No goal point in the maze (should be indicated with a '$' sign)") } - return Maze(w.size, lines.size, data, start.sure(), end.sure()) + return Maze(w.size, lines.size, data, start!!, end!!) } // An excerpt from the Standard Library -val String?.indices : IntRange get() = IntRange(0, this.sure().size) +val String?.indices : IntRange get() = IntRange(0, this!!.size) fun Map.set(k : K, v : V) { put(k, v) }