langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/taglets/ReturnTaglet.java
equal
deleted
inserted
replaced
32 import javax.lang.model.element.ExecutableElement; |
32 import javax.lang.model.element.ExecutableElement; |
33 import javax.lang.model.type.TypeMirror; |
33 import javax.lang.model.type.TypeMirror; |
34 |
34 |
35 import com.sun.source.doctree.DocTree; |
35 import com.sun.source.doctree.DocTree; |
36 import jdk.javadoc.internal.doclets.toolkit.Content; |
36 import jdk.javadoc.internal.doclets.toolkit.Content; |
|
37 import jdk.javadoc.internal.doclets.toolkit.Messages; |
37 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper; |
38 import jdk.javadoc.internal.doclets.toolkit.util.CommentHelper; |
38 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder; |
39 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder; |
39 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder.Input; |
40 import jdk.javadoc.internal.doclets.toolkit.util.DocFinder.Input; |
40 import jdk.javadoc.internal.doclets.toolkit.util.Utils; |
41 import jdk.javadoc.internal.doclets.toolkit.util.Utils; |
41 |
42 |
85 |
86 |
86 /** |
87 /** |
87 * {@inheritDoc} |
88 * {@inheritDoc} |
88 */ |
89 */ |
89 public Content getTagletOutput(Element holder, TagletWriter writer) { |
90 public Content getTagletOutput(Element holder, TagletWriter writer) { |
|
91 Messages messages = writer.configuration().getMessages(); |
90 Utils utils = writer.configuration().utils; |
92 Utils utils = writer.configuration().utils; |
91 TypeMirror returnType = utils.getReturnType((ExecutableElement)holder); |
93 TypeMirror returnType = utils.getReturnType((ExecutableElement)holder); |
92 List<? extends DocTree> tags = utils.getBlockTags(holder, name); |
94 List<? extends DocTree> tags = utils.getBlockTags(holder, name); |
93 |
95 |
94 //Make sure we are not using @return tag on method with void return type. |
96 //Make sure we are not using @return tag on method with void return type. |
95 if (returnType != null && utils.isVoid(returnType)) { |
97 if (returnType != null && utils.isVoid(returnType)) { |
96 if (!tags.isEmpty()) { |
98 if (!tags.isEmpty()) { |
97 writer.getMsgRetriever().warning(holder, "doclet.Return_tag_on_void_method"); |
99 messages.warning(holder, "doclet.Return_tag_on_void_method"); |
98 } |
100 } |
99 return null; |
101 return null; |
100 } |
102 } |
101 if (!tags.isEmpty()) |
103 if (!tags.isEmpty()) |
102 return writer.returnTagOutput(holder, tags.get(0)); |
104 return writer.returnTagOutput(holder, tags.get(0)); |