From f1ac1054e3fc59f52237fb83da52c53dffe71de3 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 18 Feb 2014 14:49:37 +0400
Subject: [PATCH] use common ExceptionUtil

---
 ...tDoesNotThrowNoSuchElementExceptionInspection.java | 11 ++++-------
 .../junit/ExpectedExceptionNeverThrownInspection.java |  4 +++-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java
index 174bfa908c9b..8119b1510d40 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IteratorNextDoesNotThrowNoSuchElementExceptionInspection.java
@@ -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")) {
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ExpectedExceptionNeverThrownInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ExpectedExceptionNeverThrownInspection.java
index 98ec40b4dd99..86d83dc25e35 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ExpectedExceptionNeverThrownInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/ExpectedExceptionNeverThrownInspection.java
@@ -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;
       }