From ab70f861029de67ef35be603eb02d8fa58da3b64 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Wed, 28 Sep 2016 21:03:01 +0300 Subject: [PATCH] remove redundant getName-s for QuickFix inheritors (update) --- .../BlockMarkerCommentsInspection.java | 6 ------ .../TrivialMethodReferenceInspection.java | 7 ------- .../dataFlow/DfaOptionalSupport.java | 7 ------- .../java18api/Java8CollectionsApiInspection.java | 14 -------------- ...dAllCanBeReplacedWithConstructorInspection.java | 7 ------- ...taticPseudoFunctionalStyleMethodInspection.java | 7 ------- .../RedundantLambdaParameterTypeInspection.java | 7 ------- .../MigrateAssertToMatcherAssertInspection.java | 7 ------- .../InconsistentLineSeparatorsInspection.java | 6 ------ .../OfflineDescriptorResolveResult.java | 7 ------- .../src/com/siyeh/ig/fixes/InlineCallFix.java | 6 ------ .../maturity/SuppressionAnnotationInspection.java | 6 ------ .../SuspiciousLocalesLanguagesInspection.java | 7 ------- .../PropertiesInspectionSuppressor.java | 13 ------------- .../AlphaUnsortedPropertiesFileInspection.java | 7 ------- .../unused/UnusedPropertyInspection.java | 7 ------- .../incomplete/IncompletePropertyInspection.java | 7 ------- .../inspection/UndeclaredTestInspection.java | 5 ----- .../analysis/CreateNSDeclarationIntentionFix.java | 6 ------ 19 files changed, 139 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/BlockMarkerCommentsInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/BlockMarkerCommentsInspection.java index f2d8f77267a7..1d85c083d89e 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/BlockMarkerCommentsInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/BlockMarkerCommentsInspection.java @@ -91,12 +91,6 @@ public class BlockMarkerCommentsInspection extends BaseJavaBatchLocalInspectionT } if (MARKER_PATTERN.accepts(element)) { holder.registerProblem(element, "Redundant block marker", new LocalQuickFix() { - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @NotNull @Override public String getFamilyName() { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/TrivialMethodReferenceInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/TrivialMethodReferenceInspection.java index 5978a899105b..40edc3d4eaca 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/TrivialMethodReferenceInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/TrivialMethodReferenceInspection.java @@ -53,13 +53,6 @@ public class TrivialMethodReferenceInspection extends BaseJavaBatchLocalInspecti } private static class ReplaceMethodRefWithQualifierFix implements LocalQuickFix { - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @Nls @NotNull @Override diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaOptionalSupport.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaOptionalSupport.java index 6ce8055fd0ae..866e6a6161c0 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaOptionalSupport.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DfaOptionalSupport.java @@ -100,13 +100,6 @@ public class DfaOptionalSupport { myClearArguments = clearArguments; } - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @NotNull @Override public String getFamilyName() { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8CollectionsApiInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8CollectionsApiInspection.java index c94794c36ecd..c200adb7bd91 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8CollectionsApiInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8CollectionsApiInspection.java @@ -484,13 +484,6 @@ public class Java8CollectionsApiInspection extends BaseJavaBatchLocalInspectionT } private static class ReplaceWithListSortFix implements LocalQuickFix { - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @Nls @NotNull @Override @@ -584,13 +577,6 @@ public class Java8CollectionsApiInspection extends BaseJavaBatchLocalInspectionT } private static class ReplaceWithRemoveIfQuickFix implements LocalQuickFix { - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @Nls @NotNull @Override diff --git a/java/java-impl/src/com/intellij/codeInspection/CollectionAddAllCanBeReplacedWithConstructorInspection.java b/java/java-impl/src/com/intellij/codeInspection/CollectionAddAllCanBeReplacedWithConstructorInspection.java index 283bc4f050ab..27c4e6958bf5 100644 --- a/java/java-impl/src/com/intellij/codeInspection/CollectionAddAllCanBeReplacedWithConstructorInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/CollectionAddAllCanBeReplacedWithConstructorInspection.java @@ -239,13 +239,6 @@ public class CollectionAddAllCanBeReplacedWithConstructorInspection extends Base myAssignmentExpression = smartPointerManager.createSmartPsiElementPointer(assignmentExpression); } - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @NotNull @Override public String getFamilyName() { diff --git a/java/java-impl/src/com/intellij/codeInspection/java18StreamApi/StaticPseudoFunctionalStyleMethodInspection.java b/java/java-impl/src/com/intellij/codeInspection/java18StreamApi/StaticPseudoFunctionalStyleMethodInspection.java index e08c66fa943b..8fce942f9023 100644 --- a/java/java-impl/src/com/intellij/codeInspection/java18StreamApi/StaticPseudoFunctionalStyleMethodInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/java18StreamApi/StaticPseudoFunctionalStyleMethodInspection.java @@ -114,13 +114,6 @@ public class StaticPseudoFunctionalStyleMethodInspection extends BaseJavaBatchLo myHandler = handler; } - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @NotNull @Override public String getFamilyName() { diff --git a/java/java-impl/src/com/intellij/codeInspection/lambda/RedundantLambdaParameterTypeInspection.java b/java/java-impl/src/com/intellij/codeInspection/lambda/RedundantLambdaParameterTypeInspection.java index b925e8ff8083..28b4bf9fb510 100644 --- a/java/java-impl/src/com/intellij/codeInspection/lambda/RedundantLambdaParameterTypeInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/lambda/RedundantLambdaParameterTypeInspection.java @@ -129,13 +129,6 @@ public class RedundantLambdaParameterTypeInspection extends BaseJavaBatchLocalIn } private static class LambdaParametersFix implements LocalQuickFix { - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @Nls @NotNull @Override diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/MigrateAssertToMatcherAssertInspection.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/MigrateAssertToMatcherAssertInspection.java index 41a2e42111d9..55773c007e0d 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/MigrateAssertToMatcherAssertInspection.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/MigrateAssertToMatcherAssertInspection.java @@ -96,13 +96,6 @@ public class MigrateAssertToMatcherAssertInspection extends LocalInspectionTool } public class MyQuickFix implements LocalQuickFix { - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @Nls @NotNull @Override diff --git a/platform/analysis-impl/src/com/intellij/codeStyle/InconsistentLineSeparatorsInspection.java b/platform/analysis-impl/src/com/intellij/codeStyle/InconsistentLineSeparatorsInspection.java index 97e0261987e4..88566bb3b416 100644 --- a/platform/analysis-impl/src/com/intellij/codeStyle/InconsistentLineSeparatorsInspection.java +++ b/platform/analysis-impl/src/com/intellij/codeStyle/InconsistentLineSeparatorsInspection.java @@ -67,12 +67,6 @@ public class InconsistentLineSeparatorsInspection extends LocalInspectionTool { } @NotNull private static final LocalQuickFix SET_PROJECT_LINE_SEPARATORS = new LocalQuickFix() { - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @NotNull @Override public String getFamilyName() { diff --git a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineDescriptorResolveResult.java b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineDescriptorResolveResult.java index 8a49758aca63..cf341aebc5e2 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineDescriptorResolveResult.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineDescriptorResolveResult.java @@ -186,13 +186,6 @@ class OfflineDescriptorResolveResult { private static CommonProblemDescriptor createRerunGlobalToolDescriptor(@NotNull GlobalInspectionToolWrapper wrapper, @Nullable RefEntity entity) { return new CommonProblemDescriptorImpl(new QuickFix[]{new QuickFix() { - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @Nls @NotNull @Override diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineCallFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineCallFix.java index 25b9e37946a0..8a63ae41d4fe 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineCallFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineCallFix.java @@ -44,12 +44,6 @@ public class InlineCallFix extends InspectionGadgetsFix { return myName; } - @Override - @NotNull - public String getName() { - return getFamilyName(); - } - @Override public void doFix(final Project project, ProblemDescriptor descriptor) { final PsiElement nameElement = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java index 347ea8484558..2a42fa12610a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java @@ -71,12 +71,6 @@ public class SuppressionAnnotationInspection extends SuppressionAnnotationInspec } } - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @NotNull @Override public String getFamilyName() { diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/SuspiciousLocalesLanguagesInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/SuspiciousLocalesLanguagesInspection.java index f1366287218f..85d8faf5a5be 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/SuspiciousLocalesLanguagesInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/SuspiciousLocalesLanguagesInspection.java @@ -140,13 +140,6 @@ public class SuspiciousLocalesLanguagesInspection extends BaseLocalInspectionToo myResourceBundle = bundle; } - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @NotNull @Override public String getFamilyName() { diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/PropertiesInspectionSuppressor.java b/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/PropertiesInspectionSuppressor.java index 7a3c60511e39..29069f581a24 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/PropertiesInspectionSuppressor.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/PropertiesInspectionSuppressor.java @@ -88,13 +88,6 @@ public class PropertiesInspectionSuppressor implements InspectionSuppressor { this.shortName = shortName; } - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @Override @NotNull public String getFamilyName() { @@ -140,12 +133,6 @@ public class PropertiesInspectionSuppressor implements InspectionSuppressor { private SuppressForFile(String shortName) { this.shortName = shortName; } - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } @Override @NotNull diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unsorted/AlphaUnsortedPropertiesFileInspection.java b/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unsorted/AlphaUnsortedPropertiesFileInspection.java index 0e21a1cd9232..0ed86dfac63f 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unsorted/AlphaUnsortedPropertiesFileInspection.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unsorted/AlphaUnsortedPropertiesFileInspection.java @@ -95,13 +95,6 @@ public class AlphaUnsortedPropertiesFileInspection extends LocalInspectionTool { myFilesToSort = toSort; } - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @NotNull @Override public String getFamilyName() { diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unused/UnusedPropertyInspection.java b/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unused/UnusedPropertyInspection.java index f8bb3d992e31..7070817b7e37 100644 --- a/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unused/UnusedPropertyInspection.java +++ b/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unused/UnusedPropertyInspection.java @@ -206,13 +206,6 @@ public class UnusedPropertyInspection extends PropertiesInspectionBase implement myRepresentativePointer = SmartPointerManager.getInstance(property.getProject()).createSmartPsiElementPointer(property); } - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @Nls @NotNull @Override diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/inspections/incomplete/IncompletePropertyInspection.java b/plugins/properties/src/com/intellij/lang/properties/editor/inspections/incomplete/IncompletePropertyInspection.java index b6080d33701a..a4db0894f308 100644 --- a/plugins/properties/src/com/intellij/lang/properties/editor/inspections/incomplete/IncompletePropertyInspection.java +++ b/plugins/properties/src/com/intellij/lang/properties/editor/inspections/incomplete/IncompletePropertyInspection.java @@ -105,13 +105,6 @@ public class IncompletePropertyInspection extends LocalInspectionTool implements myResourceBundle = bundle; } - @Nls - @NotNull - @Override - public String getName() { - return getFamilyName(); - } - @Nls @NotNull @Override diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/UndeclaredTestInspection.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/UndeclaredTestInspection.java index 0ce0a314753f..5c91b753f465 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/inspection/UndeclaredTestInspection.java +++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/UndeclaredTestInspection.java @@ -189,11 +189,6 @@ public class UndeclaredTestInspection extends BaseJavaLocalInspectionTool { } private static class CreateTestngFix implements LocalQuickFix { - @NotNull - public String getName() { - return getFamilyName(); - } - @NotNull public String getFamilyName() { return "Create suite"; diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java index 8ea857c672eb..e930c6add807 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java @@ -112,12 +112,6 @@ public class CreateNSDeclarationIntentionFix implements HintAction, LocalQuickFi return XmlNamespaceHelper.getHelper(getFile()); } - @Override - @NotNull - public String getName() { - return getFamilyName(); - } - @Override @NotNull public String getFamilyName() {