jdk-sandbox: langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/HtmlTag.java@cce89649f958 (annotated)

14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	1	/*
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	2	* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	3	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	4	*
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	5	* This code is free software; you can redistribute it and/or modify it
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	6	* under the terms of the GNU General Public License version 2 only, as
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	7	* published by the Free Software Foundation. Oracle designates this
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	8	* particular file as subject to the "Classpath" exception as provided
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	9	* by Oracle in the LICENSE file that accompanied this code.
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	10	*
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	11	* This code is distributed in the hope that it will be useful, but WITHOUT
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	12	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	13	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	14	* version 2 for more details (a copy is included in the LICENSE file that
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	15	* accompanied this code).
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	16	*
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	17	* You should have received a copy of the GNU General Public License version
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	18	* 2 along with this work; if not, write to the Free Software Foundation,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	19	* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	20	*
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	21	* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	22	* or visit www.oracle.com if you need additional information or have any
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	23	* questions.
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	24	*/
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	25
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	26	package com.sun.tools.doclint;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	27
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	28	import java.util.Collections;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	29	import java.util.EnumMap;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	30	import java.util.EnumSet;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	31	import java.util.HashMap;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	32	import java.util.Map;
33360 d8ef08003d35 8078320: Improve DocTrees parsing. ksrini parents: 29957 diff changeset	33	import java.util.Set;
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	34	import javax.lang.model.element.Name;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	35
33360 d8ef08003d35 8078320: Improve DocTrees parsing. ksrini parents: 29957 diff changeset	36	import com.sun.tools.javac.util.StringUtils;
25452 581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	37
33360 d8ef08003d35 8078320: Improve DocTrees parsing. ksrini parents: 29957 diff changeset	38	import static com.sun.tools.doclint.HtmlTag.Attr.*;
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	39
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	40	/**
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	41	* Enum representing HTML tags.
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	42	*
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	43	* The intent of this class is to embody the semantics of W3C HTML 4.01
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	44	* to the extent supported/used by javadoc.
19658 2f5e90525d0b 8022173: Relax some warnings in doclint jjg parents: 19511 diff changeset	45	* In time, we may wish to transition javadoc and doclint to using HTML 5.
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	46	*
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	47	* This is derivative of com.sun.tools.doclets.formats.html.markup.HtmlTag.
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	48	* Eventually, these two should be merged back together, and possibly made
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	49	* public.
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	50	*
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	51	* @see <a href="http://www.w3.org/TR/REC-html40/">HTML 4.01 Specification</a>
19658 2f5e90525d0b 8022173: Relax some warnings in doclint jjg parents: 19511 diff changeset	52	* @see <a href="http://www.w3.org/TR/html5/">HTML 5 Specification</a>
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	53	* @see <a href="http://www.w3.org/TR/wai-aria/ ">WAI-ARIA Specification</a>
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	54	* @see <a href="http://www.w3.org/TR/aria-in-html/#recommendations-table">WAI-ARIA Recommendations Table</a>
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	55	* @author Bhavesh Patel
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	56	* @author Jonathan Gibbons (revised)
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	57	*/
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	58	public enum HtmlTag {
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	59	A(BlockType.INLINE, EndKind.REQUIRED,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	60	attrs(AttrKind.ALL, HREF, TARGET, ID),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	61	attrs(AttrKind.HTML4, REV, CHARSET, SHAPE, COORDS, NAME)),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	62
25452 581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	63	ABBR(BlockType.INLINE, EndKind.REQUIRED,
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	64	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	65
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	66	ACRONYM(HtmlVersion.HTML4, BlockType.INLINE, EndKind.REQUIRED,
25452 581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	67	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	68
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	69	ADDRESS(BlockType.INLINE, EndKind.REQUIRED,
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	70	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	71
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	72	ARTICLE(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	73	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	74
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	75	ASIDE(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	76	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	77
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	78	B(BlockType.INLINE, EndKind.REQUIRED,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	79	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	80
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	81	BDI(HtmlVersion.HTML5, BlockType.INLINE, EndKind.REQUIRED),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	82
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	83	BIG(HtmlVersion.HTML4, BlockType.INLINE, EndKind.REQUIRED,
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	84	EnumSet.of(Flag.EXPECT_CONTENT)),
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	85
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	86	BLOCKQUOTE(BlockType.BLOCK, EndKind.REQUIRED,
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	87	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	88
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	89	BODY(BlockType.OTHER, EndKind.REQUIRED),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	90
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	91	BR(BlockType.INLINE, EndKind.NONE,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	92	attrs(AttrKind.USE_CSS, CLEAR)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	93
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	94	CAPTION(BlockType.TABLE_ITEM, EndKind.REQUIRED,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	95	EnumSet.of(Flag.ACCEPTS_INLINE, Flag.EXPECT_CONTENT),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	96	attrs(AttrKind.USE_CSS, ALIGN)),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	97
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	98	CENTER(HtmlVersion.HTML4, BlockType.BLOCK, EndKind.REQUIRED,
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	99	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	100
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	101	CITE(BlockType.INLINE, EndKind.REQUIRED,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	102	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	103
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	104	CODE(BlockType.INLINE, EndKind.REQUIRED,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	105	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	106
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	107	COL(BlockType.TABLE_ITEM, EndKind.NONE,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	108	attrs(AttrKind.HTML4, ALIGN, CHAR, CHAROFF, VALIGN, WIDTH)),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	109
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	110	COLGROUP(BlockType.TABLE_ITEM, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	111	attrs(AttrKind.HTML4, ALIGN, CHAR, CHAROFF, VALIGN, WIDTH)) {
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	112	@Override
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	113	public boolean accepts(HtmlTag t) {
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	114	return (t == COL);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	115	}
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	116	},
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	117
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	118	DD(BlockType.LIST_ITEM, EndKind.OPTIONAL,
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	119	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE, Flag.EXPECT_CONTENT)),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	120
25452 581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	121	DEL(BlockType.INLINE, EndKind.REQUIRED,
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	122	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST),
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	123	attrs(AttrKind.ALL, Attr.CITE, Attr.DATETIME)),
25452 581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	124
20253 8e84701d7da0 8025050: Doclint doesn't recognize <dfn> tag jjg parents: 19658 diff changeset	125	DFN(BlockType.INLINE, EndKind.REQUIRED,
8e84701d7da0 8025050: Doclint doesn't recognize <dfn> tag jjg parents: 19658 diff changeset	126	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
8e84701d7da0 8025050: Doclint doesn't recognize <dfn> tag jjg parents: 19658 diff changeset	127
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	128	DIV(BlockType.BLOCK, EndKind.REQUIRED,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	129	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	130	attrs(AttrKind.USE_CSS, ALIGN)),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	131
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	132	DL(BlockType.BLOCK, EndKind.REQUIRED,
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	133	EnumSet.of(Flag.EXPECT_CONTENT),
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	134	attrs(AttrKind.USE_CSS, COMPACT)) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	135	@Override
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	136	public boolean accepts(HtmlTag t) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	137	return (t == DT) \|\| (t == DD);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	138	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	139	},
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	140
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	141	DT(BlockType.LIST_ITEM, EndKind.OPTIONAL,
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	142	EnumSet.of(Flag.ACCEPTS_INLINE, Flag.EXPECT_CONTENT)),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	143
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	144	EM(BlockType.INLINE, EndKind.REQUIRED,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	145	EnumSet.of(Flag.NO_NEST)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	146
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	147	FONT(HtmlVersion.HTML4, BlockType.INLINE, EndKind.REQUIRED, // tag itself is deprecated
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	148	EnumSet.of(Flag.EXPECT_CONTENT),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	149	attrs(AttrKind.USE_CSS, SIZE, COLOR, FACE)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	150
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	151	FOOTER(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	152	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)) {
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	153	@Override
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	154	public boolean accepts(HtmlTag t) {
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	155	switch (t) {
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	156	case HEADER: case FOOTER: case MAIN:
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	157	return false;
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	158	default:
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	159	return (t.blockType == BlockType.BLOCK) \|\| (t.blockType == BlockType.INLINE);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	160	}
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	161	}
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	162	},
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	163
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	164	FIGURE(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	165	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	166
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	167	FIGCAPTION(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	168
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	169	FRAME(HtmlVersion.HTML4, BlockType.OTHER, EndKind.NONE),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	170
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	171	FRAMESET(HtmlVersion.HTML4, BlockType.OTHER, EndKind.REQUIRED),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	172
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	173	H1(BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	174	attrs(AttrKind.USE_CSS, ALIGN)),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	175	H2(BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	176	attrs(AttrKind.USE_CSS, ALIGN)),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	177	H3(BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	178	attrs(AttrKind.USE_CSS, ALIGN)),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	179	H4(BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	180	attrs(AttrKind.USE_CSS, ALIGN)),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	181	H5(BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	182	attrs(AttrKind.USE_CSS, ALIGN)),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	183	H6(BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	184	attrs(AttrKind.USE_CSS, ALIGN)),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	185
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	186	HEAD(BlockType.OTHER, EndKind.REQUIRED),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	187
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	188	HEADER(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	189	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)) {
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	190	@Override
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	191	public boolean accepts(HtmlTag t) {
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	192	switch (t) {
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	193	case HEADER: case FOOTER: case MAIN:
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	194	return false;
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	195	default:
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	196	return (t.blockType == BlockType.BLOCK) \|\| (t.blockType == BlockType.INLINE);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	197	}
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	198	}
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	199	},
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	200
19658 2f5e90525d0b 8022173: Relax some warnings in doclint jjg parents: 19511 diff changeset	201	HR(BlockType.BLOCK, EndKind.NONE,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	202	attrs(AttrKind.HTML4, WIDTH),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	203	attrs(AttrKind.USE_CSS, ALIGN, NOSHADE, SIZE)),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	204
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	205	HTML(BlockType.OTHER, EndKind.REQUIRED),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	206
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	207	I(BlockType.INLINE, EndKind.REQUIRED,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	208	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	209
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	210	IFRAME(BlockType.OTHER, EndKind.REQUIRED),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	211
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	212	IMG(BlockType.INLINE, EndKind.NONE,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	213	attrs(AttrKind.ALL, SRC, ALT, HEIGHT, WIDTH),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	214	attrs(AttrKind.HTML5, CROSSORIGIN),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	215	attrs(AttrKind.OBSOLETE, NAME),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	216	attrs(AttrKind.USE_CSS, ALIGN, HSPACE, VSPACE, BORDER)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	217
25452 581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	218	INS(BlockType.INLINE, EndKind.REQUIRED,
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	219	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST),
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	220	attrs(AttrKind.ALL, Attr.CITE, Attr.DATETIME)),
25452 581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	221
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	222	KBD(BlockType.INLINE, EndKind.REQUIRED,
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	223	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	224
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	225	LI(BlockType.LIST_ITEM, EndKind.OPTIONAL,
18001 e6193c14cc7e 8013405: DocLint should support <LI value="value"> jjg parents: 15371 diff changeset	226	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE),
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	227	attrs(AttrKind.ALL, VALUE),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	228	attrs(AttrKind.USE_CSS, TYPE)),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	229
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	230	LINK(BlockType.OTHER, EndKind.NONE),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	231
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	232	MAIN(HtmlVersion.HTML5, BlockType.OTHER, EndKind.REQUIRED),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	233
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	234	MARK(HtmlVersion.HTML5, BlockType.INLINE, EndKind.REQUIRED),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	235
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	236	MENU(BlockType.BLOCK, EndKind.REQUIRED) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	237	@Override
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	238	public boolean accepts(HtmlTag t) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	239	return (t == LI);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	240	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	241	},
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	242
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	243	META(BlockType.OTHER, EndKind.NONE),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	244
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	245	NAV(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	246	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	247
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	248	NOFRAMES(HtmlVersion.HTML4, BlockType.OTHER, EndKind.REQUIRED),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	249
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	250	NOSCRIPT(BlockType.BLOCK, EndKind.REQUIRED),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	251
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	252	OL(BlockType.BLOCK, EndKind.REQUIRED,
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	253	EnumSet.of(Flag.EXPECT_CONTENT),
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	254	attrs(AttrKind.ALL, START, TYPE),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	255	attrs(AttrKind.HTML5, REVERSED),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	256	attrs(AttrKind.USE_CSS, COMPACT)) {
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	257	@Override
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	258	public boolean accepts(HtmlTag t) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	259	return (t == LI);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	260	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	261	},
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	262
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	263	P(BlockType.BLOCK, EndKind.OPTIONAL,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	264	EnumSet.of(Flag.EXPECT_CONTENT),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	265	attrs(AttrKind.USE_CSS, ALIGN)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	266
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	267	PRE(BlockType.BLOCK, EndKind.REQUIRED,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	268	EnumSet.of(Flag.EXPECT_CONTENT),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	269	attrs(AttrKind.USE_CSS, WIDTH)) {
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	270	@Override
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	271	public boolean accepts(HtmlTag t) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	272	switch (t) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	273	case IMG: case BIG: case SMALL: case SUB: case SUP:
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	274	return false;
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	275	default:
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	276	return (t.blockType == BlockType.INLINE);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	277	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	278	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	279	},
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	280
25452 581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	281	Q(BlockType.INLINE, EndKind.REQUIRED,
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	282	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	283
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	284	S(BlockType.INLINE, EndKind.REQUIRED,
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	285	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	286
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	287	SAMP(BlockType.INLINE, EndKind.REQUIRED,
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	288	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	289
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	290	SCRIPT(BlockType.OTHER, EndKind.REQUIRED),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	291
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	292	SECTION(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	293	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	294
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	295	SMALL(BlockType.INLINE, EndKind.REQUIRED,
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	296	EnumSet.of(Flag.EXPECT_CONTENT)),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	297
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	298	SPAN(BlockType.INLINE, EndKind.REQUIRED,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	299	EnumSet.of(Flag.EXPECT_CONTENT)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	300
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	301	STRIKE(HtmlVersion.HTML4, BlockType.INLINE, EndKind.REQUIRED,
25452 581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	302	EnumSet.of(Flag.EXPECT_CONTENT)),
581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	303
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	304	STRONG(BlockType.INLINE, EndKind.REQUIRED,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	305	EnumSet.of(Flag.EXPECT_CONTENT)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	306
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	307	SUB(BlockType.INLINE, EndKind.REQUIRED,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	308	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	309
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	310	SUP(BlockType.INLINE, EndKind.REQUIRED,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	311	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	312
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	313	TABLE(BlockType.BLOCK, EndKind.REQUIRED,
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	314	EnumSet.of(Flag.EXPECT_CONTENT),
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	315	attrs(AttrKind.ALL, BORDER),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	316	attrs(AttrKind.HTML4, SUMMARY, CELLPADDING, CELLSPACING, Attr.FRAME, RULES, WIDTH),
19658 2f5e90525d0b 8022173: Relax some warnings in doclint jjg parents: 19511 diff changeset	317	attrs(AttrKind.USE_CSS, ALIGN, BGCOLOR)) {
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	318	@Override
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	319	public boolean accepts(HtmlTag t) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	320	switch (t) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	321	case CAPTION:
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	322	case COLGROUP:
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	323	case THEAD: case TBODY: case TFOOT:
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	324	case TR: // HTML 3.2
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	325	return true;
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	326	default:
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	327	return false;
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	328	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	329	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	330	},
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	331
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	332	TBODY(BlockType.TABLE_ITEM, EndKind.REQUIRED,
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	333	EnumSet.of(Flag.EXPECT_CONTENT),
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	334	attrs(AttrKind.ALL, VALIGN),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	335	attrs(AttrKind.HTML4, ALIGN, CHAR, CHAROFF)) {
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	336	@Override
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	337	public boolean accepts(HtmlTag t) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	338	return (t == TR);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	339	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	340	},
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	341
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	342	TD(BlockType.TABLE_ITEM, EndKind.OPTIONAL,
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	343	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE),
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	344	attrs(AttrKind.ALL, COLSPAN, ROWSPAN, HEADERS, VALIGN),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	345	attrs(AttrKind.HTML4, AXIS, Attr.ABBR, SCOPE, ALIGN, CHAR, CHAROFF),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	346	attrs(AttrKind.USE_CSS, WIDTH, BGCOLOR, HEIGHT, NOWRAP)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	347
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	348	TEMPLATE(HtmlVersion.HTML5, BlockType.BLOCK, EndKind.REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	349	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE)),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	350
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	351	TFOOT(BlockType.TABLE_ITEM, EndKind.REQUIRED,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	352	attrs(AttrKind.ALL, VALIGN),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	353	attrs(AttrKind.HTML4, ALIGN, CHAR, CHAROFF)) {
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	354	@Override
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	355	public boolean accepts(HtmlTag t) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	356	return (t == TR);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	357	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	358	},
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	359
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	360	TH(BlockType.TABLE_ITEM, EndKind.OPTIONAL,
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	361	EnumSet.of(Flag.ACCEPTS_BLOCK, Flag.ACCEPTS_INLINE),
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	362	attrs(AttrKind.ALL, COLSPAN, ROWSPAN, HEADERS, SCOPE, Attr.ABBR,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	363	VALIGN),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	364	attrs(AttrKind.HTML4, AXIS, ALIGN, CHAR, CHAROFF),
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	365	attrs(AttrKind.USE_CSS, WIDTH, BGCOLOR, HEIGHT, NOWRAP)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	366
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	367	THEAD(BlockType.TABLE_ITEM, EndKind.REQUIRED,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	368	attrs(AttrKind.ALL, VALIGN),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	369	attrs(AttrKind.HTML4, ALIGN, CHAR, CHAROFF)) {
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	370	@Override
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	371	public boolean accepts(HtmlTag t) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	372	return (t == TR);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	373	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	374	},
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	375
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	376	TIME(HtmlVersion.HTML5, BlockType.INLINE, EndKind.REQUIRED),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	377
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	378	TITLE(BlockType.OTHER, EndKind.REQUIRED),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	379
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	380	TR(BlockType.TABLE_ITEM, EndKind.OPTIONAL,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	381	attrs(AttrKind.ALL, VALIGN),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	382	attrs(AttrKind.HTML4, ALIGN, CHAR, CHAROFF),
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	383	attrs(AttrKind.USE_CSS, BGCOLOR)) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	384	@Override
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	385	public boolean accepts(HtmlTag t) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	386	return (t == TH) \|\| (t == TD);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	387	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	388	},
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	389
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	390	TT(HtmlVersion.HTML4, BlockType.INLINE, EndKind.REQUIRED,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	391	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	392
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	393	U(BlockType.INLINE, EndKind.REQUIRED,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	394	EnumSet.of(Flag.EXPECT_CONTENT, Flag.NO_NEST)),
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	395
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	396	UL(BlockType.BLOCK, EndKind.REQUIRED,
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	397	EnumSet.of(Flag.EXPECT_CONTENT),
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	398	attrs(AttrKind.HTML4, COMPACT, TYPE)) {
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	399	@Override
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	400	public boolean accepts(HtmlTag t) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	401	return (t == LI);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	402	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	403	},
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	404
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	405	WBR(HtmlVersion.HTML5, BlockType.INLINE, EndKind.REQUIRED),
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	406
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	407	VAR(BlockType.INLINE, EndKind.REQUIRED);
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	408
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	409	/**
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	410	* Enum representing the type of HTML element.
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	411	*/
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	412	public static enum BlockType {
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	413	BLOCK,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	414	INLINE,
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	415	LIST_ITEM,
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	416	TABLE_ITEM,
22163 3651128c74eb 8030244: Update langtools to use Diamond briangoetz parents: 22153 diff changeset	417	OTHER
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	418	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	419
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	420	/**
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	421	* Enum representing HTML end tag requirement.
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	422	*/
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	423	public static enum EndKind {
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	424	NONE,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	425	OPTIONAL,
22163 3651128c74eb 8030244: Update langtools to use Diamond briangoetz parents: 22153 diff changeset	426	REQUIRED
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	427	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	428
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	429	public static enum Flag {
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	430	ACCEPTS_BLOCK,
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	431	ACCEPTS_INLINE,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	432	EXPECT_CONTENT,
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	433	NO_NEST
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	434	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	435
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	436	public static enum Attr {
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	437	ABBR,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	438	ALIGN,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	439	ALINK,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	440	ALT,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	441	ARIA_ACTIVEDESCENDANT,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	442	ARIA_CONTROLS,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	443	ARIA_DESCRIBEDBY,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	444	ARIA_EXPANDED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	445	ARIA_LABEL,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	446	ARIA_LABELLEDBY,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	447	ARIA_LEVEL,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	448	ARIA_MULTISELECTABLE,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	449	ARIA_OWNS,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	450	ARIA_POSINSET,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	451	ARIA_SETSIZE,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	452	ARIA_READONLY,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	453	ARIA_REQUIRED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	454	ARIA_SELECTED,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	455	ARIA_SORT,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	456	AXIS,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	457	BACKGROUND,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	458	BGCOLOR,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	459	BORDER,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	460	CELLSPACING,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	461	CELLPADDING,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	462	CHAR,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	463	CHAROFF,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	464	CHARSET,
25452 581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	465	CITE,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	466	CLEAR,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	467	CLASS,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	468	COLOR,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	469	COLSPAN,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	470	COMPACT,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	471	COORDS,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	472	CROSSORIGIN,
25452 581d57f5c7d8 8048806: Javadoc errors out on some valid HTML tags jjg parents: 22163 diff changeset	473	DATETIME,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	474	FACE,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	475	FRAME,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	476	FRAMEBORDER,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	477	HEADERS,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	478	HEIGHT,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	479	HREF,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	480	HSPACE,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	481	ID,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	482	LINK,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	483	LONGDESC,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	484	MARGINHEIGHT,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	485	MARGINWIDTH,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	486	NAME,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	487	NOSHADE,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	488	NOWRAP,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	489	PROFILE,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	490	REV,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	491	REVERSED,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	492	ROLE,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	493	ROWSPAN,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	494	RULES,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	495	SCHEME,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	496	SCOPE,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	497	SCROLLING,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	498	SHAPE,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	499	SIZE,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	500	SPACE,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	501	SRC,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	502	START,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	503	STYLE,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	504	SUMMARY,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	505	TARGET,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	506	TEXT,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	507	TYPE,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	508	VALIGN,
18001 e6193c14cc7e 8013405: DocLint should support <LI value="value"> jjg parents: 15371 diff changeset	509	VALUE,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	510	VERSION,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	511	VLINK,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	512	VSPACE,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	513	WIDTH;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	514
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	515	private final String name;
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	516
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	517	Attr() {
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	518	name = StringUtils.toLowerCase(name().replace("_", "-"));
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	519	}
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	520
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	521	public String getText() {
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	522	return name;
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	523	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	524
22163 3651128c74eb 8030244: Update langtools to use Diamond briangoetz parents: 22153 diff changeset	525	static final Map<String,Attr> index = new HashMap<>();
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	526	static {
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	527	for (Attr t: values()) {
15370 c1c9a9e11b26 8006263: Supplementary test cases needed for doclint jjg parents: 14952 diff changeset	528	index.put(t.getText(), t);
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	529	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	530	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	531	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	532
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	533	public static enum AttrKind {
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	534	HTML4,
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	535	HTML5,
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	536	INVALID,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	537	OBSOLETE,
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	538	USE_CSS,
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	539	ALL
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	540	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	541
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	542	// This class exists to avoid warnings from using parameterized vararg type
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	543	// Map<Attr,AttrKind> in signature of HtmlTag constructor.
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	544	private static class AttrMap extends EnumMap<Attr,AttrKind> {
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	545	private static final long serialVersionUID = 0;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	546	AttrMap() {
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	547	super(Attr.class);
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	548	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	549	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	550
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	551
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	552	public final HtmlVersion allowedVersion;
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	553	public final BlockType blockType;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	554	public final EndKind endKind;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	555	public final Set<Flag> flags;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	556	private final Map<Attr,AttrKind> attrs;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	557
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	558	HtmlTag(BlockType blockType, EndKind endKind, AttrMap... attrMaps) {
42828 cce89649f958 8171371: Remove redundant type-arguments from generic method calls mcimadamore parents: 33360 diff changeset	559	this(HtmlVersion.ALL, blockType, endKind, Collections.emptySet(), attrMaps);
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	560	}
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	561
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	562	HtmlTag(HtmlVersion allowedVersion, BlockType blockType, EndKind endKind, AttrMap... attrMaps) {
42828 cce89649f958 8171371: Remove redundant type-arguments from generic method calls mcimadamore parents: 33360 diff changeset	563	this(allowedVersion, blockType, endKind, Collections.emptySet(), attrMaps);
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	564	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	565
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	566	HtmlTag(BlockType blockType, EndKind endKind, Set<Flag> flags, AttrMap... attrMaps) {
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	567	this(HtmlVersion.ALL, blockType, endKind, flags, attrMaps);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	568	}
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	569
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	570	HtmlTag(HtmlVersion allowedVersion, BlockType blockType, EndKind endKind, Set<Flag> flags, AttrMap... attrMaps) {
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	571	this.allowedVersion = allowedVersion;
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	572	this.blockType = blockType;
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	573	this.endKind = endKind;
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	574	this.flags = flags;
22163 3651128c74eb 8030244: Update langtools to use Diamond briangoetz parents: 22153 diff changeset	575	this.attrs = new EnumMap<>(Attr.class);
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	576	for (Map<Attr,AttrKind> m: attrMaps)
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	577	this.attrs.putAll(m);
29957 7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	578	attrs.put(Attr.CLASS, AttrKind.ALL);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	579	attrs.put(Attr.ID, AttrKind.ALL);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	580	attrs.put(Attr.STYLE, AttrKind.ALL);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	581	attrs.put(Attr.ROLE, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	582	// for now, assume that all ARIA attributes are allowed on all tags.
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	583	attrs.put(Attr.ARIA_ACTIVEDESCENDANT, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	584	attrs.put(Attr.ARIA_CONTROLS, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	585	attrs.put(Attr.ARIA_DESCRIBEDBY, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	586	attrs.put(Attr.ARIA_EXPANDED, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	587	attrs.put(Attr.ARIA_LABEL, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	588	attrs.put(Attr.ARIA_LABELLEDBY, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	589	attrs.put(Attr.ARIA_LEVEL, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	590	attrs.put(Attr.ARIA_MULTISELECTABLE, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	591	attrs.put(Attr.ARIA_OWNS, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	592	attrs.put(Attr.ARIA_POSINSET, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	593	attrs.put(Attr.ARIA_READONLY, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	594	attrs.put(Attr.ARIA_REQUIRED, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	595	attrs.put(Attr.ARIA_SELECTED, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	596	attrs.put(Attr.ARIA_SETSIZE, AttrKind.HTML5);
7740f9657f56 8072945: Javadoc should generate valid and compliant HTML5 output bpatel parents: 25874 diff changeset	597	attrs.put(Attr.ARIA_SORT, AttrKind.HTML5);
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	598	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	599
15371 8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	600	public boolean accepts(HtmlTag t) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	601	if (flags.contains(Flag.ACCEPTS_BLOCK) && flags.contains(Flag.ACCEPTS_INLINE)) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	602	return (t.blockType == BlockType.BLOCK) \|\| (t.blockType == BlockType.INLINE);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	603	} else if (flags.contains(Flag.ACCEPTS_BLOCK)) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	604	return (t.blockType == BlockType.BLOCK);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	605	} else if (flags.contains(Flag.ACCEPTS_INLINE)) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	606	return (t.blockType == BlockType.INLINE);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	607	} else
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	608	switch (blockType) {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	609	case BLOCK:
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	610	case INLINE:
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	611	return (t.blockType == BlockType.INLINE);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	612	case OTHER:
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	613	// OTHER tags are invalid in doc comments, and will be
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	614	// reported separately, so silently accept/ignore any content
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	615	return true;
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	616	default:
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	617	// any combination which could otherwise arrive here
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	618	// ought to have been handled in an overriding method
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	619	throw new AssertionError(this + ":" + t);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	620	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	621	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	622
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	623	public boolean acceptsText() {
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	624	// generally, anywhere we can put text we can also put inline tag
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	625	// so check if a typical inline tag is allowed
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	626	return accepts(B);
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	627	}
8f719dc43e1f 8006251: doclint: incorrect position for diagnostic for illegal text in tags jjg parents: 15370 diff changeset	628
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	629	public String getText() {
22153 f9f06fcca59d 8029800: Flags.java uses String.toLowerCase without specifying Locale jlahoda parents: 20253 diff changeset	630	return StringUtils.toLowerCase(name());
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	631	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	632
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	633	public Attr getAttr(Name attrName) {
22153 f9f06fcca59d 8029800: Flags.java uses String.toLowerCase without specifying Locale jlahoda parents: 20253 diff changeset	634	return Attr.index.get(StringUtils.toLowerCase(attrName.toString()));
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	635	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	636
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	637	public AttrKind getAttrKind(Name attrName) {
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	638	AttrKind k = attrs.get(getAttr(attrName)); // null-safe
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	639	return (k == null) ? AttrKind.INVALID : k;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	640	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	641
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	642	private static AttrMap attrs(AttrKind k, Attr... attrs) {
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	643	AttrMap map = new AttrMap();
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	644	for (Attr a: attrs) map.put(a, k);
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	645	return map;
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	646	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	647
33360 d8ef08003d35 8078320: Improve DocTrees parsing. ksrini parents: 29957 diff changeset	648	private static final Map<String, HtmlTag> index = new HashMap<>();
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	649	static {
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	650	for (HtmlTag t: values()) {
15370 c1c9a9e11b26 8006263: Supplementary test cases needed for doclint jjg parents: 14952 diff changeset	651	index.put(t.getText(), t);
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	652	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	653	}
d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	654
33360 d8ef08003d35 8078320: Improve DocTrees parsing. ksrini parents: 29957 diff changeset	655	public static HtmlTag get(Name tagName) {
22153 f9f06fcca59d 8029800: Flags.java uses String.toLowerCase without specifying Locale jlahoda parents: 20253 diff changeset	656	return index.get(StringUtils.toLowerCase(tagName.toString()));
19511 59a48a75fac7 8022080: javadoc generates invalid HTML in Turkish locale jjg parents: 18001 diff changeset	657	}
14952 d0022ae20516 8004832: Add new doclint package jjg parents: diff changeset	658	}

author	mcimadamore
	Fri, 16 Dec 2016 15:27:47 +0000
changeset 42828	cce89649f958
parent 33360	d8ef08003d35
child 43261	d377e97291d8
permissions	-rw-r--r--