jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java

-:bcbc86cc5b31
+:90af8d87741f
 */
 package com.sun.tools.doclets.formats.html;
 import com.sun.javadoc.*;
+import com.sun.tools.doclets.formats.html.markup.*;
+import com.sun.tools.doclets.internal.toolkit.*;
+import com.sun.tools.doclets.internal.toolkit.util.*;
 /**
 * Print method and constructor info.
 *
 * @author Robert Field
 * @author Atul M Dambalkar
+* @author Bhavesh Patel (Modified)
 */
 public abstract class AbstractExecutableMemberWriter extends AbstractMemberWriter {
 public AbstractExecutableMemberWriter(SubWriterHolderWriter writer,
 ClassDoc classdoc) {
 public AbstractExecutableMemberWriter(SubWriterHolderWriter writer) {
 super(writer);
 }
 /**
-* Write the type parameters for the executable member.
+* Add the type parameters for the executable member.
 *
 * @param member the member to write type parameters for.
+* @param htmltree the content tree to which the parameters will be added.
 * @return the display length required to write this information.
 */
-protected int writeTypeParameters(ExecutableMemberDoc member) {
+protected int addTypeParameters(ExecutableMemberDoc member, Content htmltree) {
 LinkInfoImpl linkInfo = new LinkInfoImpl(
 LinkInfoImpl.CONTEXT_MEMBER_TYPE_PARAMS, member, false);
 String typeParameters = writer.getTypeParameterLinks(linkInfo);
 if (linkInfo.displayLength > 0) {
-writer.print(typeParameters + " ");
+Content linkContent = new RawHtml(typeParameters);
+htmltree.addContent(linkContent);
+htmltree.addContent(writer.getSpace());
 writer.displayLength += linkInfo.displayLength + 1;
 }
 return linkInfo.displayLength;
 }
-protected void writeSignature(ExecutableMemberDoc member) {
+/**
-writer.displayLength = 0;
+* {@inheritDoc}
-writer.pre();
+*/
-writer.writeAnnotationInfo(member);
+protected Content getDeprecatedLink(ProgramElementDoc member) {
-printModifiers(member);
-writeTypeParameters(member);
-if (configuration().linksource &&
-member.position().line() != classdoc.position().line()) {
-writer.printSrcLink(member, member.name());
-} else {
-strong(member.name());
-}
-writeParameters(member);
-writeExceptions(member);
-writer.preEnd();
-}
-protected void writeDeprecatedLink(ProgramElementDoc member) {
 ExecutableMemberDoc emd = (ExecutableMemberDoc)member;
-writer.printDocLink(LinkInfoImpl.CONTEXT_MEMBER, (MemberDoc) emd,
+return writer.getDocLink(LinkInfoImpl.CONTEXT_MEMBER, (MemberDoc) emd,
-emd.qualifiedName() + emd.flatSignature(), false);
+emd.qualifiedName() + emd.flatSignature());
 }
-protected void writeSummaryLink(int context, ClassDoc cd, ProgramElementDoc member) {
+/**
+* Add the summary link for the member.
+*
+* @param context the id of the context where the link will be printed
+* @param classDoc the classDoc that we should link to
+* @param member the member being linked to
+* @param tdSummary the content tree to which the link will be added
+*/
+protected void addSummaryLink(int context, ClassDoc cd, ProgramElementDoc member,
+Content tdSummary) {
 ExecutableMemberDoc emd = (ExecutableMemberDoc)member;
 String name = emd.name();
-writer.strong();
+Content strong = HtmlTree.STRONG(new RawHtml(
-writer.printDocLink(context, cd, (MemberDoc) emd,
+writer.getDocLink(context, cd, (MemberDoc) emd,
-name, false);
+name, false)));
-writer.strongEnd();
+Content code = HtmlTree.CODE(strong);
 writer.displayLength = name.length();
-writeParameters(emd, false);
+addParameters(emd, false, code);
-}
+tdSummary.addContent(code);
+}
-protected void writeInheritedSummaryLink(ClassDoc cd,
-ProgramElementDoc member) {
+/**
-writer.printDocLink(LinkInfoImpl.CONTEXT_MEMBER, cd, (MemberDoc) member,
+* Add the inherited summary link for the member.
-member.name(), false);
+*
-}
+* @param classDoc the classDoc that we should link to
+* @param member the member being linked to
-protected void writeParam(ExecutableMemberDoc member, Parameter param,
+* @param linksTree the content tree to which the link will be added
-boolean isVarArg) {
+*/
+protected void addInheritedSummaryLink(ClassDoc cd,
+ProgramElementDoc member, Content linksTree) {
+linksTree.addContent(new RawHtml(
+writer.getDocLink(LinkInfoImpl.CONTEXT_MEMBER, cd, (MemberDoc) member,
+member.name(), false)));
+}
+/**
+* Add the parameter for the executable member.
+*
+* @param member the member to write parameter for.
+* @param param the parameter that needs to be written.
+* @param isVarArg true if this is a link to var arg.
+* @param tree the content tree to which the parameter information will be added.
+*/
+protected void addParam(ExecutableMemberDoc member, Parameter param,
+boolean isVarArg, Content tree) {
 if (param.type() != null) {
-writer.printLink(new LinkInfoImpl(
+Content link = new RawHtml(writer.getLink(new LinkInfoImpl(
 LinkInfoImpl.CONTEXT_EXECUTABLE_MEMBER_PARAM, param.type(),
-isVarArg));
+isVarArg)));
+tree.addContent(link);
 }
 if(param.name().length() > 0) {
-writer.space();
+tree.addContent(writer.getSpace());
-writer.print(param.name());
+tree.addContent(param.name());
 }
 }
-protected void writeParameters(ExecutableMemberDoc member) {
+/**
-writeParameters(member, true);
+* Add all the parameters for the executable member.
-}
+*
+* @param member the member to write parameters for.
-protected void writeParameters(ExecutableMemberDoc member,
+* @param tree the content tree to which the parameters information will be added.
-boolean includeAnnotations) {
+*/
-print('(');
+protected void addParameters(ExecutableMemberDoc member, Content htmltree) {
+addParameters(member, true, htmltree);
+}
+/**
+* Add all the parameters for the executable member.
+*
+* @param member the member to write parameters for.
+* @param includeAnnotations true if annotation information needs to be added.
+* @param tree the content tree to which the parameters information will be added.
+*/
+protected void addParameters(ExecutableMemberDoc member,
+boolean includeAnnotations, Content htmltree) {
+htmltree.addContent("(");
 Parameter[] params = member.parameters();
 String indent = makeSpace(writer.displayLength);
 if (configuration().linksource) {
 //add spaces to offset indentation changes caused by link.
 indent+= makeSpace(member.name().length());
 int paramstart;
 for (paramstart = 0; paramstart < params.length; paramstart++) {
 Parameter param = params[paramstart];
 if (!param.name().startsWith("this$")) {
 if (includeAnnotations) {
 boolean foundAnnotations =
-writer.writeAnnotationInfo(indent.length(), member, param);
+writer.addAnnotationInfo(indent.length(),
-if (foundAnnotations) {
+member, param, htmltree);
-writer.println();
+if (foundAnnotations) {
-writer.print(indent);
+htmltree.addContent(DocletConstants.NL);
+htmltree.addContent(indent);
 }
 }
-writeParam(member, param,
+addParam(member, param,
-(paramstart == params.length - 1) && member.isVarArgs());
+(paramstart == params.length - 1) && member.isVarArgs(), htmltree);
 break;
 }
 }
 for (int i = paramstart + 1; i < params.length; i++) {
-writer.print(',');
+htmltree.addContent(",");
-writer.println();
+htmltree.addContent(DocletConstants.NL);
-writer.print(indent);
+htmltree.addContent(indent);
 if (includeAnnotations) {
 boolean foundAnnotations =
-writer.writeAnnotationInfo(indent.length(), member, params[i]);
+writer.addAnnotationInfo(indent.length(), member, params[i],
+htmltree);
 if (foundAnnotations) {
-writer.println();
+htmltree.addContent(DocletConstants.NL);
-writer.print(indent);
+htmltree.addContent(indent);
 }
 }
-writeParam(member, params[i], (i == params.length - 1) && member.isVarArgs());
+addParam(member, params[i], (i == params.length - 1) && member.isVarArgs(),
-}
+htmltree);
-writer.print(')');
+}
-}
+htmltree.addContent(")");
+}
-protected void writeExceptions(ExecutableMemberDoc member) {
+/**
+* Add exceptions for the executable member.
+*
+* @param member the member to write exceptions for.
+* @param htmltree the content tree to which the exceptions information will be added.
+*/
+protected void addExceptions(ExecutableMemberDoc member, Content htmltree) {
 Type[] exceptions = member.thrownExceptionTypes();
 if(exceptions.length > 0) {
 LinkInfoImpl memberTypeParam = new LinkInfoImpl(
 LinkInfoImpl.CONTEXT_MEMBER, member, false);
 int retlen = getReturnTypeLength(member);
 writer.getTypeParameterLinks(memberTypeParam);
 retlen += memberTypeParam.displayLength == 0 ?
 0 : memberTypeParam.displayLength + 1;
 String indent = makeSpace(modifierString(member).length() +
 member.name().length() + retlen - 4);
-writer.println();
+htmltree.addContent(DocletConstants.NL);
-writer.print(indent);
+htmltree.addContent(indent);
-writer.print("throws ");
+htmltree.addContent("throws ");
 indent += "       ";
-writer.printLink(new LinkInfoImpl(
+Content link = new RawHtml(writer.getLink(new LinkInfoImpl(
-LinkInfoImpl.CONTEXT_MEMBER, exceptions[0]));
+LinkInfoImpl.CONTEXT_MEMBER, exceptions[0])));
+htmltree.addContent(link);
 for(int i = 1; i < exceptions.length; i++) {
-writer.println(",");
+htmltree.addContent(",");
-writer.print(indent);
+htmltree.addContent(DocletConstants.NL);
-writer.printLink(new LinkInfoImpl(
+htmltree.addContent(indent);
-LinkInfoImpl.CONTEXT_MEMBER, exceptions[i]));
+Content exceptionLink = new RawHtml(writer.getLink(new LinkInfoImpl(
+LinkInfoImpl.CONTEXT_MEMBER, exceptions[i])));
+htmltree.addContent(exceptionLink);
 }
 }
 }
 protected int getReturnTypeLength(ExecutableMemberDoc member) {

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

comparison: src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java

src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java