archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7174143: encapsulate doc comment table

Browse source 
Reviewed-by: ksrini, mcimadamore
This commit is contained in:
Jonathan Gibbons 2012-06-20 13:23:26 -07:00
parent 288480e312
commit f2cefcbfad
24 changed files with 252 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

13
langtools/test/tools/javac/tree/DocCommentToplevelTest.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -29,6 +29,7 @@
import com.sun.source.tree.*;
import com.sun.source.util.*;
import com.sun.tools.javac.tree.DocCommentTable;
import com.sun.tools.javac.tree.JCTree;
import java.net.URI;
@ -137,16 +138,16 @@ public class DocCommentToplevelTest {
new TreeScanner<ClassTree,Void>() {
Map<JCTree, String> docComments;
DocCommentTable docComments;
@Override
public ClassTree visitCompilationUnit(CompilationUnitTree node, Void unused) {
docComments = ((JCTree.JCCompilationUnit)node).docComments;
boolean expectedComment = tdk == ToplevelDocKind.HAS_DOC &&
(pk != PackageKind.NO_PKG || ik != ImportKind.ZERO);
boolean foundComment = docComments.get(node) != null;
boolean foundComment = docComments.hasComment((JCTree) node);
if (expectedComment != foundComment) {
error("Unexpected comment " + docComments.get(node) + " on toplevel");
error("Unexpected comment " + docComments.getComment((JCTree) node) + " on toplevel");
}
return super.visitCompilationUnit(node, null);
}
@ -156,9 +157,9 @@ public class DocCommentToplevelTest {
boolean expectedComment = tdk == ToplevelDocKind.HAS_DOC &&
pk == PackageKind.NO_PKG && ik == ImportKind.ZERO &&
node.getSimpleName().toString().equals("First");
boolean foundComment = docComments.get(node) != null;
boolean foundComment = docComments.hasComment((JCTree) node);
if (expectedComment != foundComment) {
error("Unexpected comment " + docComments.get(node) + " on class " + node.getSimpleName());
error("Unexpected comment " + docComments.getComment((JCTree) node) + " on class " + node.getSimpleName());
}
return super.visitClass(node, unused);
}