jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java

-:081d7c72ee92
+:ca8808c88f94
 package com.sun.tools.doclets.internal.toolkit.taglets;
 import java.util.*;
 import com.sun.javadoc.*;
+import com.sun.tools.doclets.internal.toolkit.Content;
 import com.sun.tools.doclets.internal.toolkit.util.*;
 /**
 * A taglet that represents the @param tag.
 *
 * Given an array of <code>ParamTag</code>s,return its string representation.
 * @param holder the member that holds the param tags.
 * @param writer the TagletWriter that will write this tag.
 * @return the TagletOutput representation of these <code>ParamTag</code>s.
 */
-public TagletOutput getTagletOutput(Doc holder, TagletWriter writer) {
+public Content getTagletOutput(Doc holder, TagletWriter writer) {
 if (holder instanceof ExecutableMemberDoc) {
 ExecutableMemberDoc member = (ExecutableMemberDoc) holder;
-TagletOutput output = getTagletOutput(false, member, writer,
+Content output = getTagletOutput(false, member, writer,
 member.typeParameters(), member.typeParamTags());
-output.appendOutput(getTagletOutput(true, member, writer,
+output.addContent(getTagletOutput(true, member, writer,
 member.parameters(), member.paramTags()));
 return output;
 } else {
 ClassDoc classDoc = (ClassDoc) holder;
 return getTagletOutput(false, classDoc, writer,
 * @param formalParameters  The array of parmeters (from type or executable
 *                          member) to check.
 *
 * @return the TagletOutput representation of these <code>ParamTag</code>s.
 */
-private TagletOutput getTagletOutput(boolean isNonTypeParams, Doc holder,
+private Content getTagletOutput(boolean isNonTypeParams, Doc holder,
 TagletWriter writer, Object[] formalParameters, ParamTag[] paramTags) {
-TagletOutput result = writer.getOutputInstance();
+Content result = writer.getOutputInstance();
 Set<String> alreadyDocumented = new HashSet<String>();
 if (paramTags.length > 0) {
-result.appendOutput(
+result.addContent(
 processParamTags(isNonTypeParams, paramTags,
 getRankMap(formalParameters), writer, alreadyDocumented)
 );
 }
 if (alreadyDocumented.size() != formalParameters.length) {
 //Some parameters are missing corresponding @param tags.
 //Try to inherit them.
-result.appendOutput(getInheritedTagletOutput (isNonTypeParams, holder,
+result.addContent(getInheritedTagletOutput (isNonTypeParams, holder,
 writer, formalParameters, alreadyDocumented));
 }
 return result;
 }
 /**
 * Loop through each indivitual parameter.  It it does not have a
 * corresponding param tag, try to inherit it.
 */
-private TagletOutput getInheritedTagletOutput(boolean isNonTypeParams, Doc holder,
+private Content getInheritedTagletOutput(boolean isNonTypeParams, Doc holder,
 TagletWriter writer, Object[] formalParameters,
 Set<String> alreadyDocumented) {
-TagletOutput result = writer.getOutputInstance();
+Content result = writer.getOutputInstance();
 if ((! alreadyDocumented.contains(null)) &&
 holder instanceof MethodDoc) {
 for (int i = 0; i < formalParameters.length; i++) {
 if (alreadyDocumented.contains(String.valueOf(i))) {
 continue;
 DocFinder.Output inheritedDoc =
 DocFinder.search(new DocFinder.Input((MethodDoc) holder, this,
 String.valueOf(i), ! isNonTypeParams));
 if (inheritedDoc.inlineTags != null &&
 inheritedDoc.inlineTags.length > 0) {
-result.appendOutput(
+result.addContent(
 processParamTag(isNonTypeParams, writer,
 (ParamTag) inheritedDoc.holderTag,
 isNonTypeParams ?
 ((Parameter) formalParameters[i]).name():
 ((TypeVariable) formalParameters[i]).typeName(),
 *                    information about the parameters.
 * @param rankMap a {@link java.util.Map} which holds a mapping
 *                of a rank of a parameter to its name.  This is
 *                used to ensure that the right name is used
 *                when parameter documentation is inherited.
-* @return the TagletOutput representation of this <code>Tag</code>.
+* @return the Content representation of this <code>Tag</code>.
 */
-private TagletOutput processParamTags(boolean isNonTypeParams,
+private Content processParamTags(boolean isNonTypeParams,
 ParamTag[] paramTags, Map<String, String> rankMap, TagletWriter writer,
 Set<String> alreadyDocumented) {
-TagletOutput result = writer.getOutputInstance();
+Content result = writer.getOutputInstance();
 if (paramTags.length > 0) {
 for (int i = 0; i < paramTags.length; ++i) {
 ParamTag pt = paramTags[i];
 String paramName = isNonTypeParams ?
 pt.parameterName() : "<" + pt.parameterName() + ">";
 isNonTypeParams ?
 "doclet.Parameters_dup_warn" :
 "doclet.Type_Parameters_dup_warn",
 paramName);
 }
-result.appendOutput(processParamTag(isNonTypeParams, writer, pt,
+result.addContent(processParamTag(isNonTypeParams, writer, pt,
 pt.parameterName(), alreadyDocumented.size() == 0));
 alreadyDocumented.add(rank);
 }
 }
 return result;
 }
 /**
-* Convert the individual ParamTag into TagletOutput.
+* Convert the individual ParamTag into Content.
 *
 * @param isNonTypeParams true if this is just a regular param tag.  False
 *                        if this is a type param tag.
 * @param writer          the taglet writer for output writing.
 * @param paramTag        the tag whose inline tags will be printed.
 *                        the name in the param tag because we might be
 *                        inheriting documentation.
 * @param isFirstParam    true if this is the first param tag being printed.
 *
 */
-private TagletOutput processParamTag(boolean isNonTypeParams,
+private Content processParamTag(boolean isNonTypeParams,
 TagletWriter writer, ParamTag paramTag, String name,
 boolean isFirstParam) {
-TagletOutput result = writer.getOutputInstance();
+Content result = writer.getOutputInstance();
 String header = writer.configuration().getText(
 isNonTypeParams ? "doclet.Parameters" : "doclet.TypeParameters");
 if (isFirstParam) {
-result.appendOutput(writer.getParamHeader(header));
+result.addContent(writer.getParamHeader(header));
 }
-result.appendOutput(writer.paramTagOutput(paramTag,
+result.addContent(writer.paramTagOutput(paramTag,
 name));
 return result;
 }
 }

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java

src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java