1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Fri Jun 18 16:45:13 2010 -0700
1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java Fri Jun 18 21:13:56 2010 -0700
1.3 @@ -26,7 +26,6 @@
1.4 package com.sun.tools.doclets.internal.toolkit.builders;
1.5
1.6 import java.io.*;
1.7 -import java.lang.reflect.*;
1.8 import java.util.*;
1.9
1.10 import com.sun.javadoc.*;
1.11 @@ -132,47 +131,33 @@
1.12 /**
1.13 * Build the serialized form.
1.14 */
1.15 - public void buildSerializedForm(List<?> elements) throws Exception {
1.16 - build(elements);
1.17 + public void buildSerializedForm(XMLNode node) throws Exception {
1.18 + buildChildren(node);
1.19 writer.close();
1.20 }
1.21
1.22 /**
1.23 - * {@inheritDoc}
1.24 - */
1.25 - public void invokeMethod(String methodName, Class<?>[] paramClasses,
1.26 - Object[] params)
1.27 - throws Exception {
1.28 - if (DEBUG) {
1.29 - configuration.root.printError("DEBUG: " + this.getClass().getName()
1.30 - + "." + methodName);
1.31 - }
1.32 - Method method = this.getClass().getMethod(methodName, paramClasses);
1.33 - method.invoke(this, params);
1.34 - }
1.35 -
1.36 - /**
1.37 * Build the header.
1.38 */
1.39 - public void buildHeader() {
1.40 + public void buildHeader(XMLNode node) {
1.41 writer.writeHeader(configuration.getText("doclet.Serialized_Form"));
1.42 }
1.43
1.44 /**
1.45 * Build the contents.
1.46 */
1.47 - public void buildSerializedFormSummaries(List<?> elements) {
1.48 + public void buildSerializedFormSummaries(XMLNode node) {
1.49 PackageDoc[] packages = configuration.packages;
1.50 for (int i = 0; i < packages.length; i++) {
1.51 currentPackage = packages[i];
1.52 - build(elements);
1.53 + buildChildren(node);
1.54 }
1.55 }
1.56
1.57 /**
1.58 * Build the package serialized for for the current package being processed.
1.59 */
1.60 - public void buildPackageSerializedForm(List<?> elements) {
1.61 + public void buildPackageSerializedForm(XMLNode node) {
1.62 String foo = currentPackage.name();
1.63 ClassDoc[] classes = currentPackage.allClasses(false);
1.64 if (classes == null || classes.length == 0) {
1.65 @@ -184,14 +169,14 @@
1.66 if (!serialClassFoundToDocument(classes)) {
1.67 return;
1.68 }
1.69 - build(elements);
1.70 + buildChildren(node);
1.71 }
1.72
1.73 - public void buildPackageHeader() {
1.74 + public void buildPackageHeader(XMLNode node) {
1.75 writer.writePackageHeader(Util.getPackageName(currentPackage));
1.76 }
1.77
1.78 - public void buildClassSerializedForm(List<?> elements) {
1.79 + public void buildClassSerializedForm(XMLNode node) {
1.80 ClassDoc[] classes = currentPackage.allClasses(false);
1.81 Arrays.sort(classes);
1.82 for (int j = 0; j < classes.length; j++) {
1.83 @@ -202,19 +187,19 @@
1.84 if(!serialClassInclude(currentClass)) {
1.85 continue;
1.86 }
1.87 - build(elements);
1.88 + buildChildren(node);
1.89 }
1.90 }
1.91 }
1.92
1.93 - public void buildClassHeader() {
1.94 + public void buildClassHeader(XMLNode node) {
1.95 writer.writeClassHeader(currentClass);
1.96 }
1.97
1.98 /**
1.99 * Build the serial UID information for the given class.
1.100 */
1.101 - public void buildSerialUIDInfo() {
1.102 + public void buildSerialUIDInfo(XMLNode node) {
1.103 FieldDoc[] fields = currentClass.fields(false);
1.104 for (int i = 0; i < fields.length; i++) {
1.105 if (fields[i].name().equals("serialVersionUID") &&
1.106 @@ -229,7 +214,7 @@
1.107 /**
1.108 * Build the footer.
1.109 */
1.110 - public void buildFooter() {
1.111 + public void buildFooter(XMLNode node) {
1.112 writer.writeFooter();
1.113 }
1.114
1.115 @@ -316,7 +301,7 @@
1.116 /**
1.117 * Build the method header.
1.118 */
1.119 - public void buildMethodHeader() {
1.120 + public void buildMethodHeader(XMLNode node) {
1.121 if (currentClass.serializationMethods().length > 0) {
1.122 methodWriter.writeHeader(
1.123 configuration.getText("doclet.Serialized_Form_methods"));
1.124 @@ -333,28 +318,28 @@
1.125 /**
1.126 * Build the method sub header.
1.127 */
1.128 - public void buildMethodSubHeader() {
1.129 + public void buildMethodSubHeader(XMLNode node) {
1.130 methodWriter.writeMemberHeader((MethodDoc) currentMember);
1.131 }
1.132
1.133 /**
1.134 * Build the deprecated method description.
1.135 */
1.136 - public void buildDeprecatedMethodInfo() {
1.137 + public void buildDeprecatedMethodInfo(XMLNode node) {
1.138 methodWriter.writeDeprecatedMemberInfo((MethodDoc) currentMember);
1.139 }
1.140
1.141 /**
1.142 * Build method tags.
1.143 */
1.144 - public void buildMethodDescription() {
1.145 + public void buildMethodDescription(XMLNode node) {
1.146 methodWriter.writeMemberDescription((MethodDoc) currentMember);
1.147 }
1.148
1.149 /**
1.150 * Build the method tags.
1.151 */
1.152 - public void buildMethodTags() {
1.153 + public void buildMethodTags(XMLNode node) {
1.154 methodWriter.writeMemberTags((MethodDoc) currentMember);
1.155 MethodDoc method = (MethodDoc)currentMember;
1.156 if (method.name().compareTo("writeExternal") == 0
1.157 @@ -370,24 +355,24 @@
1.158 /**
1.159 * build the information for the method.
1.160 */
1.161 - public void buildMethodInfo(List<?> elements) {
1.162 + public void buildMethodInfo(XMLNode node) {
1.163 if(configuration.nocomment){
1.164 return;
1.165 }
1.166 - build(elements);
1.167 + buildChildren(node);
1.168 }
1.169
1.170 /**
1.171 * Build the method footer.
1.172 */
1.173 - public void buildMethodFooter() {
1.174 + public void buildMethodFooter(XMLNode node) {
1.175 methodWriter.writeMemberFooter();
1.176 }
1.177
1.178 /**
1.179 * Build the field header.
1.180 */
1.181 - public void buildFieldHeader() {
1.182 + public void buildFieldHeader(XMLNode node) {
1.183 if (currentClass.serializableFields().length > 0) {
1.184 buildFieldSerializationOverview(currentClass);
1.185 fieldWriter.writeHeader(configuration.getText(
1.186 @@ -426,7 +411,7 @@
1.187 /**
1.188 * Build the field sub header.
1.189 */
1.190 - public void buildFieldSubHeader() {
1.191 + public void buildFieldSubHeader(XMLNode node) {
1.192 if (! currentClass.definesSerializableFields() ){
1.193 FieldDoc field = (FieldDoc) currentMember;
1.194 fieldWriter.writeMemberHeader(field.type().asClassDoc(),
1.195 @@ -437,7 +422,7 @@
1.196 /**
1.197 * Build the field deprecation information.
1.198 */
1.199 - public void buildFieldDeprecationInfo() {
1.200 + public void buildFieldDeprecationInfo(XMLNode node) {
1.201 if (!currentClass.definesSerializableFields()) {
1.202 FieldDoc field = (FieldDoc)currentMember;
1.203 fieldWriter.writeMemberDeprecatedInfo(field);
1.204 @@ -447,7 +432,7 @@
1.205 /**
1.206 * Build the field information.
1.207 */
1.208 - public void buildFieldInfo() {
1.209 + public void buildFieldInfo(XMLNode node) {
1.210 if(configuration.nocomment){
1.211 return;
1.212 }
1.213 @@ -483,7 +468,7 @@
1.214 /**
1.215 * Build the field sub footer.
1.216 */
1.217 - public void buildFieldSubFooter() {
1.218 + public void buildFieldSubFooter(XMLNode node) {
1.219 if (! currentClass.definesSerializableFields()) {
1.220 fieldWriter.writeMemberFooter();
1.221 }
1.222 @@ -493,12 +478,12 @@
1.223 * Build the summaries for the methods that belong to the given
1.224 * class.
1.225 */
1.226 - public void buildSerializableMethods(List<?> elements) {
1.227 + public void buildSerializableMethods(XMLNode node) {
1.228 MemberDoc[] members = currentClass.serializationMethods();
1.229 if (members.length > 0) {
1.230 for (int i = 0; i < members.length; i++) {
1.231 currentMember = members[i];
1.232 - build(elements);
1.233 + buildChildren(node);
1.234 }
1.235 }
1.236 }
1.237 @@ -507,12 +492,12 @@
1.238 * Build the summaries for the fields that belong to the given
1.239 * class.
1.240 */
1.241 - public void buildSerializableFields(List<?> elements) {
1.242 + public void buildSerializableFields(XMLNode node) {
1.243 MemberDoc[] members = currentClass.serializableFields();
1.244 if (members.length > 0) {
1.245 for (int i = 0; i < members.length; i++) {
1.246 currentMember = members[i];
1.247 - build(elements);
1.248 + buildChildren(node);
1.249 }
1.250 }
1.251 }
