MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

use common ExceptionUtil

Browse Source
This commit is contained in:
Anna Kozlova
2014-02-18 14:49:37 +04:00
parent 89e9ca0f3c
commit f1ac1054e3
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java
+4 -7
View File
@@ -15,17 +15,17 @@
*/
package com.siyeh.ig.bugs;
import com.intellij.codeInsight.ExceptionUtil;
import com.intellij.psi.*;
import com.siyeh.HardcodedMethodConstants;
import com.siyeh.InspectionGadgetsBundle;
import com.siyeh.ig.BaseInspection;
import com.siyeh.ig.BaseInspectionVisitor;
import com.siyeh.ig.psiutils.ExceptionUtils;
import com.siyeh.ig.psiutils.IteratorUtils;
import com.siyeh.ig.psiutils.MethodUtils;
import org.jetbrains.annotations.NotNull;
import java.util.Set;
import java.util.List;
public class IteratorNextDoesNotThrowNoSuchElementExceptionInspection
extends BaseInspection {
@@ -65,9 +65,7 @@ public class IteratorNextDoesNotThrowNoSuchElementExceptionInspection
HardcodedMethodConstants.NEXT)) {
return;
}
final Set<PsiClassType> exceptions =
ExceptionUtils.calculateExceptionsThrown(method);
for (final PsiType exception : exceptions) {
for (final PsiType exception : ExceptionUtil.getThrownExceptions(method)) {
if (exception.equalsToText(
"java.util.NoSuchElementException")) {
return;
@@ -103,8 +101,7 @@ public class IteratorNextDoesNotThrowNoSuchElementExceptionInspection
if (method == null) {
return;
}
final Set<PsiClassType> exceptions =
ExceptionUtils.calculateExceptionsThrown(method);
final List<PsiClassType> exceptions = ExceptionUtil.getThrownExceptions(method);
for (final PsiType exception : exceptions) {
if (exception.equalsToText(
"java.util.NoSuchElementException")) {
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ExpectedExceptionNeverThrownInspection.java
+3 -1
View File
@@ -16,6 +16,7 @@
package com.siyeh.ig.junit;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.ExceptionUtil;
import com.intellij.psi.*;
import com.intellij.psi.util.InheritanceUtil;
import com.siyeh.InspectionGadgetsBundle;
@@ -25,6 +26,7 @@ import com.siyeh.ig.psiutils.ExceptionUtils;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Set;
public class ExpectedExceptionNeverThrownInspection extends BaseInspection {
@@ -84,7 +86,7 @@ public class ExpectedExceptionNeverThrownInspection extends BaseInspection {
InheritanceUtil.isInheritor(aClass, CommonClassNames.JAVA_LANG_ERROR)) {
return;
}
final Set<PsiClassType> exceptionsThrown = ExceptionUtils.calculateExceptionsThrown(body);
final List<PsiClassType> exceptionsThrown = ExceptionUtil.getThrownExceptions(body);
if (exceptionsThrown.contains(classType)) {
return;
}