From 14b940694cd31d782fc5459511e9eb9ead563eba Mon Sep 17 00:00:00 2001
From: Pavel Dolgov <pavel.dolgov@jetbrains.com>
Date: Wed, 10 Aug 2016 16:15:15 +0300
Subject: [PATCH] Java inspection: Rename the inspection "Replace Equality with
 Equals" to a noun-based name - messages improved (IDEA-157727)

---
 .../src/META-INF/InspectionGadgets.xml                    | 8 ++++----
 .../src/com/siyeh/InspectionGadgetsBundle.properties      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml
index 7ee0e7f5993d..e34b2ad25ad9 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml
@@ -784,10 +784,6 @@
                      key="if.can.be.assertion.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.asserttoif.IfCanBeAssertionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EqualityOperatorComparesObjects" bundle="com.siyeh.InspectionGadgetsBundle"
-                     key="equality.operator.compares.objects.name" groupBundle="messages.InspectionsBundle"
-                     groupKey="group.names.control.flow.issues" enabledByDefault="true" level="INFORMATION"
-                     implementationClass="com.siyeh.ig.equality.EqualityOperatorComparesObjectsInspection"/>
 
     <!--group.names.data.flow.issues-->
     <localInspection groupPath="Java" language="JAVA" shortName="BooleanVariableAlwaysNegated" bundle="com.siyeh.InspectionGadgetsBundle"
@@ -2555,6 +2551,10 @@
                      key="add.array.creation.expression.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.style.AddArrayCreationExpressionInspection"/>
+    <localInspection groupPath="Java" language="JAVA" shortName="EqualityOperatorComparesObjects" bundle="com.siyeh.InspectionGadgetsBundle"
+                     key="equality.operator.compares.objects.name" groupBundle="messages.InspectionsBundle"
+                     groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
+                     implementationClass="com.siyeh.ig.equality.EqualityOperatorComparesObjectsInspection"/>
 
     <!--group.names.threading.issues-->
     <localInspection groupPath="Java" language="JAVA" suppressId="AccessToNonThreadSafeStaticField" shortName="AccessToNonThreadSafeStaticFieldFromInstance"
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
index e26a78e49846..f514ffe558d3 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
@@ -2174,8 +2174,8 @@ assertion.can.be.if.name=Assertion can be replaced with if statement
 assert.can.be.if.quickfix=Replace 'assert' with 'if' statement
 if.can.be.assertion.name=If statement can be replaced with assertion
 if.can.be.assertion.quickfix=Replace 'if' with 'assert' statement
-equality.operator.compares.objects.name=Equality operator compares objects
-equality.operator.compares.objects.descriptor=Equality operator ''{0}'' compares objects
+equality.operator.compares.objects.name=Objects compared with '==' or '!='
+equality.operator.compares.objects.descriptor=Objects compared with ''{0}''
 equality.operator.compares.objects.quickfix=Replace ''{0}'' with ''{1}equals()''
 equality.operator.compares.objects.family.quickfix=Replace equality operator with equals()
 equality.operator.compares.objects.safe.quickfix=Replace ''{0}'' with safe ''{1}equals()''