big overhaul of annotations implementation.

Author: lrytz

src/library/scala/xml/Utility.scala

@@ -82,9 +82,8 @@ object Utility extends AnyRef with parsing.TokenTests
 	  case _ => n
   }
 
-  /** @deprecated a string might also be Atom(s) - define your own conversion
-   */
-  @deprecated def view(s: String): Text = Text(s)
+  @deprecated("a string might also be Atom(s) - define your own conversion")
+  def view(s: String): Text = Text(s)
 
   /**
    * Escapes the characters < > & and " from string.

test/files/run/t1500.scala

@@ -29,7 +29,7 @@ object Test {
       /** Check annotations to decide whether tpe1 <:< tpe2 */
       def annotationsConform(tpe1: Type, tpe2: Type): Boolean = {
 
-        tpe1.attributes.forall(a1 => tpe2.attributes.forall(a2 => a1.atp <:< a2.atp))
+        tpe1.annotations.forall(a1 => tpe2.annotations.forall(a2 => a1.atp <:< a2.atp))
 
       }
     }

test/files/run/t1501.scala

@@ -40,7 +40,7 @@ object Test {
       /** Check annotations to decide whether tpe1 <:< tpe2 */
       def annotationsConform(tpe1: Type, tpe2: Type): Boolean = {
 
-        tpe1.attributes.forall(a1 => tpe2.attributes.forall(a2 => a1.atp <:< a2.atp))
+        tpe1.annotations.forall(a1 => tpe2.annotations.forall(a2 => a1.atp <:< a2.atp))
 
       }
     }