src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
changeset 47450 d3e20c816f60
parent 47427 251676148c62
child 47846 4e78aba768f0
equal deleted inserted replaced
47449:afa66f3c34c1 47450:d3e20c816f60
    34 import javax.lang.model.element.TypeElement;
    34 import javax.lang.model.element.TypeElement;
    35 import javax.lang.model.element.TypeParameterElement;
    35 import javax.lang.model.element.TypeParameterElement;
    36 import javax.lang.model.type.TypeMirror;
    36 import javax.lang.model.type.TypeMirror;
    37 
    37 
    38 import com.sun.source.doctree.DocTree;
    38 import com.sun.source.doctree.DocTree;
    39 import jdk.javadoc.internal.doclets.formats.html.TableHeader;
       
    40 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
    39 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr;
    41 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
    40 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
    42 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
    41 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
    43 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
    42 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
    44 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
    43 import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
    45 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
    44 import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
    46 import jdk.javadoc.internal.doclets.toolkit.Content;
    45 import jdk.javadoc.internal.doclets.toolkit.Content;
       
    46 import jdk.javadoc.internal.doclets.toolkit.MemberSummaryWriter;
    47 import jdk.javadoc.internal.doclets.toolkit.Resources;
    47 import jdk.javadoc.internal.doclets.toolkit.Resources;
    48 import jdk.javadoc.internal.doclets.toolkit.taglets.DeprecatedTaglet;
    48 import jdk.javadoc.internal.doclets.toolkit.taglets.DeprecatedTaglet;
    49 import jdk.javadoc.internal.doclets.toolkit.util.MethodTypes;
    49 import jdk.javadoc.internal.doclets.toolkit.util.MethodTypes;
    50 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
    50 import jdk.javadoc.internal.doclets.toolkit.util.Utils;
    51 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap;
    51 import jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap;
    63  * @author Robert Field
    63  * @author Robert Field
    64  * @author Atul M Dambalkar
    64  * @author Atul M Dambalkar
    65  * @author Jamie Ho (Re-write)
    65  * @author Jamie Ho (Re-write)
    66  * @author Bhavesh Patel (Modified)
    66  * @author Bhavesh Patel (Modified)
    67  */
    67  */
    68 public abstract class AbstractMemberWriter {
    68 public abstract class AbstractMemberWriter implements MemberSummaryWriter {
    69 
    69 
    70     protected final HtmlConfiguration configuration;
    70     protected final HtmlConfiguration configuration;
    71     protected final Utils utils;
    71     protected final Utils utils;
    72     protected final SubWriterHolderWriter writer;
    72     protected final SubWriterHolderWriter writer;
    73     protected final Contents contents;
    73     protected final Contents contents;
   517      * @param firstSentenceTags the first sentence tags to be added to the summary
   517      * @param firstSentenceTags the first sentence tags to be added to the summary
   518      * @param tableContents the list of contents to which the documentation will be added
   518      * @param tableContents the list of contents to which the documentation will be added
   519      * @param counter the counter for determining id and style for the table row
   519      * @param counter the counter for determining id and style for the table row
   520      */
   520      */
   521     public void addMemberSummary(TypeElement tElement, Element member,
   521     public void addMemberSummary(TypeElement tElement, Element member,
   522             List<? extends DocTree> firstSentenceTags, List<Content> tableContents, int counter) {
   522             List<? extends DocTree> firstSentenceTags, List<Content> tableContents, int counter,
       
   523             VisibleMemberMap.Kind vmmKind) {
   523         HtmlTree tdSummaryType = new HtmlTree(HtmlTag.TD);
   524         HtmlTree tdSummaryType = new HtmlTree(HtmlTag.TD);
   524         tdSummaryType.addStyle(HtmlStyle.colFirst);
   525         tdSummaryType.addStyle(HtmlStyle.colFirst);
   525         writer.addSummaryType(this, member, tdSummaryType);
   526         writer.addSummaryType(this, member, tdSummaryType);
   526         HtmlTree tr = HtmlTree.TR(tdSummaryType);
   527         HtmlTree tr = HtmlTree.TR(tdSummaryType);
   527         HtmlTree thSummaryLink = new HtmlTree(HtmlTag.TH);
   528         HtmlTree thSummaryLink = new HtmlTree(HtmlTag.TH);
   530         tr.addContent(thSummaryLink);
   531         tr.addContent(thSummaryLink);
   531         HtmlTree tdDesc = new HtmlTree(HtmlTag.TD);
   532         HtmlTree tdDesc = new HtmlTree(HtmlTag.TD);
   532         tdDesc.addStyle(HtmlStyle.colLast);
   533         tdDesc.addStyle(HtmlStyle.colLast);
   533         writer.addSummaryLinkComment(this, member, firstSentenceTags, tdDesc);
   534         writer.addSummaryLinkComment(this, member, firstSentenceTags, tdDesc);
   534         tr.addContent(tdDesc);
   535         tr.addContent(tdDesc);
   535         if (utils.isMethod(member) && !utils.isAnnotationType(member) && !utils.isProperty(name(member))) {
   536         if (utils.isMethod(member) && !utils.isAnnotationType(member)
       
   537                 && vmmKind != VisibleMemberMap.Kind.PROPERTIES) {
   536             int methodType = utils.isStatic(member) ? MethodTypes.STATIC.tableTabs().value() :
   538             int methodType = utils.isStatic(member) ? MethodTypes.STATIC.tableTabs().value() :
   537                     MethodTypes.INSTANCE.tableTabs().value();
   539                     MethodTypes.INSTANCE.tableTabs().value();
   538             if (utils.isInterface(member.getEnclosingElement())) {
   540             if (utils.isInterface(member.getEnclosingElement())) {
   539                 methodType = utils.isAbstract(member)
   541                 methodType = utils.isAbstract(member)
   540                         ? methodType | MethodTypes.ABSTRACT.tableTabs().value()
   542                         ? methodType | MethodTypes.ABSTRACT.tableTabs().value()