diff options
author | michelou <michelou@epfl.ch> | 2007-03-01 13:50:18 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2007-03-01 13:50:18 +0000 |
commit | f341b97e0bd92dda670b602f3004bb19e6c785e2 (patch) | |
tree | 6e575b007ca46afa6be0eaf079a3a7b4e9109c93 | |
parent | 3ab5889983e7a86540b9f162dc2fd3653867eccf (diff) | |
download | scala-f341b97e0bd92dda670b602f3004bb19e6c785e2.tar.gz scala-f341b97e0bd92dda670b602f3004bb19e6c785e2.tar.bz2 scala-f341b97e0bd92dda670b602f3004bb19e6c785e2.zip |
updated scaladoc comments (links, tuples, ..)
-rw-r--r-- | src/actors/scala/actors/Actor.scala | 41 | ||||
-rw-r--r-- | src/library/scala/ClassfileAttribute.scala | 6 | ||||
-rw-r--r-- | src/library/scala/StaticAttribute.scala | 3 |
3 files changed, 29 insertions, 21 deletions
diff --git a/src/actors/scala/actors/Actor.scala b/src/actors/scala/actors/Actor.scala index 701bfa6172..55bfb662b9 100644 --- a/src/actors/scala/actors/Actor.scala +++ b/src/actors/scala/actors/Actor.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2005-2006, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** / __/ __// _ | / / / _ | (c) 2005-2007, LAMP/EPFL ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ @@ -11,7 +11,7 @@ package scala.actors import scala.collection.mutable.{HashSet, Queue} -import compat.Platform +import scala.compat.Platform /** * The <code>Actor</code> object provides functions for the definition of @@ -691,26 +691,31 @@ trait Actor extends OutputChannel[Any] { } -/** - * <p>This object is used as the timeout pattern in - * <code>receiveWithin</code> and <code>reactWithin</code>. - * </p> - * <p>The following example demonstrates its usage:</p><pre> - * receiveWithin(500) { - * case {x, y} => ... - * case TIMEOUT => ... - * } - * </pre> +/** <p> + * This object is used as the timeout pattern in + * <a href="Actor.html#receiveWithin(scala.Long)" target="contentFrame"> + * <code>receiveWithin</code></a> and + * <a href="Actor.html#reactWithin(scala.Long)" target="contentFrame"> + * <code>reactWithin</code></a>. + * </p> + * <p> + * The following example demonstrates its usage: + * </p><pre> + * receiveWithin(500) { + * <b>case</b> (x, y) <b>=></b> ... + * <b>case</b> TIMEOUT <b>=></b> ... + * }</pre> * - * @version 0.9.4 - * @author Philipp Haller + * @version 0.9.4 + * @author Philipp Haller */ case object TIMEOUT -/** - * <p>This class is used to manage control flow of actor - * executions.</p> +/** <p> + * This class is used to manage control flow of actor + * executions. + * </p> * * @version 0.9.4 * @author Philipp Haller diff --git a/src/library/scala/ClassfileAttribute.scala b/src/library/scala/ClassfileAttribute.scala index 6933342486..23d48409b9 100644 --- a/src/library/scala/ClassfileAttribute.scala +++ b/src/library/scala/ClassfileAttribute.scala @@ -13,10 +13,12 @@ package scala /** <p> * A base class for classfile attributes. These are stored as - * Java annotations in classfiles. + * <a href="http://java.sun.com/j2se/1.5.0/docs/guide/language/annotations.html" + * target="_top">Java annotations</a> in classfiles. * </p> * - * @deprecated use ClassfileAnnotation instead + * @deprecated use <a href="ClassfileAnnotation.html" + * target="contentFrame">ClassfileAnnotation</a> instead * @author Martin Odersky * @version 1.1, 2/02/2007 */ diff --git a/src/library/scala/StaticAttribute.scala b/src/library/scala/StaticAttribute.scala index 16e5abd268..1f637955b4 100644 --- a/src/library/scala/StaticAttribute.scala +++ b/src/library/scala/StaticAttribute.scala @@ -16,7 +16,8 @@ package scala * to the Scala type checker, even across different compilation units. * </p> * - * @deprecated use StaticAnnotation instead + * @deprecated use <a href="StaticAnnotation.html" + * target="contentFrame">StaticAnnotation</a> instead * @author Martin Odersky * @version 1.1, 2/02/2007 */ |