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

     1.1 --- a/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Thu Feb 25 09:42:35 2010 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Thu Feb 25 11:04:11 2010 -0800
     1.3 @@ -690,10 +690,12 @@
     1.4              ProcessorState ps = psi.next();
     1.5              Set<String>  matchedNames = new HashSet<String>();
     1.6              Set<TypeElement> typeElements = new LinkedHashSet<TypeElement>();
     1.7 -            for (String unmatchedAnnotationName : unmatchedAnnotations.keySet()) {
     1.8 +
     1.9 +            for (Map.Entry<String, TypeElement> entry: unmatchedAnnotations.entrySet()) {
    1.10 +                String unmatchedAnnotationName = entry.getKey();
    1.11                  if (ps.annotationSupported(unmatchedAnnotationName) ) {
    1.12                      matchedNames.add(unmatchedAnnotationName);
    1.13 -                    TypeElement te = unmatchedAnnotations.get(unmatchedAnnotationName);
    1.14 +                    TypeElement te = entry.getValue();
    1.15                      if (te != null)
    1.16                          typeElements.add(te);
    1.17                  }
    1.18 @@ -790,7 +792,7 @@
    1.19                                       List<JCCompilationUnit> roots,
    1.20                                       List<ClassSymbol> classSymbols,
    1.21                                       Iterable<? extends PackageSymbol> pckSymbols)
    1.22 -    throws IOException {
    1.23 +        throws IOException {
    1.24  
    1.25          log = Log.instance(context);
    1.26          // Writer for -XprintRounds and -XprintProcessorInfo data
    1.27 @@ -1218,7 +1220,7 @@
    1.28          return false;
    1.29      }
    1.30  
    1.31 -    private class AnnotationCollector extends TreeScanner {
    1.32 +    private static class AnnotationCollector extends TreeScanner {
    1.33          List<JCTree> path = List.nil();
    1.34          static final boolean verbose = false;
    1.35          List<JCAnnotation> annotations = List.nil();