Merge remote-tracking branch 'refs/remotes/adambard/master'

1 files changed, 13 insertions, 1 deletions

diff --git a/scala.html.markdown b/scala.html.markdown
index bc8cd422..c2aa942c 100644
--- a/scala.html.markdown
+++ b/scala.html.markdown
@@ -327,9 +327,15 @@ divideInts(10, 3)    // (Int, Int) = (3,1)
 val d = divideInts(10, 3)    // (Int, Int) = (3,1)
 
 d._1    // Int = 3
-
 d._2    // Int = 1
 
+// Alternatively you can do multiple-variable assignment to tuple, which is more
+// convenient and readable in many cases
+val (div, mod) = divideInts(10, 3)
+
+div     // Int = 3
+mod     // Int = 1
+
 
 /////////////////////////////////////////////////
 // 5. Object Oriented Programming
@@ -460,6 +466,9 @@ def matchEverything(obj: Any): String = obj match {
 
   // You can nest patterns:
   case List(List((1, 2, "YAY"))) => "Got a list of list of tuple"
+
+  // Match any case (default) if all previous haven't matched
+  case _ => "Got unknown object"
 }
 
 // In fact, you can pattern match any object with an "unapply" method. This
@@ -612,6 +621,9 @@ import scala.collection.immutable.{List => ImmutableList}
 // Import all classes, except some. The following excludes Map and Set:
 import scala.collection.immutable.{Map => _, Set => _, _}
 
+// Java classes can also be imported. Scala syntax can be used
+import java.swing.{JFrame, JWindow}
+
 // Your programs entry point is defined in an scala file using an object, with a
 // single method, main:
 object Application {