From ba9639e5decde52e38fbc1a048be7501dc701ac3 Mon Sep 17 00:00:00 2001 From: Michal Kordas Date: Tue, 11 Aug 2015 22:48:18 +0200 Subject: [PATCH] Move constants to right side in comparisons. #1555 Fixes ` ConstantOnLHSOfComparison` inspection violations. Description: >Reports on comparison operations with constant values on their left-hand side. Some coding conventions specify that constants should be on the right-hand side of comparisons. --- .../checks/annotation/AnnotationUseStyleCheck.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java index 3f3d9283d..74975d59e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationUseStyleCheck.java @@ -351,7 +351,7 @@ public final class AnnotationUseStyleCheck extends Check { * @param annotation the annotation token */ private void checkTrailingComma(final DetailAST annotation) { - if (TrailingArrayComma.IGNORE == comma) { + if (comma == TrailingArrayComma.IGNORE) { return; } @@ -405,18 +405,18 @@ public final class AnnotationUseStyleCheck extends Check { * @param ast the annotation token */ private void checkCheckClosingParens(final DetailAST ast) { - if (ClosingParens.IGNORE == parens) { + if (parens == ClosingParens.IGNORE) { return; } final DetailAST paren = ast.getLastChild(); final boolean parenExists = paren.getType() == TokenTypes.RPAREN; - if (ClosingParens.ALWAYS == parens + if (parens == ClosingParens.ALWAYS && !parenExists) { log(ast.getLineNo(), MSG_KEY_ANNOTATION_PARENS_MISSING); } - else if (ClosingParens.NEVER == parens + else if (parens == ClosingParens.NEVER && !ast.branchContains(TokenTypes.EXPR) && !ast.branchContains(TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR) && !ast.branchContains(TokenTypes.ANNOTATION_ARRAY_INIT)