Skip to content

Commit bb2704c

Browse files
committed
Update Parser.java
Signed-off-by: Manoel Campos <manoelcampos@gmail.com>
1 parent 12ba512 commit bb2704c

File tree

1 file changed

+15
-33
lines changed
  • src/main/java/com/github/markusbernhardt/xmldoclet

1 file changed

+15
-33
lines changed

src/main/java/com/github/markusbernhardt/xmldoclet/Parser.java

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
11
package com.github.markusbernhardt.xmldoclet;
22

3-
import com.github.markusbernhardt.xmldoclet.xjc.Annotation;
4-
import com.github.markusbernhardt.xmldoclet.xjc.AnnotationArgument;
5-
import com.github.markusbernhardt.xmldoclet.xjc.AnnotationElement;
6-
import com.github.markusbernhardt.xmldoclet.xjc.AnnotationInstance;
73
import com.github.markusbernhardt.xmldoclet.xjc.Class;
8-
import com.github.markusbernhardt.xmldoclet.xjc.Constructor;
94
import com.github.markusbernhardt.xmldoclet.xjc.Enum;
10-
import com.github.markusbernhardt.xmldoclet.xjc.EnumConstant;
11-
import com.github.markusbernhardt.xmldoclet.xjc.Field;
12-
import com.github.markusbernhardt.xmldoclet.xjc.Interface;
13-
import com.github.markusbernhardt.xmldoclet.xjc.Method;
14-
import com.github.markusbernhardt.xmldoclet.xjc.MethodParameter;
15-
import com.github.markusbernhardt.xmldoclet.xjc.ObjectFactory;
165
import com.github.markusbernhardt.xmldoclet.xjc.Package;
17-
import com.github.markusbernhardt.xmldoclet.xjc.Root;
18-
import com.github.markusbernhardt.xmldoclet.xjc.TagInfo;
19-
import com.github.markusbernhardt.xmldoclet.xjc.TypeInfo;
20-
import com.github.markusbernhardt.xmldoclet.xjc.TypeParameter;
21-
import com.github.markusbernhardt.xmldoclet.xjc.Wildcard;
6+
import com.github.markusbernhardt.xmldoclet.xjc.*;
227
import com.sun.source.doctree.DocTree;
238
import com.sun.source.util.DocTrees;
249
import jdk.javadoc.doclet.DocletEnvironment;
@@ -41,10 +26,9 @@
4126
* @author markus
4227
*/
4328
public class Parser {
44-
4529
private final static Logger LOGGER = Logger.getLogger(Parser.class.getName());
4630

47-
protected Map<String, Package> packages = new TreeMap<String, Package>();
31+
protected Map<String, Package> packages = new TreeMap<>();
4832

4933
protected ObjectFactory objectFactory = new ObjectFactory();
5034
private DocTrees docTrees;
@@ -59,7 +43,6 @@ private String getJavaDoc(final Element element){
5943
return docCommentTree == null ? "" : docCommentTree.getFullBody().toString();
6044
}
6145

62-
6346
/**
6447
* {@return the package element of the class}
6548
* @param classElement class to get its package
@@ -138,7 +121,7 @@ protected Annotation parseAnnotationTypeDoc(final TypeElement annotationTypeDoc)
138121
annotationNode.setName(annotationTypeDoc.name());
139122
annotationNode.setQualified(annotationTypeDoc.qualifiedName());
140123
String comment = annotationTypeDoc.commentText();
141-
if (comment.length() > 0) {
124+
if (!comment.isEmpty()) {
142125
annotationNode.setComment(comment);
143126
}
144127
annotationNode.setIncluded(annotationTypeDoc.isIncluded());
@@ -188,8 +171,7 @@ protected AnnotationElement parseAnnotationTypeElementDoc(final ExecutableElemen
188171
* @param programElement programElement
189172
* @return representation of annotations
190173
*/
191-
protected AnnotationInstance parseAnnotationDesc(final AnnotationMirror annotationDesc,
192-
String programElement) {
174+
protected AnnotationInstance parseAnnotationDesc(final AnnotationMirror annotationDesc, String programElement) {
193175
AnnotationInstance annotationInstanceNode = objectFactory.createAnnotationInstance();
194176

195177
try {
@@ -232,7 +214,7 @@ protected AnnotationInstance parseAnnotationDesc(final AnnotationMirror annotati
232214
}
233215

234216
protected Enum parseEnum(final TypeElement classDoc) {
235-
Enum enumNode = objectFactory.createEnum();
217+
final Enum enumNode = objectFactory.createEnum();
236218
enumNode.setName(classDoc.name());
237219
enumNode.setQualified(classDoc.qualifiedName());
238220
String comment = classDoc.commentText();
@@ -242,7 +224,7 @@ protected Enum parseEnum(final TypeElement classDoc) {
242224
enumNode.setIncluded(classDoc.isIncluded());
243225
enumNode.setScope(parseScope(classDoc));
244226

245-
TypeMirror superClassType = classDoc.superclassType();
227+
final TypeMirror superClassType = classDoc.superclassType();
246228
if (superClassType != null) {
247229
enumNode.setClazz(parseTypeInfo(superClassType));
248230
}
@@ -273,7 +255,7 @@ protected Enum parseEnum(final TypeElement classDoc) {
273255
* @return
274256
*/
275257
protected EnumConstant parseEnumConstant(final VariableElement fieldDoc) {
276-
EnumConstant enumConstant = objectFactory.createEnumConstant();
258+
final EnumConstant enumConstant = objectFactory.createEnumConstant();
277259
enumConstant.setName(fieldDoc.name());
278260
String comment = fieldDoc.commentText();
279261
if (comment.length() > 0) {
@@ -292,7 +274,7 @@ protected EnumConstant parseEnumConstant(final VariableElement fieldDoc) {
292274
}
293275

294276
protected Interface parseInterface(final TypeElement classDoc) {
295-
Interface interfaceNode = objectFactory.createInterface();
277+
final Interface interfaceNode = objectFactory.createInterface();
296278
interfaceNode.setName(classDoc.name());
297279
interfaceNode.setQualified(classDoc.qualifiedName());
298280
String comment = classDoc.commentText();
@@ -331,7 +313,7 @@ protected Interface parseInterface(final TypeElement classDoc) {
331313
}
332314

333315
protected Class parseClass(final TypeElement classDoc) {
334-
Class classNode = objectFactory.createClass();
316+
final Class classNode = objectFactory.createClass();
335317
classNode.setName(classDoc.name());
336318
classNode.setQualified(classDoc.qualifiedName());
337319
String comment = classDoc.commentText();
@@ -384,7 +366,7 @@ protected Class parseClass(final TypeElement classDoc) {
384366
}
385367

386368
protected Constructor parseConstructor(final ExecutableElement constructorDoc) {
387-
Constructor constructorNode = objectFactory.createConstructor();
369+
final Constructor constructorNode = objectFactory.createConstructor();
388370

389371
constructorNode.setName(constructorDoc.name());
390372
constructorNode.setQualified(constructorDoc.qualifiedName());
@@ -422,7 +404,7 @@ protected Constructor parseConstructor(final ExecutableElement constructorDoc) {
422404
}
423405

424406
protected Method parseMethod(final ExecutableElement methodDoc) {
425-
Method methodNode = objectFactory.createMethod();
407+
final Method methodNode = objectFactory.createMethod();
426408

427409
methodNode.setName(methodDoc.name());
428410
methodNode.setQualified(methodDoc.qualifiedName());
@@ -474,7 +456,7 @@ protected MethodParameter parseMethodParameter(final VariableElement parameter)
474456
}
475457

476458
protected Field parseField(final VariableElement fieldDoc) {
477-
Field fieldNode = objectFactory.createField();
459+
final Field fieldNode = objectFactory.createField();
478460
fieldNode.setType(parseTypeInfo(fieldDoc.type()));
479461
fieldNode.setName(fieldDoc.name());
480462
fieldNode.setQualified(fieldDoc.qualifiedName());
@@ -501,7 +483,7 @@ protected Field parseField(final VariableElement fieldDoc) {
501483
}
502484

503485
protected TypeInfo parseTypeInfo(final TypeMirror type) {
504-
TypeInfo typeInfoNode = objectFactory.createTypeInfo();
486+
final TypeInfo typeInfoNode = objectFactory.createTypeInfo();
505487
typeInfoNode.setQualified(type.qualifiedTypeName());
506488
String dimension = type.dimension();
507489
if (dimension.length() > 0) {
@@ -524,7 +506,7 @@ protected TypeInfo parseTypeInfo(final TypeMirror type) {
524506
}
525507

526508
protected Wildcard parseWildcard(final WildcardType wildcard) {
527-
Wildcard wildcardNode = objectFactory.createWildcard();
509+
final Wildcard wildcardNode = objectFactory.createWildcard();
528510

529511
for (final TypeMirror extendType : wildcard.extendsBounds()) {
530512
wildcardNode.getExtendsBound().add(parseTypeInfo(extendType));
@@ -544,7 +526,7 @@ protected Wildcard parseWildcard(final WildcardType wildcard) {
544526
* @return
545527
*/
546528
protected TypeParameter parseTypeParameter(final TypeVariable typeVariable) {
547-
TypeParameter typeParameter = objectFactory.createTypeParameter();
529+
final TypeParameter typeParameter = objectFactory.createTypeParameter();
548530
typeParameter.setName(typeVariable.typeName());
549531

550532
for (final TypeMirror bound : typeVariable.bounds()) {

0 commit comments

Comments
 (0)