Compile fixes

kotlin-examples/.gitignore

@@ -1,2 +1,3 @@
 lib/kotlin-runtime.jar
-libraries/runtime.xml
+libraries/runtime.xml
+out/

kotlin-examples/src/_01_beans/KotlinBeans.kt

@@ -32,7 +32,7 @@ fun main(args: Array<String>) {
 
 
 
-    val users = arrayList(john, jane, poss)
+    val users = arrayListOf(john, jane, poss)
 
     for (user in users) {
         println(user)
@@ -51,7 +51,7 @@ fun main(args: Array<String>) {
 
 
 
-    val byNickName = hashMap(
+    val byNickName = hashMapOf(
             "Johny" to john,
             "Jan" to jane,
             "Boo" to poss

kotlin-examples/src/_02_extensions/Filter.kt

@@ -32,7 +32,7 @@ fun main(args : Array<String>) {
 
 
 
-    println("${over30.size()} user(s) over 30 years old")
+    println("${over30.size} user(s) over 30 years old")
 
 
 
@@ -41,7 +41,7 @@ fun main(args : Array<String>) {
 
 
 
-    val youngestOver20 = users filter {u -> u.age > 20 } min {a, b -> a.age - b.age}
+    val youngestOver20 = users.filter {u -> u.age > 20 }.min {a, b -> a.age - b.age}
     println("Youngest over 20: $youngestOver20")
 }
 

kotlin-examples/src/_02_extensions/MultiDecl.kt

@@ -13,8 +13,8 @@ fun main(args : Array<String>) {
 //    testIndexedIteration()
 }
 
-fun Point.component1() = x
-fun Point.component2() = y
+operator fun Point.component1() = x
+operator fun Point.component2() = y
 
 
 

kotlin-examples/src/_02_extensions/StringIterator.kt

@@ -28,7 +28,7 @@ fun main(args : Array<String>) {
 
 
 
-fun String.iterator() = StringIterator(this)
+operator fun String.iterator() = StringIterator(this)
 
 class StringIterator(val str: String): Iterator<Char> {
 

kotlin-examples/src/_02_extensions/guava.kt

@@ -5,7 +5,7 @@ import com.google.common.base.Function
 import com.google.common.base.Predicate
 
 fun main(args: Array<String>) {
-    val list = arrayList("a", "bb", "acc")
+    val list = arrayListOf("a", "bb", "acc")
 
 
 
@@ -37,21 +37,21 @@ fun main(args: Array<String>) {
 
 }
 
-fun p<T>(body: (T) -> Boolean): Predicate<T>
+fun <T : Any> p(body: (T) -> Boolean): Predicate<T>
         = object : Predicate<T> {
-            public override fun apply(p0: T): Boolean {
-                return body(p0)
+            public override fun apply(p0: T?): Boolean {
+                return body(checkNotNull(p0))
             }
 
             public override fun equals(p0: Any?): Boolean {
                 throw UnsupportedOperationException()
             }
         }
 
-fun gf<T>(body: (String) -> T): Function<String, T>
+fun <T> gf(body: (String) -> T): Function<String, T>
         = object : Function<String, T> {
-            public override fun apply(p0: String): T {
-                return body(p0)
+            public override fun apply(p0: String?): T {
+                return body(checkNotNull(p0))
             }
             public override fun equals(p0: Any?): Boolean {
                 throw UnsupportedOperationException()

kotlin-examples/src/_02_extensions/loopWithIndex.kt

@@ -1,7 +1,7 @@
 package _02_extensions.loopWithIndex
 
 fun main(args: Array<String>) {
-    val list = arrayList("a", "b", "c")
+    val list = arrayListOf("a", "b", "c")
     list.loopWithIndex({i, v -> println("list[$i] = $v")})
 }
 

kotlin-examples/src/_03_swing/SwingBuilder.kt

@@ -67,11 +67,11 @@ var JFrame.size : Pair<Int, Int>
     get() = Pair(getSize().getWidth().toInt(), getSize().getHeight().toInt())
     set(dim) {setSize(Dimension(dim.first, dim.second))}
 
-var JFrame.height : Int
+var JFrame.heightInt : Int
     get() = getSize().getHeight().toInt()
     set(h) {setSize(width, h)}
 
-var JFrame.width : Int
+var JFrame.widthInt : Int
     get() = getSize().getWidth().toInt()
     set(w) {setSize(height, w)}
 

kotlin-examples/src/_03_swing/SwingDemo.kt

@@ -7,8 +7,8 @@ val greeting = "Hello,\n\nEnter some text here!"
 
 fun main(args : Array<String>) {
     JFrame("Demo") {
-        height = 400
-        width = 400
+        heightInt = 400
+        widthInt = 400
 
         val text = JTextArea(greeting)
         center = text

kotlin-examples/src/_03_swing/html/html.kt

@@ -11,13 +11,13 @@ import javax.swing.JScrollPane
 import java.util.ArrayList
 
 class Attribute(val name : String, val value : String) {
-    fun toString() = """$name="$value" """
+    override fun toString() = """$name="$value" """
 }
 
 abstract class Tag(val name : String) {
     val children : MutableList<Tag> = ArrayList()
     val attributes : MutableList<Attribute> = ArrayList()
-    open fun toString() = "<$name${attributes.join(prep = " ")}>${children.join()}</$name>"
+    override fun toString() = "<$name${attributes.join(prep = " ")}>${children.join()}</$name>"
 }
 
 class HTML : Tag("html")
@@ -29,7 +29,7 @@ class Text(val text : String) : Tag("b") {
     override fun toString() = text
 }
 
-fun Tag.doInit<T : Tag>(t : T, f : T.() -> Unit) : T{
+fun <T : Tag> Tag.doInit(t : T, f : T.() -> Unit) : T{
     t.f()
     children.add(t)
     return t

kotlin-examples/src/_05_nulls/Files.kt

@@ -71,4 +71,4 @@ fun main(args : Array<String>) {
     println(files?.size ?: "no files")
 }
 
-fun fail() = throw IllegalArgumentException()
+fun fail(): Nothing = throw IllegalArgumentException()

kotlin-examples/src/_07_annotations/Tests.kt

@@ -4,7 +4,8 @@ import org.junit.Test as test
 import org.junit.Assert.*
 
 class Tests {
-    test fun simple() {
+    @test
+    fun simple() {
         assertEquals(4, 2 * 2)
     }
 }

kotlin-examples/src/_08_collections/collections.kt

@@ -9,7 +9,7 @@ fun print(list: List<Any>) {
 }
 
 fun main(args: Array<String>) {
-    val l: ArrayList<Int> = arrayList(1, 2, 3)
+    val l: ArrayList<Int> = arrayListOf(1, 2, 3)
 
     print(l)
 }