From b803c8dc2b996ad983a5d1d4de21c6eae06eec78 Mon Sep 17 00:00:00 2001 From: "Roman.Ivanov" Date: Thu, 7 Jun 2018 12:55:06 +0700 Subject: [PATCH] IfStatementWithIdenticalBranches: fix inspection naming --- .../testData/inspection/commonIfParts/afterMergeElseIf.java | 2 +- .../inspection/commonIfParts/afterMergeElseIfBlock.java | 2 +- .../testData/inspection/commonIfParts/beforeMergeElseIf.java | 2 +- .../inspection/commonIfParts/beforeMergeElseIfBlock.java | 2 +- .../inspection/commonIfParts/beforeMergeElseIfDifferent.java | 2 +- .../src/messages/InspectionsBundle.properties | 3 ++- .../IfStatementWithIdenticalBranchesInspection.java | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/java/java-tests/testData/inspection/commonIfParts/afterMergeElseIf.java b/java/java-tests/testData/inspection/commonIfParts/afterMergeElseIf.java index 2bf97aa3e78a..7c41bd138de5 100644 --- a/java/java-tests/testData/inspection/commonIfParts/afterMergeElseIf.java +++ b/java/java-tests/testData/inspection/commonIfParts/afterMergeElseIf.java @@ -1,4 +1,4 @@ -// "Merge else if statement" "true" +// "Merge 'else if' statement" "true" import java.util.Collection; import java.util.List; diff --git a/java/java-tests/testData/inspection/commonIfParts/afterMergeElseIfBlock.java b/java/java-tests/testData/inspection/commonIfParts/afterMergeElseIfBlock.java index 5077344ef4a3..224911541a8f 100644 --- a/java/java-tests/testData/inspection/commonIfParts/afterMergeElseIfBlock.java +++ b/java/java-tests/testData/inspection/commonIfParts/afterMergeElseIfBlock.java @@ -1,4 +1,4 @@ -// "Merge else if statement" "true" +// "Merge 'else if' statement" "true" import java.util.Collection; import java.util.List; diff --git a/java/java-tests/testData/inspection/commonIfParts/beforeMergeElseIf.java b/java/java-tests/testData/inspection/commonIfParts/beforeMergeElseIf.java index dafa741242bd..ea8da2fd9bb2 100644 --- a/java/java-tests/testData/inspection/commonIfParts/beforeMergeElseIf.java +++ b/java/java-tests/testData/inspection/commonIfParts/beforeMergeElseIf.java @@ -1,4 +1,4 @@ -// "Merge else if statement" "true" +// "Merge 'else if' statement" "true" import java.util.Collection; import java.util.List; diff --git a/java/java-tests/testData/inspection/commonIfParts/beforeMergeElseIfBlock.java b/java/java-tests/testData/inspection/commonIfParts/beforeMergeElseIfBlock.java index de15fb95cebd..dfa6a069c18f 100644 --- a/java/java-tests/testData/inspection/commonIfParts/beforeMergeElseIfBlock.java +++ b/java/java-tests/testData/inspection/commonIfParts/beforeMergeElseIfBlock.java @@ -1,4 +1,4 @@ -// "Merge else if statement" "true" +// "Merge 'else if' statement" "true" import java.util.Collection; import java.util.List; diff --git a/java/java-tests/testData/inspection/commonIfParts/beforeMergeElseIfDifferent.java b/java/java-tests/testData/inspection/commonIfParts/beforeMergeElseIfDifferent.java index 32ba9e3a6eae..a18df8607802 100644 --- a/java/java-tests/testData/inspection/commonIfParts/beforeMergeElseIfDifferent.java +++ b/java/java-tests/testData/inspection/commonIfParts/beforeMergeElseIfDifferent.java @@ -1,4 +1,4 @@ -// "Merge else if statement" "false" +// "Merge 'else if' statement" "false" import java.util.Collection; import java.util.List; diff --git a/platform/platform-resources-en/src/messages/InspectionsBundle.properties b/platform/platform-resources-en/src/messages/InspectionsBundle.properties index 3937c73dd86a..cb3d0891c4c6 100644 --- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties +++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties @@ -253,13 +253,14 @@ inspection.export.generating.html.for=Generating HTML:{0} inspection.export.error.writing.to=Error writing to {0}: {1} inspection.common.if.parts.family=Extract common parts of 'if' statement -inspection.common.if.parts.family.else.if=Merge else if statement +inspection.common.if.parts.family.else.if=Merge 'else if' statement inspection.common.if.parts.message.variables.only=Extract variables from 'if' {0} inspection.common.if.parts.message.with.variables.extract=Extract common part with variables from 'if' {0} inspection.common.if.parts.message.without.variables.extract=Extract common part from 'if' {0} inspection.common.if.parts.message.whole.branch=Extract common part removing branch {0} inspection.common.if.parts.message.complete.duplicate=Collapse 'if' statement {0} inspection.common.if.parts.message.complete.duplicate.side.effect=Collapse 'if' statement and extract side effect +inspection.common.if.parts.description='if' statement with common parts inspection.export.results.error.title=Inspection Results Export inspection.export.inspections.link.text=Inspections diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java index 15a54734409a..490ef09f197b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java @@ -54,7 +54,7 @@ public class IfStatementWithIdenticalBranchesInspection extends AbstractBaseJava IfInspectionResult result = inspector.inspect(ifStatement, thenStatements, elseStatements, isOnTheFly); if (result != null) { ProblemHighlightType highlightType = result.myIsWarning ? ProblemHighlightType.WEAK_WARNING : ProblemHighlightType.INFORMATION; - holder.registerProblem(result.myElementToHighlight, result.myMessage, highlightType, result.myFix); + holder.registerProblem(result.myElementToHighlight, InspectionsBundle.message("inspection.common.if.parts.description"), highlightType, result.myFix); } } }