renamed attributes to annotations; added @syntax.

2 files changed, 7 insertions, 7 deletions

diff --git a/test/files/jvm5/attributes.scala b/test/files/jvm5/attributes.scala
index 2f8e434fa4..1e38db22ce 100644
--- a/test/files/jvm5/attributes.scala
+++ b/test/files/jvm5/attributes.scala
@@ -68,7 +68,7 @@ public class Main {
 object Test4 {
   import java.lang.annotation._
   [Retention(RetentionPolicy.RUNTIME)]
-  class Source(url: String, mail: String) extends Attribute
+  class Source(url: String, mail: String) extends scala.Annotation
   [Source("http://scala.epfl.ch", "scala@lists.epfl.ch")]
   class Foo
   def run: Unit = {
diff --git a/test/files/pos/attributes.scala b/test/files/pos/attributes.scala
index ab30e2cdeb..468a6e76e1 100644
--- a/test/files/pos/attributes.scala
+++ b/test/files/pos/attributes.scala
@@ -53,14 +53,14 @@ object O6 {
 }
 
 object myAttrs {
-  class a1 extends scala.Attribute;
-  class a2(x: Int) extends scala.Attribute;
-  class a3(x: a1) extends scala.Attribute;
+  class a1 extends scala.Annotation;
+  class a2(x: Int) extends scala.Annotation;
+  class a3(x: a1) extends scala.Annotation;
 }
 object O7 {
-  class a1 extends scala.Attribute;
-  class a2(x: Int) extends scala.Attribute;
-  class a3(x: a1) extends scala.Attribute;
+  class a1 extends scala.Annotation;
+  class a2(x: Int) extends scala.Annotation;
+  class a3(x: a1) extends scala.Annotation;
   final val x = new a1;
   [a1] class C1;
   [a1,a2(77)] class C2;