TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor: Reorganized AnnotationLocationCheck methods

This commit is contained in:
Zuy Alexey 2016-03-14 22:13:14 +03:00 committed by Roman Ivanov
parent 73ce35ec6c
commit 4a2ebb9cb9
1 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java
View File

@ -220,6 +220,24 @@ public class AnnotationLocationCheck extends AbstractCheck {
}
}
/**
* Some javadoc.
* @param modifierNode Some javadoc.
* @return Some javadoc.
*/
private static boolean hasAnnotations(DetailAST modifierNode) {
return modifierNode.findFirstToken(TokenTypes.ANNOTATION) != null;
}
/**
* Some javadoc.
* @param modifierNode Some javadoc.
* @return Some javadoc.
*/
private static int getAnnotationLevel(DetailAST modifierNode) {
return modifierNode.getParent().getColumnNo();
}
/**
* Some javadoc.
* @param modifierNode Some javadoc.
@ -243,6 +261,28 @@ public class AnnotationLocationCheck extends AbstractCheck {
}
}
/**
* Some javadoc.
* @param annotation Some javadoc.
* @return Some javadoc.
*/
private static boolean isParameterized(DetailAST annotation) {
return annotation.findFirstToken(TokenTypes.EXPR) != null;
}
/**
* Some javadoc.
* @param annotation Some javadoc.
* @return Some javadoc.
*/
private static String getAnnotationName(DetailAST annotation) {
DetailAST identNode = annotation.findFirstToken(TokenTypes.IDENT);
if (identNode == null) {
identNode = annotation.findFirstToken(TokenTypes.DOT).findFirstToken(TokenTypes.IDENT);
}
return identNode.getText();
}
/**
* Some javadoc.
* @param annotation Some javadoc.
@ -263,35 +303,6 @@ public class AnnotationLocationCheck extends AbstractCheck {
|| !allowingCondition && !hasNodeBeside(annotation);
}
/**
* Some javadoc.
* @param annotation Some javadoc.
* @return Some javadoc.
*/
private static String getAnnotationName(DetailAST annotation) {
DetailAST identNode = annotation.findFirstToken(TokenTypes.IDENT);
if (identNode == null) {
identNode = annotation.findFirstToken(TokenTypes.DOT).findFirstToken(TokenTypes.IDENT);
}
return identNode.getText();
}
/**
* Some javadoc.
* @param annotation Some javadoc.
* @return Some javadoc.
*/
private static boolean hasNodeAfter(DetailAST annotation) {
final int annotationLineNo = annotation.getLineNo();
DetailAST nextNode = annotation.getNextSibling();
if (nextNode == null) {
nextNode = annotation.getParent().getNextSibling();
}
return annotationLineNo == nextNode.getLineNo();
}
/**
* Some javadoc.
* @param annotation Some javadoc.
@ -313,30 +324,19 @@ public class AnnotationLocationCheck extends AbstractCheck {
return hasNodeBefore(annotation) || hasNodeAfter(annotation);
}
/**
* Some javadoc.
* @param modifierNode Some javadoc.
* @return Some javadoc.
*/
private static int getAnnotationLevel(DetailAST modifierNode) {
return modifierNode.getParent().getColumnNo();
}
/**
* Some javadoc.
* @param annotation Some javadoc.
* @return Some javadoc.
*/
private static boolean isParameterized(DetailAST annotation) {
return annotation.findFirstToken(TokenTypes.EXPR) != null;
}
private static boolean hasNodeAfter(DetailAST annotation) {
final int annotationLineNo = annotation.getLineNo();
DetailAST nextNode = annotation.getNextSibling();
/**
* Some javadoc.
* @param modifierNode Some javadoc.
* @return Some javadoc.
*/
private static boolean hasAnnotations(DetailAST modifierNode) {
return modifierNode.findFirstToken(TokenTypes.ANNOTATION) != null;
if (nextNode == null) {
nextNode = annotation.getParent().getNextSibling();
}
return annotationLineNo == nextNode.getLineNo();
}
}