new version 0.3.2

added parameter allowedMethodAnnotations to xml too new default values: parameters: @nonnull, @nullable, @SuppressWarnings method return: @CheckReturnValue, @checkfornull, @OverRide added info to put plugin in dropin directory instead of plugin
bjrke · Oct 13, 2009 · 26b8c6c · 26b8c6c
1 parent 16eef53
commit 26b8c6c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/README b/README
@@ -3,7 +3,7 @@ to develop just import project to eclipse with default settings
 to build the jar type
     ant
 
-to use copy JSR305Checkstyle-x.x.x.jar into your eclipse plugins directory or add it as compile lib to the classpath of the checkstyle task.
+to use copy JSR305Checkstyle-x.x.x.jar into your eclipse dropins directory or add it as compile lib to the classpath of the checkstyle task.
 
 add this to your checkstyle.xml
     <module name="Jsr305Annotations">

diff --git a/build.xml b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project name="JSR305CheckstylePlugin" default="jar" basedir=".">
 
-    <property name="version" value="0.3.1" />
+    <property name="version" value="0.3.2" />
     <property name="src" value="src" />
     <property name="build" value="build" />
     <property name="classes" value="${build}/classes" />

diff --git a/src/de/bjrke/checkstyle/jsr305/Jsr305Annotations.java b/src/de/bjrke/checkstyle/jsr305/Jsr305Annotations.java
@@ -43,8 +43,8 @@ public class Jsr305Annotations extends Check {
 
     private String[] _packages = new String[0];
     private String[] _excludePackages = new String[0];
-    private String[] _allowedAnnotations = { "Nullable", "CheckForNull", "Nonnull" };
-    private String[] _allowedMethodAnnotations = { "CheckForNull", "Nonnull", "CheckReturnValue" };
+    private String[] _allowedAnnotations = { "Nonnull", "Nullable", "SuppressWarnings" };
+    private String[] _allowedMethodAnnotations = { "CheckReturnValue", "CheckForNull", "Override" };
 
     private boolean _checkAnnotation;
 
@@ -60,8 +60,8 @@ public void setAllowedAnnotations( final String[] allowedAnnotations ) {
         _allowedAnnotations = new HashSet<String>( Arrays.asList( allowedAnnotations ) ).toArray( _allowedAnnotations );
     }
 
-    public void setAllowedMethodAnnotations( final String[] allowedAnnotations ) {
-        _allowedMethodAnnotations = new HashSet<String>( Arrays.asList( allowedAnnotations ) ).toArray( _allowedMethodAnnotations );
+    public void setAllowedMethodAnnotations( final String[] allowedMethodAnnotations ) {
+        _allowedMethodAnnotations = new HashSet<String>( Arrays.asList( allowedMethodAnnotations ) ).toArray( _allowedMethodAnnotations );
     }
 
     @Override

diff --git a/src/de/bjrke/checkstyle/jsr305/checkstyle-metadata.xml b/src/de/bjrke/checkstyle/jsr305/checkstyle-metadata.xml
@@ -12,7 +12,10 @@
                 <description>Packages excluded from checking.</description>
             </property-metadata>
             <property-metadata name="allowedAnnotations" datatype="String">
-                <description>Define allowed Annotations, default is "Nullable", "CheckForNull", "Nonnull".</description>
+                <description>Define allowed Annotations, default is "Nonnull,Nullable,SuppressWarnings".</description>
+            </property-metadata>
+            <property-metadata name="allowedMethodAnnotations" datatype="String">
+                <description>Define allowed Annotations, default is "CheckReturnValue,CheckForNull,Override".</description>
             </property-metadata>
         </rule-metadata>
     </rule-group-metadata>