From e793d45c41e1066e536a2874bcf1594e997224d9 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Thu, 13 Jan 2005 15:53:38 +0300 Subject: [PATCH] merged CVS and Subversion versions --- .../naming/ClassNamePrefixedWithPackageNameInspection.java | 5 ++--- .../siyeh/ig/naming/MethodNameSameAsClassNameInspection.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNamePrefixedWithPackageNameInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNamePrefixedWithPackageNameInspection.java index 74465fba7593..76e05d9b61fc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNamePrefixedWithPackageNameInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNamePrefixedWithPackageNameInspection.java @@ -62,12 +62,11 @@ public class ClassNamePrefixedWithPackageNameInspection extends ClassInspection currentPackageName = tokenizer.nextToken(); } - final String packageName = lastPackageName; - if (packageName == null) { + if (lastPackageName == null) { return; } final String lowercaseClassName = className.toLowerCase(); - final String lowercasePackageName = packageName.toLowerCase(); + final String lowercasePackageName = lastPackageName.toLowerCase(); if (!lowercaseClassName.startsWith(lowercasePackageName)) { return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsClassNameInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsClassNameInspection.java index ac2a6228b390..177a0cd4b53a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsClassNameInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsClassNameInspection.java @@ -8,6 +8,7 @@ import com.siyeh.ig.*; import com.siyeh.ig.fixes.RenameFix; public class MethodNameSameAsClassNameInspection extends MethodInspection { + private final RenameFix fix = new RenameFix(); public String getDisplayName() { return "Method name same as class name"; @@ -18,7 +19,6 @@ public class MethodNameSameAsClassNameInspection extends MethodInspection { } protected InspectionGadgetsFix buildFix(PsiElement location) { - final RenameFix fix = new RenameFix(); return fix; }