From 422ab30197875d7bce68b357cda977bd1cb45fab Mon Sep 17 00:00:00 2001 From: alexkravin Date: Tue, 20 Jan 2015 15:28:19 +0400 Subject: [PATCH] Annotation Location Check, fixed typo in property name, issue #585 --- .../annotation/AnnotationLocationCheck.java | 17 ++++++++++------- src/xdocs/config_annotation.xml | 12 ++++++------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java index 16646cce8..d8c8f714e 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/AnnotationLocationCheck.java @@ -52,7 +52,7 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; * * *
  • - * allowSamelineParametrizedAnnotation - to allow parameterized annotation + * allowSamelineParameterizedAnnotation - to allow parameterized annotation * to be located on the same line as target element. Default value is false. *
  • * @@ -70,7 +70,8 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; * <property name="allowSamelineMultipleAnnotations" value="false"/> * <property name="allowSamelineSingleParameterlessAnnotation" * value="true"/> - * <property name="allowSamelineParametrizedAnnotation" value="false"/> + * <property name="allowSamelineParameterizedAnnotation" value="false" + * /> * </module> * *
    @@ -87,7 +88,8 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; * <property name="allowSamelineMultipleAnnotations" value="true"/> * <property name="allowSamelineSingleParameterlessAnnotation" * value="true"/> - * <property name="allowSamelineParametrizedAnnotation" value="true"/> + * <property name="allowSamelineParameterizedAnnotation" value="true" + * /> * </module> * *
    @@ -104,7 +106,8 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; * <property name="allowSamelineMultipleAnnotations" value="true"/> * <property name="allowSamelineSingleParameterlessAnnotation" * value="true"/> - * <property name="allowSamelineParametrizedAnnotation" value="false"/> + * <property name="allowSamelineParameterizedAnnotation" value="false" + * /> * </module> * * @@ -132,7 +135,7 @@ public class AnnotationLocationCheck extends Check /** * Some javadoc. */ - private boolean allowSamelineParametrizedAnnotation; + private boolean allowSamelineParameterizedAnnotation; /** * Some javadoc. @@ -154,7 +157,7 @@ public class AnnotationLocationCheck extends Check */ public final void setAllowSamelineParametrizedAnnotation(boolean allow) { - allowSamelineParametrizedAnnotation = allow; + allowSamelineParameterizedAnnotation = allow; } /** @@ -221,7 +224,7 @@ public class AnnotationLocationCheck extends Check */ private boolean isCorrectLocation(DetailAST annotation, boolean hasParams) { - final boolean allowingCondition = hasParams ? allowSamelineParametrizedAnnotation + final boolean allowingCondition = hasParams ? allowSamelineParameterizedAnnotation : allowSamelineSingleParameterlessAnnotation; return allowingCondition && !hasNodeBefore(annotation) || !allowingCondition && !hasNodeBeside(annotation) diff --git a/src/xdocs/config_annotation.xml b/src/xdocs/config_annotation.xml index 44648f0b2..6a61a5895 100644 --- a/src/xdocs/config_annotation.xml +++ b/src/xdocs/config_annotation.xml @@ -455,8 +455,8 @@ public String getNameIfPresent() { ... } true - allowSamelineParametrizedAnnotation - To allow parametrized annotation to be located on the same line as target element. + allowSamelineParameterizedAnnotation + To allow parameterized annotation to be located on the same line as target element. boolean false @@ -477,11 +477,11 @@ public String getNameIfPresent() { ... } <module name="AnnotationLocation"> <property name="allowSamelineMultipleAnnotations" value="false"/> <property name="allowSamelineSingleParameterlessAnnotation" value="true"/> - <property name="allowSamelineParametrizedAnnotation" value="false"/> + <property name="allowSamelineParameterizedAnnotation" value="false"/> </module>

    - Example to allow multiple parametrized annotations on the same line + Example to allow multiple parameterized annotations on the same line

    @SuppressWarnings("deprecation") @Mock DataLoader loader; @@ -493,7 +493,7 @@ public String getNameIfPresent() { ... } <module name="AnnotationLocation"> <property name="allowSamelineMultipleAnnotations" value="true"/> <property name="allowSamelineSingleParameterlessAnnotation" value="true"/> - <property name="allowSamelineParametrizedAnnotation" value="true"/> + <property name="allowSamelineParameterizedAnnotation" value="true"/> </module>

    @@ -509,7 +509,7 @@ public String getNameIfPresent() { ... } <module name="AnnotationLocation"> <property name="allowSamelineMultipleAnnotations" value="true"/> <property name="allowSamelineSingleParameterlessAnnotation" value="true"/> - <property name="allowSamelineParametrizedAnnotation" value="false"/> + <property name="allowSamelineParameterizedAnnotation" value="false"/> </module>