1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java Mon Mar 09 13:34:19 2009 -0700
1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java Mon Mar 09 23:53:41 2009 -0700
1.3 @@ -25,9 +25,9 @@
1.4
1.5 package com.sun.tools.doclets.formats.html;
1.6
1.7 +import com.sun.javadoc.*;
1.8 import com.sun.tools.doclets.internal.toolkit.*;
1.9 import com.sun.tools.doclets.internal.toolkit.taglets.*;
1.10 -import com.sun.javadoc.*;
1.11
1.12 /**
1.13 * Generate serialized form for Serializable/Externalizable methods.
1.14 @@ -66,14 +66,12 @@
1.15 writeSignature(member);
1.16 }
1.17
1.18 - public void writeMemberFooter(MethodDoc member) {
1.19 - writer.dlEnd();
1.20 + public void writeMemberFooter() {
1.21 + printMemberFooter();
1.22 }
1.23
1.24 public void writeDeprecatedMemberInfo(MethodDoc member) {
1.25 - print(((TagletOutputImpl)
1.26 - (new DeprecatedTaglet()).getTagletOutput(member,
1.27 - writer.getTagletWriterInstance(false))).toString());
1.28 + printDeprecated(member);
1.29 }
1.30
1.31 public void writeMemberDescription(MethodDoc member) {
1.32 @@ -81,23 +79,27 @@
1.33 }
1.34
1.35 public void writeMemberTags(MethodDoc member) {
1.36 - writer.dd();
1.37 - writer.dl();
1.38 TagletOutputImpl output = new TagletOutputImpl("");
1.39 TagletManager tagletManager =
1.40 ConfigurationImpl.getInstance().tagletManager;
1.41 TagletWriter.genTagOuput(tagletManager, member,
1.42 tagletManager.getSerializedFormTags(),
1.43 writer.getTagletWriterInstance(false), output);
1.44 - print(output.toString());
1.45 + String outputString = output.toString().trim();
1.46 + if (!outputString.isEmpty()) {
1.47 + writer.printMemberDetailsListStartTag();
1.48 + writer.dd();
1.49 + writer.dl();
1.50 + print(outputString);
1.51 + writer.dlEnd();
1.52 + writer.ddEnd();
1.53 + }
1.54 MethodDoc method = member;
1.55 if (method.name().compareTo("writeExternal") == 0
1.56 && method.tags("serialData").length == 0) {
1.57 serialWarning(member.position(), "doclet.MissingSerialDataTag",
1.58 method.containingClass().qualifiedName(), method.name());
1.59 }
1.60 - writer.ddEnd();
1.61 - writer.dlEnd();
1.62 }
1.63
1.64 protected void printTypeLinkNoDimension(Type type) {
