Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Tue Sep 24 16:12:06 2013 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Wed Sep 25 11:07:05 2013 -0700
     1.3 @@ -93,6 +93,7 @@
     1.4      final Types types;
     1.5      final JCDiagnostic.Factory diags;
     1.6      final Annotate annotate;
     1.7 +    final TypeAnnotations typeAnnotations;
     1.8      final DeferredLintHandler deferredLintHandler;
     1.9  
    1.10      public static Attr instance(Context context) {
    1.11 @@ -121,6 +122,7 @@
    1.12          types = Types.instance(context);
    1.13          diags = JCDiagnostic.Factory.instance(context);
    1.14          annotate = Annotate.instance(context);
    1.15 +        typeAnnotations = TypeAnnotations.instance(context);
    1.16          deferredLintHandler = DeferredLintHandler.instance(context);
    1.17  
    1.18          Options options = Options.instance(context);
    1.19 @@ -2228,7 +2230,7 @@
    1.20          // empty annotations, if only declaration annotations were given.
    1.21          // This method will raise an error for such a type.
    1.22          for (JCAnnotation ai : annotations) {
    1.23 -            if (TypeAnnotations.annotationType(syms, names, ai.attribute, sym) == TypeAnnotations.AnnotationType.DECLARATION) {
    1.24 +            if (typeAnnotations.annotationType(ai.attribute, sym) == TypeAnnotations.AnnotationType.DECLARATION) {
    1.25                  log.error(ai.pos(), "annotation.type.not.applicable");
    1.26              }
    1.27          }
    1.28 @@ -4339,7 +4341,7 @@
    1.29          }
    1.30          if (allowTypeAnnos) {
    1.31              // Correctly organize the postions of the type annotations
    1.32 -            TypeAnnotations.organizeTypeAnnotationsBodies(this.syms, this.names, this.log, tree);
    1.33 +            typeAnnotations.organizeTypeAnnotationsBodies(tree);
    1.34  
    1.35              // Check type annotations applicability rules
    1.36              validateTypeAnnotations(tree);