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

-:2c0076945b1a
+:8c55d5b0ed71
 * CA 95054 USA or visit www.sun.com if you need additional information or
 * have any questions.
 */
 package com.sun.tools.doclets.formats.html;
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
+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.*;
 import com.sun.tools.doclets.internal.toolkit.taglets.*;
-import com.sun.javadoc.*;
-import java.io.*;
-import java.text.SimpleDateFormat;
-import java.util.*;
 /**
 * Class for the Html Format Code Generation specific to JavaDoc.
 * This Class contains methods related to the Html Code Generation which
 * are used extensively while generating the entire documentation.
 *
 * @since 1.2
 * @author Atul M Dambalkar
 * @author Robert Field
+* @author Bhavesh Patel (Modified)
 */
 public class HtmlDocletWriter extends HtmlDocWriter {
 /**
 * Relative path from the file getting generated to the destination
 }
 private void printMethodInfo(MethodDoc method) {
 ClassDoc[] intfacs = method.containingClass().interfaces();
 MethodDoc overriddenMethod = method.overriddenMethod();
-if (intfacs.length > 0 || overriddenMethod != null) {
+// Check whether there is any implementation or overridden info to be
+// printed. If no overridden or implementation info needs to be
+// printed, do not print this section.
+if ((intfacs.length > 0 &&
+new ImplementedMethods(method, this.configuration).build().length > 0) ||
+overriddenMethod != null) {
+printMemberDetailsListStartTag();
 dd();
 printTagsInfoHeader();
 MethodWriterImpl.printImplementsInfo(this, method);
 if (overriddenMethod != null) {
 MethodWriterImpl.printOverridden(this,
 method.overriddenType(), overriddenMethod);
 }
 printTagsInfoFooter();
 ddEnd();
 }
-dd();
 }
 protected void printTags(Doc doc) {
 if(configuration.nocomment){
 return;
 }
 TagletOutputImpl output = new TagletOutputImpl("");
 TagletWriter.genTagOuput(configuration.tagletManager, doc,
 configuration.tagletManager.getCustomTags(doc),
 getTagletWriterInstance(false), output);
-if (output.toString().trim().length() > 0) {
+String outputString = output.toString().trim();
+// For RootDoc and ClassDoc, this section is not the definition description
+// but the start of definition list.
+if (!outputString.isEmpty()) {
+if (!(doc instanceof RootDoc || doc instanceof ClassDoc)) {
+printMemberDetailsListStartTag();
+dd();
+}
 printTagsInfoHeader();
-print(output.toString());
+print(outputString);
 printTagsInfoFooter();
-} else if (! (doc instanceof ConstructorDoc ||
+if (!(doc instanceof RootDoc || doc instanceof ClassDoc))
-doc instanceof RootDoc || doc instanceof ClassDoc)) {
+ddEnd();
-//To be consistent with 1.4.2 output.
+}
-//I hate to do this but we have to pass the diff test to prove
+}
-//nothing has broken.
-printTagsInfoHeader();
+/**
-printTagsInfoFooter();
+* Check whether there are any tags for Serialization Overview
-}
+* section to be printed.
-}
+*
+* @param field the FieldDoc object to check for tags.
-/**
-* Check whether there are any tags to be printed.
-*
-* @param doc the Doc object to check for tags.
 * @return true if there are tags to be printed else return false.
 */
-protected boolean hasTagsToPrint(Doc doc) {
+protected boolean hasSerializationOverviewTags(FieldDoc field) {
-if (doc instanceof MethodDoc) {
-ClassDoc[] intfacs = ((MethodDoc)doc).containingClass().interfaces();
-MethodDoc overriddenMethod = ((MethodDoc)doc).overriddenMethod();
-if ((intfacs.length > 0 &&
-new ImplementedMethods((MethodDoc)doc, this.configuration).build().length > 0) ||
-overriddenMethod != null) {
-return true;
-}
-}
 TagletOutputImpl output = new TagletOutputImpl("");
-TagletWriter.genTagOuput(configuration.tagletManager, doc,
+TagletWriter.genTagOuput(configuration.tagletManager, field,
-configuration.tagletManager.getCustomTags(doc),
+configuration.tagletManager.getCustomTags(field),
 getTagletWriterInstance(false), output);
-return (output.toString().trim().isEmpty());
+return (!output.toString().trim().isEmpty());
 }
 /**
 * Returns a TagletWriter that knows how to write HTML.
 *

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

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

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