1.1 --- a/src/share/classes/com/sun/tools/javac/tree/JCTree.java Tue Jun 19 13:25:58 2012 +0100 1.2 +++ b/src/share/classes/com/sun/tools/javac/tree/JCTree.java Wed Jun 20 13:23:26 2012 -0700 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 1999, 2012, 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 @@ -25,25 +25,23 @@ 1.11 1.12 package com.sun.tools.javac.tree; 1.13 1.14 +import java.io.IOException; 1.15 +import java.io.StringWriter; 1.16 import java.util.*; 1.17 1.18 -import java.io.IOException; 1.19 -import java.io.StringWriter; 1.20 import javax.lang.model.element.Modifier; 1.21 import javax.lang.model.type.TypeKind; 1.22 import javax.tools.JavaFileObject; 1.23 1.24 +import com.sun.source.tree.*; 1.25 +import com.sun.source.tree.LambdaExpressionTree.BodyKind; 1.26 +import com.sun.source.tree.MemberReferenceTree.ReferenceMode; 1.27 +import com.sun.tools.javac.code.*; 1.28 +import com.sun.tools.javac.code.Scope.*; 1.29 +import com.sun.tools.javac.code.Symbol.*; 1.30 import com.sun.tools.javac.util.*; 1.31 import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; 1.32 import com.sun.tools.javac.util.List; 1.33 -import com.sun.tools.javac.code.*; 1.34 -import com.sun.tools.javac.code.Scope.*; 1.35 -import com.sun.tools.javac.code.Symbol.*; 1.36 -import com.sun.tools.javac.parser.EndPosTable; 1.37 -import com.sun.source.tree.*; 1.38 -import com.sun.source.tree.LambdaExpressionTree.BodyKind; 1.39 -import com.sun.source.tree.MemberReferenceTree.ReferenceMode; 1.40 - 1.41 import static com.sun.tools.javac.code.BoundKind.*; 1.42 import static com.sun.tools.javac.tree.JCTree.Tag.*; 1.43 1.44 @@ -491,7 +489,7 @@ 1.45 public ImportScope namedImportScope; 1.46 public StarImportScope starImportScope; 1.47 public Position.LineMap lineMap = null; 1.48 - public Map<JCTree, String> docComments = null; 1.49 + public DocCommentTable docComments = null; 1.50 public EndPosTable endPositions = null; 1.51 protected JCCompilationUnit(List<JCAnnotation> packageAnnotations, 1.52 JCExpression pid,