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

     1.1 --- a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Mon Sep 27 14:05:33 2010 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Mon Sep 27 14:20:39 2010 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -62,9 +62,6 @@
    1.11  import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*;
    1.12  import static com.sun.tools.javac.util.ListBuffer.lb;
    1.13  
    1.14 -// TEMP, until we have a more efficient way to save doc comment info
    1.15 -import com.sun.tools.javac.parser.DocCommentScanner;
    1.16 -
    1.17  import java.util.HashMap;
    1.18  import java.util.Queue;
    1.19  import javax.lang.model.SourceVersion;
    1.20 @@ -964,11 +961,10 @@
    1.21              processAnnotations = procEnvImpl.atLeastOneProcessor();
    1.22  
    1.23              if (processAnnotations) {
    1.24 -                if (context.get(Scanner.Factory.scannerFactoryKey) == null)
    1.25 -                    DocCommentScanner.Factory.preRegister(context);
    1.26                  options.put("save-parameter-names", "save-parameter-names");
    1.27                  reader.saveParameterNames = true;
    1.28                  keepComments = true;
    1.29 +                genEndPos = true;
    1.30                  if (taskListener != null)
    1.31                      taskListener.started(new TaskEvent(TaskEvent.Kind.ANNOTATION_PROCESSING));
    1.32                  log.deferDiagnostics = true;
    1.33 @@ -1587,6 +1583,7 @@
    1.34      }
    1.35  
    1.36      public void initRound(JavaCompiler prev) {
    1.37 +        genEndPos = prev.genEndPos;
    1.38          keepComments = prev.keepComments;
    1.39          start_msec = prev.start_msec;
    1.40          hasBeenUsed = true;