Made Attributes deprecated and removed subclass...

Made Attributes deprecated and removed subclassing between Annotation
and Attribute

4 files changed, 6 insertions, 6 deletions

diff --git a/src/library/scala/Annotation.scala b/src/library/scala/Annotation.scala
index 543e19791e..8750af09a8 100644
--- a/src/library/scala/Annotation.scala
+++ b/src/library/scala/Annotation.scala
@@ -23,4 +23,4 @@ package scala
  *  @author  Martin Odersky
  *  @version 1.1, 2/02/2007
  */
-abstract class Annotation extends Attribute /* for now, to enable bootstrapping */ {}
+abstract class Annotation {}
diff --git a/src/library/scala/Attribute.scala b/src/library/scala/Attribute.scala
index 2542cc99e8..c918647222 100644
--- a/src/library/scala/Attribute.scala
+++ b/src/library/scala/Attribute.scala
@@ -12,15 +12,11 @@
 package scala
 
 /** <p>
- *   A base class for attributes. Atributes extending this class directly
- *   are not preserved for the Scala type checker and are also not stored
- *   as Java annotations in classfiles. To enable either or both of these,
- *   one needs to inherit from <code>StaticAttribute</code> or/and
- *   <a href="ClassfileAttribute.html"><code>ClassfileAttribute</code></a>.
  *  </p>
  *
  *  @deprecated  use Annotation instead
  *  @author  Martin Odersky
  *  @version 1.1, 2/02/2007
  */
+@deprecated
 abstract class Attribute {}
diff --git a/src/library/scala/ClassfileAttribute.scala b/src/library/scala/ClassfileAttribute.scala
index 51c889688b..6933342486 100644
--- a/src/library/scala/ClassfileAttribute.scala
+++ b/src/library/scala/ClassfileAttribute.scala
@@ -16,7 +16,9 @@ package scala
  *    Java annotations in classfiles.
  *  </p>
  *
+ *  @deprecated  use ClassfileAnnotation instead
  *  @author  Martin Odersky
  *  @version 1.1, 2/02/2007
  */
+@deprecated
 trait ClassfileAttribute extends Attribute {}
diff --git a/src/library/scala/StaticAttribute.scala b/src/library/scala/StaticAttribute.scala
index 1ad88faeac..16e5abd268 100644
--- a/src/library/scala/StaticAttribute.scala
+++ b/src/library/scala/StaticAttribute.scala
@@ -16,7 +16,9 @@ package scala
  *    to the Scala type checker, even across different compilation units.
  *  </p>
  *
+ *  @deprecated  use StaticAnnotation instead
  *  @author  Martin Odersky
  *  @version 1.1, 2/02/2007
  */
+@deprecated
 trait StaticAttribute extends Attribute {}