Removed a few more @deprecated members.

The ones which remain I'm not removing on purpose, as I know
from experience it's more trouble than it's yet worth.

1 files changed, 7 insertions, 6 deletions

diff --git a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala
index ca3f3ff635..5c413243e8 100644
--- a/src/compiler/scala/tools/nsc/javac/JavaParsers.scala
+++ b/src/compiler/scala/tools/nsc/javac/JavaParsers.scala
@@ -789,23 +789,24 @@ trait JavaParsers extends ast.parser.ParsersCommon with JavaScanners {
       val idefs = members.toList ::: (sdefs flatMap forwarders)
       (sdefs, idefs)
     }
-
+    def annotationParents = List(
+      gen.scalaAnnotationDot(tpnme.Annotation),
+      Select(javaLangDot(nme.annotation), tpnme.Annotation),
+      gen.scalaAnnotationDot(tpnme.ClassfileAnnotation)
+    )
     def annotationDecl(mods: Modifiers): List[Tree] = {
       accept(AT)
       accept(INTERFACE)
       val pos = in.currentPos
       val name = identForType()
-      val parents = List(scalaDot(tpnme.Annotation),
-                         Select(javaLangDot(nme.annotation), tpnme.Annotation),
-                         scalaDot(tpnme.ClassfileAnnotation))
       val (statics, body) = typeBody(AT, name)
       def getValueMethodType(tree: Tree) = tree match {
         case DefDef(_, nme.value, _, _, tpt, _) => Some(tpt.duplicate)
         case _ => None
       }
-      var templ = makeTemplate(parents, body)
+      var templ = makeTemplate(annotationParents, body)
       for (stat <- templ.body; tpt <- getValueMethodType(stat))
-        templ = makeTemplate(parents, makeConstructor(List(tpt)) :: templ.body)
+        templ = makeTemplate(annotationParents, makeConstructor(List(tpt)) :: templ.body)
       addCompanionObject(statics, atPos(pos) {
         ClassDef(mods, name, List(), templ)
       })