From 03a5e242bf19c1eff34a075ab093950cef2c51b6 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <Tagir.Valeev@jetbrains.com>
Date: Tue, 13 Sep 2016 09:17:26 +0700
Subject: [PATCH] IDEA-161007 ComparatorCombinatorsInspection registration in
 IdeaPlugin.xml fixed

---
 .../codeInspection/ComparatorCombinatorsInspection.java    | 7 -------
 resources/src/META-INF/IdeaPlugin.xml                      | 5 +++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/ComparatorCombinatorsInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/ComparatorCombinatorsInspection.java
index f73513ce19f8..81020c7b5fc8 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/ComparatorCombinatorsInspection.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/ComparatorCombinatorsInspection.java
@@ -71,13 +71,6 @@ public class ComparatorCombinatorsInspection extends BaseJavaBatchLocalInspectio
            ((PsiReferenceExpression)right).resolve() == parameters[1];
   }
 
-  @Nls
-  @NotNull
-  @Override
-  public String getDisplayName() {
-    return "Use Comparator combinators";
-  }
-
   static class ReplaceWithComparatorFix implements LocalQuickFix {
 
     @Nls
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 655a60c72fea..4641d6d218f9 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -820,10 +820,11 @@
                      groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.SimplifyStreamApiCallChainsInspection"
                      displayName="Simplify stream API call chains"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ComparatorCombinatorsInspection"
+    <localInspection groupPath="Java" language="JAVA" shortName="ComparatorCombinators"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.ComparatorCombinatorsInspection"/>
+                     implementationClass="com.intellij.codeInspection.ComparatorCombinatorsInspection"
+                     displayName="Use Comparator combinators"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ReplaceInefficientStreamCount"
                      groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"