From d82d22868aef6d5af387d6aa5e6165289ebfffd2 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Fri, 16 Mar 2012 10:33:00 +0100 Subject: [PATCH] cleanup --- .../ig/controlflow/IfMayBeConditionalInspection.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfMayBeConditionalInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfMayBeConditionalInspection.java index 4b38be535c2d..d6cbe937e438 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfMayBeConditionalInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfMayBeConditionalInspection.java @@ -204,13 +204,13 @@ public class IfMayBeConditionalInspection extends BaseInspection { } final PsiExpressionStatement thenExpressionStatement = (PsiExpressionStatement)thenStatement; final PsiExpression thenExpression = thenExpressionStatement.getExpression(); + final PsiExpressionStatement elseExpressionStatement = (PsiExpressionStatement)elseStatement; + final PsiExpression elseExpression = elseExpressionStatement.getExpression(); if (thenExpression instanceof PsiAssignmentExpression) { - final PsiAssignmentExpression thenAssignmentExpression = (PsiAssignmentExpression)thenExpression; - final PsiExpressionStatement elseExpressionStatement = (PsiExpressionStatement)elseStatement; - final PsiExpression elseExpression = elseExpressionStatement.getExpression(); if (!(elseExpression instanceof PsiAssignmentExpression)) { return; } + final PsiAssignmentExpression thenAssignmentExpression = (PsiAssignmentExpression)thenExpression; final PsiAssignmentExpression elseAssignmentExpression = (PsiAssignmentExpression)elseExpression; if (!thenAssignmentExpression.getOperationTokenType().equals(elseAssignmentExpression.getOperationTokenType())) { return; @@ -223,12 +223,10 @@ public class IfMayBeConditionalInspection extends BaseInspection { registerStatementError(statement); } else if (reportMethodCalls && thenExpression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression thenMethodCallExpression = (PsiMethodCallExpression)thenExpression; - final PsiExpressionStatement elseExpressionStatement = (PsiExpressionStatement)elseStatement; - final PsiExpression elseExpression = elseExpressionStatement.getExpression(); if (!(elseExpression instanceof PsiMethodCallExpression)) { return; } + final PsiMethodCallExpression thenMethodCallExpression = (PsiMethodCallExpression)thenExpression; final PsiMethodCallExpression elseMethodCallExpression = (PsiMethodCallExpression)elseExpression; final PsiReferenceExpression thenMethodExpression = thenMethodCallExpression.getMethodExpression(); final PsiReferenceExpression elseMethodExpression = elseMethodCallExpression.getMethodExpression();