From 22b59b66d975845da778220d983a1693e7f7055f Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Tue, 27 Sep 2022 21:18:12 +0000
Subject: [PATCH] 8294471: SpecTaglet is inconsistent with SpecTree for inline
property
Reviewed-by: prappo
---
.../internal/doclets/toolkit/taglets/SpecTaglet.java | 7 +------
.../jdk/javadoc/doclet/testTaglets/TestTaglets.java | 4 ++--
.../jdk/javadoc/doclet/testTaglets/TestTaglets.out | 2 +-
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SpecTaglet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SpecTaglet.java
index 4cbf20e9039..110aa074318 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SpecTaglet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/SpecTaglet.java
@@ -44,12 +44,7 @@ import jdk.javadoc.internal.doclets.toolkit.util.Utils;
public class SpecTaglet extends BaseTaglet implements InheritableTaglet {
public SpecTaglet() {
- super(DocTree.Kind.SPEC, true, EnumSet.allOf(Location.class));
- }
-
- @Override
- public boolean isBlockTag() {
- return true;
+ super(DocTree.Kind.SPEC, false, EnumSet.allOf(Location.class));
}
@Override
diff --git a/test/langtools/jdk/javadoc/doclet/testTaglets/TestTaglets.java b/test/langtools/jdk/javadoc/doclet/testTaglets/TestTaglets.java
index 52a5ef887e2..d76a425a976 100644
--- a/test/langtools/jdk/javadoc/doclet/testTaglets/TestTaglets.java
+++ b/test/langtools/jdk/javadoc/doclet/testTaglets/TestTaglets.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8202947
+ * @bug 8202947 8294471
* @summary Test TagletManager initialization
* @library /tools/lib ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
diff --git a/test/langtools/jdk/javadoc/doclet/testTaglets/TestTaglets.out b/test/langtools/jdk/javadoc/doclet/testTaglets/TestTaglets.out
index 25ced2993fb..4cc2f1fa998 100644
--- a/test/langtools/jdk/javadoc/doclet/testTaglets/TestTaglets.out
+++ b/test/langtools/jdk/javadoc/doclet/testTaglets/TestTaglets.out
@@ -21,7 +21,7 @@
@serialField: block ........ ...... ....... .... ........... ...... field ...... ........
@since: block overview module package type constructor method field ...... ........
{@snippet}: ..... overview module package type constructor method field inline ........
- @spec: block overview module package type constructor method field inline ........
+ @spec: block overview module package type constructor method field ...... ........
{@summary}: ..... overview module package type constructor method field inline ........
{@systemProperty}: ..... overview module package type constructor method field inline ........
@throws: block ........ ...... ....... .... constructor method ..... ...... ........