From e81f56770563ebdea0059b71de05f4d44fd04a6f Mon Sep 17 00:00:00 2001 From: Eugene Vigdorchik Date: Mon, 6 Dec 2004 13:51:44 +0300 Subject: [PATCH] (no message) --- .../ErrorRethrownInspection.java | 10 ++++----- .../ThreadDeathRethrownInspection.java | 10 ++++----- .../UnusedCatchParameterInspection.java | 22 +++++++++---------- ...cessaryFinalOnLocalVariableInspection.java | 11 +++++----- 4 files changed, 25 insertions(+), 28 deletions(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ErrorRethrownInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ErrorRethrownInspection.java index a076da5c9a1b..48adb3093f49 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ErrorRethrownInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ErrorRethrownInspection.java @@ -35,11 +35,11 @@ public class ErrorRethrownInspection extends StatementInspection { public void visitTryStatement(PsiTryStatement statement) { super.visitTryStatement(statement); - final PsiParameter[] parameters = statement.getCatchBlockParameters(); - final PsiCodeBlock[] catchBlocks = statement.getCatchBlocks(); - for (int i = 0; i < catchBlocks.length; i++) { - final PsiParameter parameter = parameters[i]; - final PsiCodeBlock catchBlock = catchBlocks[i]; + PsiCatchSection[] catchSections = statement.getCatchSections(); + for (int i = 0; i < catchSections.length; i++) { + final PsiParameter parameter = catchSections[i].getParameter(); + final PsiCodeBlock catchBlock = catchSections[i].getCatchBlock(); + if (parameter == null || catchBlock == null) continue; checkCatchBlock(parameter, catchBlock); } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java index 1b1b6bf9bf68..5c25d76872c5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java @@ -33,11 +33,11 @@ public class ThreadDeathRethrownInspection extends StatementInspection { public void visitTryStatement(PsiTryStatement statement) { super.visitTryStatement(statement); - final PsiParameter[] parameters = statement.getCatchBlockParameters(); - final PsiCodeBlock[] catchBlocks = statement.getCatchBlocks(); - for (int i = 0; i < catchBlocks.length; i++) { - final PsiParameter parameter = parameters[i]; - final PsiCodeBlock catchBlock = catchBlocks[i]; + PsiCatchSection[] catchSections = statement.getCatchSections(); + for (int i = 0; i < catchSections.length; i++) { + final PsiParameter parameter = catchSections[i].getParameter(); + final PsiCodeBlock catchBlock = catchSections[i].getCatchBlock(); + if (parameter == null || catchBlock == null) continue; checkCatchBlock(parameter, catchBlock); } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnusedCatchParameterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnusedCatchParameterInspection.java index 5b258c0dfec0..05d9eb371073 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnusedCatchParameterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnusedCatchParameterInspection.java @@ -79,11 +79,11 @@ public class UnusedCatchParameterInspection extends StatementInspection { } } - final PsiCodeBlock[] catchBlocks = statement.getCatchBlocks(); - final PsiParameter[] params = statement.getCatchBlockParameters(); - for (int i = 0; i < catchBlocks.length; i++) { - final PsiCodeBlock block = catchBlocks[i]; - final PsiParameter param = params[i]; + PsiCatchSection[] catchSections = statement.getCatchSections(); + for (int i = 0; i < catchSections.length; i++) { + final PsiParameter param = catchSections[i].getParameter(); + final PsiCodeBlock block = catchSections[i].getCatchBlock(); + if (param == null || block == null) continue; if (m_ignoreCatchBlocksWithComments) { final PsiElement[] children = block.getChildren(); for (int j = 0; j < children.length; j++) { @@ -93,14 +93,12 @@ public class UnusedCatchParameterInspection extends StatementInspection { } } } - if (block != null && param != null) { - final CatchParameterUsedVisitor visitor = - new CatchParameterUsedVisitor(param); - block.accept(visitor); + final CatchParameterUsedVisitor visitor = + new CatchParameterUsedVisitor(param); + block.accept(visitor); - if (!visitor.isUsed()) { - registerVariableError(param); - } + if (!visitor.isUsed()) { + registerVariableError(param); } } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryFinalOnLocalVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryFinalOnLocalVariableInspection.java index a3f10e17e943..b8149ebf0e34 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryFinalOnLocalVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryFinalOnLocalVariableInspection.java @@ -70,12 +70,11 @@ public class UnnecessaryFinalOnLocalVariableInspection extends MethodInspection public void visitTryStatement(PsiTryStatement statement) { super.visitTryStatement(statement); - final PsiParameter[] catchBlockParameters = - statement.getCatchBlockParameters(); - final PsiCodeBlock[] catchBlocks = statement.getCatchBlocks(); - for (int i = 0; i < catchBlocks.length; i++) { - final PsiCodeBlock catchBlock = catchBlocks[i]; - final PsiParameter parameter = catchBlockParameters[i]; + PsiCatchSection[] catchSections = statement.getCatchSections(); + for (int i = 0; i < catchSections.length; i++) { + final PsiParameter parameter = catchSections[i].getParameter(); + final PsiCodeBlock catchBlock = catchSections[i].getCatchBlock(); + if (parameter == null || catchBlock == null) continue; if (parameter.hasModifierProperty(PsiModifier.FINAL) && !variableIsUsedInInnerClass(catchBlock, parameter)) { registerModifierError(PsiModifier.FINAL, parameter);