From 0ef6978e3e94d0fcdc26de81d94b710af924fb00 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Fri, 6 Apr 2012 16:24:17 +0200 Subject: [PATCH] annotations --- .../src/com/siyeh/ig/abstraction/MagicNumberInspection.java | 5 ++--- .../com/siyeh/ig/errorhandling/TooBroadCatchInspection.java | 6 ++++-- .../siyeh/ig/errorhandling/TooBroadThrowsInspection.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/MagicNumberInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/MagicNumberInspection.java index 0857b04f3888..becbac882c5c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/MagicNumberInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/MagicNumberInspection.java @@ -33,11 +33,10 @@ import javax.swing.*; public class MagicNumberInspection extends BaseInspection { - /** - * @noinspection PublicField - */ + @SuppressWarnings("PublicField") public boolean ignoreInHashCode = true; + @SuppressWarnings("PublicField") public boolean ignoreInTestCode = false; @Override diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadCatchInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadCatchInspection.java index 9fde8cd1ace8..2f94aaf948f0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadCatchInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadCatchInspection.java @@ -42,7 +42,7 @@ public class TooBroadCatchInspection extends BaseInspection { @SuppressWarnings({"PublicField"}) public boolean onlyWarnOnRootExceptions = false; - @SuppressWarnings("UnusedDeclaration") + @SuppressWarnings("PublicField") public boolean ignoreInTestCode = false; @Override @@ -229,7 +229,9 @@ public class TooBroadCatchInspection extends BaseInspection { final List maskedExceptions = findMaskedExceptions(exceptionsThrown, exceptionsCaught, type); if (!maskedExceptions.isEmpty()) { final PsiTypeElement typeElement = parameter.getTypeElement(); - registerError(typeElement, maskedExceptions); + if (typeElement != null) { + registerError(typeElement, maskedExceptions); + } } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadThrowsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadThrowsInspection.java index c6b4143b739a..6dd2560f6008 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadThrowsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/TooBroadThrowsInspection.java @@ -37,7 +37,7 @@ public class TooBroadThrowsInspection extends BaseInspection { @SuppressWarnings({"PublicField"}) public boolean onlyWarnOnRootExceptions = false; - @SuppressWarnings("UnusedDeclaration") + @SuppressWarnings("PublicField") public boolean ignoreInTestCode = false; @Override