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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Mon Mar 09 13:34:19 2009 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java	Mon Mar 09 23:53:41 2009 -0700
     1.3 @@ -25,13 +25,13 @@
     1.4  
     1.5  package com.sun.tools.doclets.formats.html;
     1.6  
     1.7 +import java.io.*;
     1.8 +
     1.9 +import com.sun.javadoc.*;
    1.10  import com.sun.tools.doclets.internal.toolkit.*;
    1.11  import com.sun.tools.doclets.internal.toolkit.util.*;
    1.12  import com.sun.tools.doclets.internal.toolkit.taglets.*;
    1.13  
    1.14 -import java.io.*;
    1.15 -import com.sun.javadoc.*;
    1.16 -
    1.17  /**
    1.18   * Writes method documentation in HTML format.
    1.19   *
    1.20 @@ -172,7 +172,7 @@
    1.21          writeParameters(method);
    1.22          writeExceptions(method);
    1.23          writer.preEnd();
    1.24 -        writer.dl();
    1.25 +        assert !writer.getMemberDetailsListPrinted();
    1.26      }
    1.27  
    1.28      /**
    1.29 @@ -181,12 +181,7 @@
    1.30       * @param method the method being documented.
    1.31       */
    1.32      public void writeDeprecated(MethodDoc method) {
    1.33 -        String output = ((TagletOutputImpl)
    1.34 -            (new DeprecatedTaglet()).getTagletOutput(method,
    1.35 -            writer.getTagletWriterInstance(false))).toString();
    1.36 -        if (output != null && output.trim().length() > 0) {
    1.37 -            writer.print(output);
    1.38 -        }
    1.39 +        printDeprecated(method);
    1.40      }
    1.41  
    1.42      /**
    1.43 @@ -197,11 +192,13 @@
    1.44      public void writeComments(Type holder, MethodDoc method) {
    1.45          ClassDoc holderClassDoc = holder.asClassDoc();
    1.46          if (method.inlineTags().length > 0) {
    1.47 +            writer.printMemberDetailsListStartTag();
    1.48              if (holder.asClassDoc().equals(classdoc) ||
    1.49                  (! (holderClassDoc.isPublic() ||
    1.50                      Util.isLinkable(holderClassDoc, configuration())))) {
    1.51                  writer.dd();
    1.52                  writer.printInlineComment(method);
    1.53 +                writer.ddEnd();
    1.54              } else {
    1.55                  String classlink = writer.codeText(
    1.56                      writer.getDocLink(LinkInfoImpl.CONTEXT_METHOD_DOC_COPY,
    1.57 @@ -217,6 +214,7 @@
    1.58                  writer.ddEnd();
    1.59                  writer.dd();
    1.60                  writer.printInlineComment(method);
    1.61 +                writer.ddEnd();
    1.62              }
    1.63          }
    1.64      }
    1.65 @@ -234,8 +232,7 @@
    1.66       * Write the method footer.
    1.67       */
    1.68      public void writeMethodFooter() {
    1.69 -        writer.ddEnd();
    1.70 -        writer.dlEnd();
    1.71 +        printMemberFooter();
    1.72      }
    1.73  
    1.74      /**
    1.75 @@ -318,6 +315,7 @@
    1.76              String name = method.name();
    1.77              writer.dt();
    1.78              writer.strongText(label);
    1.79 +            writer.dtEnd();
    1.80              writer.dd();
    1.81              String methLink = writer.codeText(
    1.82                  writer.getLink(
    1.83 @@ -326,6 +324,7 @@
    1.84                          writer.getAnchor(method), name, false)
    1.85                  ));
    1.86              writer.printText("doclet.in_class", methLink, overriddenTypeLink);
    1.87 +            writer.ddEnd();
    1.88          }
    1.89      }
    1.90  
    1.91 @@ -364,11 +363,13 @@
    1.92                      LinkInfoImpl.CONTEXT_METHOD_SPECIFIED_BY, intfac)));
    1.93              writer.dt();
    1.94              writer.strongText("doclet.Specified_By");
    1.95 +            writer.dtEnd();
    1.96              writer.dd();
    1.97              methlink = writer.codeText(writer.getDocLink(
    1.98                  LinkInfoImpl.CONTEXT_MEMBER, implementedMeth,
    1.99                  implementedMeth.name(), false));
   1.100              writer.printText("doclet.in_interface", methlink, intfaclink);
   1.101 +            writer.ddEnd();
   1.102          }
   1.103  
   1.104      }