summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2012-09-29 17:06:06 +0200
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2012-09-29 17:06:06 +0200
commitbe49f36154efa78c3dcbeba394aa6ec2b5e764ec (patch)
treeae83e7ed20574b2ece619f650125d841a2f1a386 /src/library
parentac311c4f7be3353c8f13396d4c7d21f2c0887005 (diff)
parente46ceca8a0166a459cb336da83ae71afe69dc025 (diff)
downloadscala-be49f36154efa78c3dcbeba394aa6ec2b5e764ec.tar.gz
scala-be49f36154efa78c3dcbeba394aa6ec2b5e764ec.tar.bz2
scala-be49f36154efa78c3dcbeba394aa6ec2b5e764ec.zip
Merge remote-tracking branch 'scala/2.10.x' into 2.10.0-wip
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/throws.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/library/scala/throws.scala b/src/library/scala/throws.scala
index 0aa0d31c9f..02dffb00b0 100644
--- a/src/library/scala/throws.scala
+++ b/src/library/scala/throws.scala
@@ -14,7 +14,7 @@ package scala
* {{{
* class Reader(fname: String) {
* private val in = new BufferedReader(new FileReader(fname))
- * @throws(classOf[IOException])
+ * @throws[IOException]("if the file doesn't exist")
* def read() = in.read()
* }
* }}}
@@ -23,4 +23,6 @@ package scala
* @version 1.0, 19/05/2006
* @since 2.1
*/
-class throws(clazz: Class[_]) extends scala.annotation.StaticAnnotation
+class throws[T <: Throwable](cause: String = "") extends scala.annotation.StaticAnnotation {
+ def this(clazz: Class[T]) = this()
+}