From de23950004ddfa540d7e8d9725f965c4b7da75e4 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Mon, 1 Oct 2012 18:21:38 +0200 Subject: [PATCH] cleanup --- .../com/siyeh/ig/psiutils/RecursionVisitor.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/RecursionVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/RecursionVisitor.java index 59e9fe4ac02a..f1f1d1d32fb4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/RecursionVisitor.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/RecursionVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2006 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2012 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ package com.siyeh.ig.psiutils; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; -public class RecursionVisitor extends JavaRecursiveElementVisitor { +class RecursionVisitor extends JavaRecursiveElementVisitor { private boolean recursive = false; private final PsiMethod method; @@ -44,21 +44,16 @@ public class RecursionVisitor extends JavaRecursiveElementVisitor { return; } super.visitMethodCallExpression(call); - final PsiReferenceExpression methodExpression = - call.getMethodExpression(); + final PsiReferenceExpression methodExpression = call.getMethodExpression(); final String calledMethodName = methodExpression.getReferenceName(); - if (calledMethodName == null) { - return; - } - if (!calledMethodName.equals(methodName)) { + if (!methodName.equals(calledMethodName)) { return; } final PsiMethod calledMethod = call.resolveMethod(); if (!method.equals(calledMethod)) { return; } - if (method.hasModifierProperty(PsiModifier.STATIC) || - method.hasModifierProperty(PsiModifier.PRIVATE)) { + if (method.hasModifierProperty(PsiModifier.STATIC) || method.hasModifierProperty(PsiModifier.PRIVATE)) { recursive = true; return; }