summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-05-07 09:21:55 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-05-07 09:21:55 +0000
commiteac24aa1b8e03231cc72096309dc71941002c554 (patch)
tree4b4565d3f42f134585db866ea5241be18d2bedaa /src/library
parente8ad9d9f30e20dc10f5fe012ed8833c9df3e1912 (diff)
downloadscala-eac24aa1b8e03231cc72096309dc71941002c554.tar.gz
scala-eac24aa1b8e03231cc72096309dc71941002c554.tar.bz2
scala-eac24aa1b8e03231cc72096309dc71941002c554.zip
Merged revisions 21840 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r21840 | rytz | 2010-05-07 09:51:27 +0200 (Fri, 07 May 2010) | 1 line close #3400. no review ........
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/reflect/BeanProperty.scala3
-rw-r--r--src/library/scala/reflect/BooleanBeanProperty.scala3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/library/scala/reflect/BeanProperty.scala b/src/library/scala/reflect/BeanProperty.scala
index 22195e18e4..17f40cfca1 100644
--- a/src/library/scala/reflect/BeanProperty.scala
+++ b/src/library/scala/reflect/BeanProperty.scala
@@ -11,6 +11,8 @@
package scala.reflect
+import annotation.target._
+
/** <p>
* When attached to a field, this annotation adds a setter and a getter
* method following the Java Bean convention. For example:
@@ -29,4 +31,5 @@ package scala.reflect
* <code>scala.reflect.BooleanBeanProperty</code> annotation instead.
* </p>
*/
+@field
class BeanProperty extends StaticAnnotation
diff --git a/src/library/scala/reflect/BooleanBeanProperty.scala b/src/library/scala/reflect/BooleanBeanProperty.scala
index be1dadd5fe..eebdb98d9f 100644
--- a/src/library/scala/reflect/BooleanBeanProperty.scala
+++ b/src/library/scala/reflect/BooleanBeanProperty.scala
@@ -11,6 +11,8 @@
package scala.reflect
+import annotation.target._
+
/** <p>
* This annotation has the same functionality as
* <code>scala.reflect.BeanProperty</code>, but the generated
@@ -18,4 +20,5 @@ package scala.reflect
* of <code>getFieldName</code>.
* </p>
*/
+@field
class BooleanBeanProperty extends StaticAnnotation