From 166d33a82753a61b49ef90f3637a75eedf6b0fdf Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Thu, 28 Nov 2013 11:08:11 +0100 Subject: [PATCH 1/2] enable by default --- .../src/META-INF/InspectionGadgets.xml | 2 +- .../ig/maturity/ThrowablePrintedToSystemOutInspection.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml index 3e850780c92a..19e7b9662d28 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml @@ -1503,7 +1503,7 @@ enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.maturity.ThreadDumpStackInspection"/> Date: Thu, 28 Nov 2013 15:34:34 +0100 Subject: [PATCH 2/2] drop "ignore exceptions declared in test" and use "suppress for 'Tests' scope" quickfix --- .../BadExceptionDeclaredInspectionBase.java | 4 ++-- .../BadExceptionDeclaredInspection.java | 18 +++++++++++------- .../BadExceptionDeclared.html | 4 +--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspectionBase.java index 147c0e81224c..8e8fc2548334 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspectionBase.java @@ -45,7 +45,7 @@ public class BadExceptionDeclaredInspectionBase extends BaseInspection { ); @SuppressWarnings("PublicField") - public boolean ignoreTestCases = false; + public boolean ignoreTestCases = false; // keep for compatibility @SuppressWarnings("PublicField") public boolean ignoreLibraryOverrides = false; @@ -109,7 +109,7 @@ public class BadExceptionDeclaredInspectionBase extends BaseInspection { final PsiClass thrownClass = (PsiClass)element; final String qualifiedName = thrownClass.getQualifiedName(); if (qualifiedName != null && exceptions.contains(qualifiedName)) { - registerError(reference); + registerError(reference, reference); } } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java index e37fee03a0e6..64252c24a677 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclaredInspection.java @@ -17,8 +17,11 @@ package com.siyeh.ig.errorhandling; import com.intellij.codeInspection.ui.ListTable; import com.intellij.codeInspection.ui.ListWrappingTableModel; +import com.intellij.psi.PsiElement; import com.intellij.util.ui.CheckBox; import com.siyeh.InspectionGadgetsBundle; +import com.siyeh.ig.InspectionGadgetsFix; +import com.siyeh.ig.fixes.SuppressForTestsScopeFix; import com.siyeh.ig.ui.UiUtils; import javax.swing.*; @@ -26,6 +29,12 @@ import java.awt.*; public class BadExceptionDeclaredInspection extends BadExceptionDeclaredInspectionBase { + @Override + protected InspectionGadgetsFix buildFix(Object... infos) { + final PsiElement context = (PsiElement)infos[0]; + return SuppressForTestsScopeFix.build(this, context); + } + @Override public JComponent createOptionsPanel() { final JComponent panel = new JPanel(new GridBagLayout()); @@ -41,17 +50,12 @@ public class BadExceptionDeclaredInspection extends BadExceptionDeclaredInspecti constraints.fill = GridBagConstraints.BOTH; panel.add(tablePanel, constraints); - final CheckBox checkBox1 = - new CheckBox(InspectionGadgetsBundle.message("ignore.exceptions.declared.in.tests.option"), this, - "ignoreTestCases"); - constraints.gridy = 1; - constraints.weighty = 0.0; - panel.add(checkBox1, constraints); final CheckBox checkBox2 = new CheckBox(InspectionGadgetsBundle.message("ignore.exceptions.declared.on.library.override.option"), this, "ignoreLibraryOverrides"); - constraints.gridy = 2; + constraints.weighty = 0.0; + constraints.gridy = 1; panel.add(checkBox2, constraints); return panel; } diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/BadExceptionDeclared.html b/plugins/InspectionGadgets/src/inspectionDescriptions/BadExceptionDeclared.html index 775a9b57e95a..82048c05ec4c 100644 --- a/plugins/InspectionGadgets/src/inspectionDescriptions/BadExceptionDeclared.html +++ b/plugins/InspectionGadgets/src/inspectionDescriptions/BadExceptionDeclared.html @@ -6,9 +6,7 @@ Reports inappropriate exceptions declared by methods. One use of this inspection

Use the list below to specify which exceptions should be flagged by this inspection.

-Use the first checkbox below to ignore exceptions declared on test methods. -

-Use the second checkbox below to ignore exceptions declared on methods which override a library method. +Use the checkbox below to ignore exceptions declared on methods which override a library method.