1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Fri Jun 18 16:45:13 2010 -0700 1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Fri Jun 18 21:13:56 2010 -0700 1.3 @@ -30,7 +30,6 @@ 1.4 import com.sun.javadoc.*; 1.5 import java.io.*; 1.6 import java.util.*; 1.7 -import java.lang.reflect.*; 1.8 1.9 /** 1.10 * Builds the summary for a given class. 1.11 @@ -108,20 +107,6 @@ 1.12 /** 1.13 * {@inheritDoc} 1.14 */ 1.15 - public void invokeMethod(String methodName, Class<?>[] paramClasses, 1.16 - Object[] params) 1.17 - throws Exception { 1.18 - if (DEBUG) { 1.19 - configuration.root.printError("DEBUG: " + this.getClass().getName() 1.20 - + "." + methodName); 1.21 - } 1.22 - Method method = this.getClass().getMethod(methodName, paramClasses); 1.23 - method.invoke(this, params); 1.24 - } 1.25 - 1.26 - /** 1.27 - * {@inheritDoc} 1.28 - */ 1.29 public void build() throws IOException { 1.30 build(LayoutParser.getInstance(configuration).parseXML(ROOT)); 1.31 } 1.32 @@ -138,8 +123,8 @@ 1.33 * 1.34 * @param elements the XML elements that specify how to document a class. 1.35 */ 1.36 - public void buildClassDoc(List<?> elements) throws Exception { 1.37 - build(elements); 1.38 + public void buildClassDoc(XMLNode node) throws Exception { 1.39 + buildChildren(node); 1.40 writer.close(); 1.41 copyDocFiles(); 1.42 } 1.43 @@ -169,7 +154,7 @@ 1.44 /** 1.45 * Build the header of the page. 1.46 */ 1.47 - public void buildClassHeader() { 1.48 + public void buildClassHeader(XMLNode node) { 1.49 String key; 1.50 if (isInterface) { 1.51 key = "doclet.Interface"; 1.52 @@ -185,7 +170,7 @@ 1.53 /** 1.54 * Build the class tree documentation. 1.55 */ 1.56 - public void buildClassTree() { 1.57 + public void buildClassTree(XMLNode node) { 1.58 writer.writeClassTree(); 1.59 } 1.60 1.61 @@ -193,42 +178,42 @@ 1.62 * If this is a class, list all interfaces 1.63 * implemented by this class. 1.64 */ 1.65 - public void buildImplementedInterfacesInfo() { 1.66 + public void buildImplementedInterfacesInfo(XMLNode node) { 1.67 writer.writeImplementedInterfacesInfo(); 1.68 } 1.69 1.70 /** 1.71 * If this is an interface, list all super interfaces. 1.72 */ 1.73 - public void buildSuperInterfacesInfo() { 1.74 + public void buildSuperInterfacesInfo(XMLNode node) { 1.75 writer.writeSuperInterfacesInfo(); 1.76 } 1.77 1.78 /** 1.79 * List the parameters of this class. 1.80 */ 1.81 - public void buildTypeParamInfo() { 1.82 + public void buildTypeParamInfo(XMLNode node) { 1.83 writer.writeTypeParamInfo(); 1.84 } 1.85 1.86 /** 1.87 * List all the classes extend this one. 1.88 */ 1.89 - public void buildSubClassInfo() { 1.90 + public void buildSubClassInfo(XMLNode node) { 1.91 writer.writeSubClassInfo(); 1.92 } 1.93 1.94 /** 1.95 * List all the interfaces that extend this one. 1.96 */ 1.97 - public void buildSubInterfacesInfo() { 1.98 + public void buildSubInterfacesInfo(XMLNode node) { 1.99 writer.writeSubInterfacesInfo(); 1.100 } 1.101 1.102 /** 1.103 * If this is an interface, list all classes that implement this interface. 1.104 */ 1.105 - public void buildInterfaceUsageInfo () { 1.106 + public void buildInterfaceUsageInfo (XMLNode node) { 1.107 writer.writeInterfaceUsageInfo(); 1.108 } 1.109 1.110 @@ -236,21 +221,21 @@ 1.111 * If this is an inner class or interface, list the enclosing class or 1.112 * interface. 1.113 */ 1.114 - public void buildNestedClassInfo () { 1.115 + public void buildNestedClassInfo (XMLNode node) { 1.116 writer.writeNestedClassInfo(); 1.117 } 1.118 1.119 /** 1.120 * If this class is deprecated, print the appropriate information. 1.121 */ 1.122 - public void buildDeprecationInfo () { 1.123 + public void buildDeprecationInfo (XMLNode node) { 1.124 writer.writeClassDeprecationInfo(); 1.125 } 1.126 1.127 /** 1.128 * Build the signature of the current class. 1.129 */ 1.130 - public void buildClassSignature() { 1.131 + public void buildClassSignature(XMLNode node) { 1.132 StringBuffer modifiers = new StringBuffer(classDoc.modifiers() + " "); 1.133 if (isEnum) { 1.134 modifiers.append("enum "); 1.135 @@ -276,14 +261,14 @@ 1.136 /** 1.137 * Build the class description. 1.138 */ 1.139 - public void buildClassDescription() { 1.140 + public void buildClassDescription(XMLNode node) { 1.141 writer.writeClassDescription(); 1.142 } 1.143 1.144 /** 1.145 * Build the tag information for the current class. 1.146 */ 1.147 - public void buildClassTagInfo() { 1.148 + public void buildClassTagInfo(XMLNode node) { 1.149 writer.writeClassTagInfo(); 1.150 } 1.151 1.152 @@ -293,9 +278,9 @@ 1.153 * @param elements the XML elements that specify how a member summary is 1.154 * documented. 1.155 */ 1.156 - public void buildMemberSummary(List<?> elements) throws Exception { 1.157 + public void buildMemberSummary(XMLNode node) throws Exception { 1.158 configuration.getBuilderFactory(). 1.159 - getMemberSummaryBuilder(writer).build(elements); 1.160 + getMemberSummaryBuilder(writer).buildChildren(node); 1.161 writer.completeMemberSummaryBuild(); 1.162 } 1.163 1.164 @@ -305,9 +290,9 @@ 1.165 * @param elements the XML elements that specify how a enum constants are 1.166 * documented. 1.167 */ 1.168 - public void buildEnumConstantsDetails(List<?> elements) throws Exception { 1.169 + public void buildEnumConstantsDetails(XMLNode node) throws Exception { 1.170 configuration.getBuilderFactory(). 1.171 - getEnumConstantsBuilder(writer).build(elements); 1.172 + getEnumConstantsBuilder(writer).buildChildren(node); 1.173 } 1.174 1.175 /** 1.176 @@ -315,9 +300,9 @@ 1.177 * 1.178 * @param elements the XML elements that specify how a field is documented. 1.179 */ 1.180 - public void buildFieldDetails(List<?> elements) throws Exception { 1.181 + public void buildFieldDetails(XMLNode node) throws Exception { 1.182 configuration.getBuilderFactory(). 1.183 - getFieldBuilder(writer).build(elements); 1.184 + getFieldBuilder(writer).buildChildren(node); 1.185 } 1.186 1.187 /** 1.188 @@ -326,9 +311,9 @@ 1.189 * @param elements the XML elements that specify how to document a 1.190 * constructor. 1.191 */ 1.192 - public void buildConstructorDetails(List<?> elements) throws Exception { 1.193 + public void buildConstructorDetails(XMLNode node) throws Exception { 1.194 configuration.getBuilderFactory(). 1.195 - getConstructorBuilder(writer).build(elements); 1.196 + getConstructorBuilder(writer).buildChildren(node); 1.197 } 1.198 1.199 /** 1.200 @@ -336,15 +321,15 @@ 1.201 * 1.202 * @param elements the XML elements that specify how a method is documented. 1.203 */ 1.204 - public void buildMethodDetails(List<?> elements) throws Exception { 1.205 + public void buildMethodDetails(XMLNode node) throws Exception { 1.206 configuration.getBuilderFactory(). 1.207 - getMethodBuilder(writer).build(elements); 1.208 + getMethodBuilder(writer).buildChildren(node); 1.209 } 1.210 1.211 /** 1.212 * Build the footer of the page. 1.213 */ 1.214 - public void buildClassFooter() { 1.215 + public void buildClassFooter(XMLNode node) { 1.216 writer.writeFooter(); 1.217 } 1.218 }