src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlSerialMethodWriter.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -21,17 +21,27 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
-package com.sun.tools.doclets.formats.html;
+package jdk.javadoc.internal.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.taglets.*;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
 
+import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
+import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
+import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
+import jdk.javadoc.internal.doclets.toolkit.Content;
+import jdk.javadoc.internal.doclets.toolkit.SerializedFormWriter;
+import jdk.javadoc.internal.doclets.toolkit.taglets.TagletManager;
+import jdk.javadoc.internal.doclets.toolkit.taglets.TagletWriter;
+
+
 /**
  * Generate serialized form for Serializable/Externalizable methods.
  * Documentation denoted by the <code>serialData</code> tag is processed.
  *
  *  <p><b>This is NOT part of any supported API.

@@ -43,13 +53,12 @@
  * @author Bhavesh Patel (Modified)
  */
 public class HtmlSerialMethodWriter extends MethodWriterImpl implements
         SerializedFormWriter.SerialMethodWriter{
 
-    public HtmlSerialMethodWriter(SubWriterHolderWriter writer,
-            ClassDoc classdoc) {
-        super(writer, classdoc);
+    public HtmlSerialMethodWriter(SubWriterHolderWriter writer, TypeElement  typeElement) {
+        super(writer, typeElement);
     }
 
     /**
      * Return the header for serializable methods section.
      *

@@ -108,11 +117,11 @@
      * Add the member header.
      *
      * @param member the method document to be listed
      * @param methodsContentTree the content tree to which the member header will be added
      */
-    public void addMemberHeader(MethodDoc member, Content methodsContentTree) {
+    public void addMemberHeader(ExecutableElement member, Content methodsContentTree) {
         methodsContentTree.addContent(getHead(member));
         methodsContentTree.addContent(getSignature(member));
     }
 
     /**

@@ -119,43 +128,42 @@
      * Add the deprecated information for this member.
      *
      * @param member the method to document.
      * @param methodsContentTree the tree to which the deprecated info will be added
      */
-    public void addDeprecatedMemberInfo(MethodDoc member, Content methodsContentTree) {
+    public void addDeprecatedMemberInfo(ExecutableElement member, Content methodsContentTree) {
         addDeprecatedInfo(member, methodsContentTree);
     }
 
     /**
      * Add the description text for this member.
      *
      * @param member the method to document.
      * @param methodsContentTree the tree to which the deprecated info will be added
      */
-    public void addMemberDescription(MethodDoc member, Content methodsContentTree) {
+    public void addMemberDescription(ExecutableElement member, Content methodsContentTree) {
         addComment(member, methodsContentTree);
     }
 
     /**
      * Add the tag information for this member.
      *
      * @param member the method to document.
      * @param methodsContentTree the tree to which the member tags info will be added
      */
-    public void addMemberTags(MethodDoc member, Content methodsContentTree) {
+    public void addMemberTags(ExecutableElement member, Content methodsContentTree) {
         Content tagContent = new ContentBuilder();
         TagletManager tagletManager =
             configuration.tagletManager;
-        TagletWriter.genTagOuput(tagletManager, member,
+        TagletWriter.genTagOutput(tagletManager, member,
             tagletManager.getSerializedFormTaglets(),
             writer.getTagletWriterInstance(false), tagContent);
         Content dlTags = new HtmlTree(HtmlTag.DL);
         dlTags.addContent(tagContent);
         methodsContentTree.addContent(dlTags);
-        MethodDoc method = member;
-        if (method.name().compareTo("writeExternal") == 0
-                && method.tags("serialData").length == 0) {
-            serialWarning(member.position(), "doclet.MissingSerialDataTag",
-                method.containingClass().qualifiedName(), method.name());
+        if (name(member).compareTo("writeExternal") == 0
+                && utils.getSerialDataTrees(member).isEmpty()) {
+            serialWarning(member, "doclet.MissingSerialDataTag",
+                utils.getFullyQualifiedName(member.getEnclosingElement()), name(member));
         }
     }
 }