1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml Tue Nov 30 09:38:48 2010 -0800
1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml Wed Dec 01 11:02:38 2010 -0800
1.3 @@ -29,177 +29,144 @@
1.4 <Doclet>
1.5
1.6 <PackageDoc>
1.7 - <PackageHeader/>
1.8 - <Summary>
1.9 - <SummaryHeader/>
1.10 - <InterfaceSummary/>
1.11 - <ClassSummary/>
1.12 - <EnumSummary/>
1.13 - <ExceptionSummary/>
1.14 - <ErrorSummary/>
1.15 - <AnnotationTypeSummary/>
1.16 - <SummaryFooter/>
1.17 - </Summary>
1.18 - <PackageDescription/>
1.19 - <PackageTags/>
1.20 - <PackageFooter/>
1.21 + <Content>
1.22 + <Summary>
1.23 + <InterfaceSummary/>
1.24 + <ClassSummary/>
1.25 + <EnumSummary/>
1.26 + <ExceptionSummary/>
1.27 + <ErrorSummary/>
1.28 + <AnnotationTypeSummary/>
1.29 + </Summary>
1.30 + <PackageDescription/>
1.31 + <PackageTags/>
1.32 + </Content>
1.33 </PackageDoc>
1.34
1.35 <AnnotationTypeDoc>
1.36 - <AnnotationTypeHeader/>
1.37 - <DeprecationInfo/>
1.38 - <AnnotationTypeSignature/>
1.39 - <AnnotationTypeDescription/>
1.40 - <AnnotationTypeTagInfo/>
1.41 + <AnnotationTypeInfo>
1.42 + <DeprecationInfo/>
1.43 + <AnnotationTypeSignature/>
1.44 + <AnnotationTypeDescription/>
1.45 + <AnnotationTypeTagInfo/>
1.46 + </AnnotationTypeInfo>
1.47 <MemberSummary>
1.48 - <AnnotationTypeRequiredMemberSummary/>
1.49 + <AnnotationTypeRequiredMemberSummary/>
1.50 <AnnotationTypeOptionalMemberSummary/>
1.51 </MemberSummary>
1.52 - <AnnotationTypeRequiredMemberDetails>
1.53 - <Header/>
1.54 - <AnnotationTypeRequiredMember>
1.55 - <MemberHeader/>
1.56 - <Signature/>
1.57 - <DeprecationInfo/>
1.58 - <MemberComments/>
1.59 - <TagInfo/>
1.60 - <MemberFooter/>
1.61 - </AnnotationTypeRequiredMember>
1.62 - </AnnotationTypeRequiredMemberDetails>
1.63 - <AnnotationTypeOptionalMemberDetails>
1.64 - <AnnotationTypeOptionalMember>
1.65 - <MemberHeader/>
1.66 - <Signature/>
1.67 - <DeprecationInfo/>
1.68 - <MemberComments/>
1.69 - <TagInfo/>
1.70 - <DefaultValueInfo/>
1.71 - <MemberFooter/>
1.72 - </AnnotationTypeOptionalMember>
1.73 - <Footer/>
1.74 - </AnnotationTypeOptionalMemberDetails>
1.75 - <AnnotationTypeFooter/>
1.76 + <AnnotationTypeMemberDetails>
1.77 + <AnnotationTypeRequiredMemberDetails>
1.78 + <AnnotationTypeRequiredMember>
1.79 + <Signature/>
1.80 + <DeprecationInfo/>
1.81 + <MemberComments/>
1.82 + <TagInfo/>
1.83 + </AnnotationTypeRequiredMember>
1.84 + </AnnotationTypeRequiredMemberDetails>
1.85 + <AnnotationTypeOptionalMemberDetails>
1.86 + <AnnotationTypeOptionalMember>
1.87 + <Signature/>
1.88 + <DeprecationInfo/>
1.89 + <MemberComments/>
1.90 + <TagInfo/>
1.91 + <DefaultValueInfo/>
1.92 + </AnnotationTypeOptionalMember>
1.93 + </AnnotationTypeOptionalMemberDetails>
1.94 + </AnnotationTypeMemberDetails>
1.95 </AnnotationTypeDoc>
1.96
1.97 <ClassDoc>
1.98 - <ClassHeader/>
1.99 <ClassTree/>
1.100 - <TypeParamInfo/>
1.101 - <SuperInterfacesInfo/>
1.102 - <ImplementedInterfacesInfo/>
1.103 - <SubClassInfo/>
1.104 - <SubInterfacesInfo/>
1.105 - <InterfaceUsageInfo/>
1.106 - <NestedClassInfo/>
1.107 - <DeprecationInfo/>
1.108 - <ClassSignature/>
1.109 - <ClassDescription/>
1.110 - <ClassTagInfo/>
1.111 + <ClassInfo>
1.112 + <TypeParamInfo/>
1.113 + <SuperInterfacesInfo/>
1.114 + <ImplementedInterfacesInfo/>
1.115 + <SubClassInfo/>
1.116 + <SubInterfacesInfo/>
1.117 + <InterfaceUsageInfo/>
1.118 + <NestedClassInfo/>
1.119 + <DeprecationInfo/>
1.120 + <ClassSignature/>
1.121 + <ClassDescription/>
1.122 + <ClassTagInfo/>
1.123 + </ClassInfo>
1.124 <MemberSummary>
1.125 <NestedClassesSummary/>
1.126 - <NestedClassesInheritedSummary/>
1.127 <EnumConstantsSummary/>
1.128 <FieldsSummary/>
1.129 - <FieldsInheritedSummary/>
1.130 <ConstructorsSummary/>
1.131 <MethodsSummary/>
1.132 - <MethodsInheritedSummary/>
1.133 </MemberSummary>
1.134 - <EnumConstantsDetails>
1.135 - <Header/>
1.136 - <EnumConstant>
1.137 - <EnumConstantHeader/>
1.138 - <Signature/>
1.139 - <DeprecationInfo/>
1.140 - <EnumConstantComments/>
1.141 - <TagInfo/>
1.142 - <EnumConstantFooter/>
1.143 - </EnumConstant>
1.144 - <Footer/>
1.145 - </EnumConstantsDetails>
1.146 - <FieldDetails>
1.147 - <Header/>
1.148 - <FieldDoc>
1.149 - <FieldHeader/>
1.150 - <Signature/>
1.151 - <DeprecationInfo/>
1.152 - <FieldComments/>
1.153 - <TagInfo/>
1.154 - <FieldFooter/>
1.155 - </FieldDoc>
1.156 - <Footer/>
1.157 - </FieldDetails>
1.158 - <ConstructorDetails>
1.159 - <Header/>
1.160 - <ConstructorDoc>
1.161 - <ConstructorHeader/>
1.162 - <Signature/>
1.163 - <DeprecationInfo/>
1.164 - <ConstructorComments/>
1.165 - <TagInfo/>
1.166 - <ConstructorFooter/>
1.167 - </ConstructorDoc>
1.168 - <Footer/>
1.169 - </ConstructorDetails>
1.170 - <MethodDetails>
1.171 - <Header/>
1.172 - <MethodDoc>
1.173 - <MethodHeader/>
1.174 - <Signature/>
1.175 - <DeprecationInfo/>
1.176 - <MethodComments/>
1.177 - <TagInfo/>
1.178 - <MethodFooter/>
1.179 - </MethodDoc>
1.180 - <Footer/>
1.181 - </MethodDetails>
1.182 - <ClassFooter/>
1.183 + <MemberDetails>
1.184 + <EnumConstantsDetails>
1.185 + <EnumConstant>
1.186 + <Signature/>
1.187 + <DeprecationInfo/>
1.188 + <EnumConstantComments/>
1.189 + <TagInfo/>
1.190 + </EnumConstant>
1.191 + </EnumConstantsDetails>
1.192 + <FieldDetails>
1.193 + <FieldDoc>
1.194 + <Signature/>
1.195 + <DeprecationInfo/>
1.196 + <FieldComments/>
1.197 + <TagInfo/>
1.198 + </FieldDoc>
1.199 + </FieldDetails>
1.200 + <ConstructorDetails>
1.201 + <ConstructorDoc>
1.202 + <Signature/>
1.203 + <DeprecationInfo/>
1.204 + <ConstructorComments/>
1.205 + <TagInfo/>
1.206 + </ConstructorDoc>
1.207 + </ConstructorDetails>
1.208 + <MethodDetails>
1.209 + <MethodDoc>
1.210 + <Signature/>
1.211 + <DeprecationInfo/>
1.212 + <MethodComments/>
1.213 + <TagInfo/>
1.214 + </MethodDoc>
1.215 + </MethodDetails>
1.216 + </MemberDetails>
1.217 </ClassDoc>
1.218
1.219 <ConstantSummary>
1.220 - <Header/>
1.221 <Contents/>
1.222 <ConstantSummaries>
1.223 - <PackageConstantSummary>
1.224 - <PackageHeader/>
1.225 - <ClassConstantSummary>
1.226 - <ClassHeader/>
1.227 - <ConstantMembers/>
1.228 - <ClassFooter/>
1.229 - </ClassConstantSummary>
1.230 - </PackageConstantSummary>
1.231 + <PackageHeader/>
1.232 + <ClassConstantSummary>
1.233 + <ConstantMembers/>
1.234 + </ClassConstantSummary>
1.235 </ConstantSummaries>
1.236 - <Footer/>
1.237 </ConstantSummary>
1.238
1.239 <SerializedForm>
1.240 - <Header/>
1.241 <SerializedFormSummaries>
1.242 <PackageSerializedForm>
1.243 <PackageHeader/>
1.244 <ClassSerializedForm>
1.245 - <ClassHeader/>
1.246 <SerialUIDInfo/>
1.247 - <MethodHeader/>
1.248 - <SerializableMethods>
1.249 - <MethodSubHeader/>
1.250 - <DeprecatedMethodInfo/>
1.251 - <MethodInfo>
1.252 - <MethodDescription/>
1.253 - <MethodTags/>
1.254 - </MethodInfo>
1.255 - <MethodFooter/>
1.256 - </SerializableMethods>
1.257 - <FieldHeader/>
1.258 - <SerializableFields>
1.259 - <FieldSubHeader/>
1.260 - <FieldDeprecationInfo/>
1.261 - <FieldInfo/>
1.262 - <FieldSubFooter/>
1.263 - </SerializableFields>
1.264 + <ClassContent>
1.265 + <SerializableMethods>
1.266 + <MethodSubHeader/>
1.267 + <DeprecatedMethodInfo/>
1.268 + <MethodInfo>
1.269 + <MethodDescription/>
1.270 + <MethodTags/>
1.271 + </MethodInfo>
1.272 + </SerializableMethods>
1.273 + <FieldHeader/>
1.274 + <SerializableFields>
1.275 + <FieldSubHeader/>
1.276 + <FieldDeprecationInfo/>
1.277 + <FieldInfo/>
1.278 + </SerializableFields>
1.279 + </ClassContent>
1.280 </ClassSerializedForm>
1.281 </PackageSerializedForm>
1.282 </SerializedFormSummaries>
1.283 - <Footer/>
1.284 </SerializedForm>
1.285 </Doclet>
