diff --git a/.gitignore b/.gitignore index 3c59543..7d6bc06 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .project bin build +*.orig \ No newline at end of file diff --git a/build.xml b/build.xml index 0fb1b12..969dcc5 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + diff --git a/src/de/bjrke/checkstyle/jsr305/Jsr305Annotations.java b/src/de/bjrke/checkstyle/jsr305/Jsr305Annotations.java index 2034498..e1c0dcc 100644 --- a/src/de/bjrke/checkstyle/jsr305/Jsr305Annotations.java +++ b/src/de/bjrke/checkstyle/jsr305/Jsr305Annotations.java @@ -5,7 +5,7 @@ * Copyright (C) 2008 Marcus Thiesen (initial version) * Copyright (C) 2008-2009 Jan Burkhardt (maintainer) * - * thanks to Mattias Nissler, Thorsten Ehlers, Fabian Löwner for contributions + * thanks to Mattias Nissler, Thorsten Ehlers, Fabian Loewner for contributions * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -45,7 +45,7 @@ public class Jsr305Annotations extends Check { private String[] _packages = new String[0]; private String[] _excludePackages = new String[0]; private String[] _allowedAnnotations = { "Nonnull", "Nullable", "SuppressWarnings" }; - private String[] _allowedMethodAnnotations = { "CheckReturnValue", "CheckForNull", "Override" }; + private String[] _allowedMethodAnnotations = { "Nonnull", "CheckForNull", "Override" }; private boolean _checkAnnotation; diff --git a/src/de/bjrke/checkstyle/jsr305/checkstyle-metadata.xml b/src/de/bjrke/checkstyle/jsr305/checkstyle-metadata.xml index 67fd203..7183556 100644 --- a/src/de/bjrke/checkstyle/jsr305/checkstyle-metadata.xml +++ b/src/de/bjrke/checkstyle/jsr305/checkstyle-metadata.xml @@ -15,7 +15,7 @@ Define allowed Annotations, default is "Nonnull,Nullable,SuppressWarnings". - Define allowed Annotations, default is "CheckReturnValue,CheckForNull,Override". + Define allowed Annotations, default is "Nonnull,CheckForNull,Override".