From 83607e5b6cf7144a776c7a53256aa0373d53e08a Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Fri, 7 Feb 2020 11:24:49 +0100 Subject: [PATCH] i18n java GitOrigin-RevId: cc44e659c8162d1332a7e04d30bbe96a02e0b85e --- .../deprecationInspectionQuickFixes.kt | 4 +-- .../AbstractToStringInspection.java | 3 ++- .../ClassHasNoToStringMethodInspection.java | 24 +++++++++++------ .../FieldNotUsedInToStringInspection.java | 7 +++-- .../codeInsight/AnnotationsPanel.java | 7 ++--- .../codeInsight/NullableNotNullDialog.java | 2 +- .../messages/InspectionsBundle.properties | 27 ++++++++++++++++++- .../InspectionGadgetsBundle.properties | 2 ++ ...piciousIntegerDivAssignmentInspection.java | 3 ++- .../DefaultNotLastCaseInSwitchInspection.java | 3 ++- .../InfiniteLoopStatementInspection.java | 3 ++- .../ig/inheritance/StaticInheritanceFix.java | 4 ++- .../SuspiciousGetterSetterInspection.java | 3 ++- .../siyeh/ig/junit/JUnitRuleInspection.java | 5 ++-- .../siyeh/ig/numeric/UnaryPlusInspection.java | 3 ++- .../CStyleArrayDeclarationInspection.java | 3 ++- ...tantOnWrongSideOfComparisonInspection.java | 3 ++- ...edundantFieldInitializationInspection.java | 3 ++- .../UnnecessarySuperQualifierInspection.java | 3 ++- .../IntentionPowerPackBundle.properties | 4 +++ .../DataPointHolderConversionIntention.java | 3 ++- .../modifiers/ChangeModifierIntention.java | 2 +- .../CreateMissingSwitchBranchesAction.java | 3 ++- .../ipp/types/MakeMethodDefaultIntention.java | 3 ++- 24 files changed, 93 insertions(+), 34 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/deprecation/deprecationInspectionQuickFixes.kt b/java/java-analysis-impl/src/com/intellij/codeInspection/deprecation/deprecationInspectionQuickFixes.kt index 743983ad4767..c45efebc3c8e 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/deprecation/deprecationInspectionQuickFixes.kt +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/deprecation/deprecationInspectionQuickFixes.kt @@ -47,7 +47,7 @@ internal class ReplaceMethodCallFix(expr: PsiMethodCallExpression, replacementMe PsiFormatUtil.formatMethod(replacementMethod, PsiSubstitutor.EMPTY, PsiFormatUtilBase.SHOW_CONTAINING_CLASS or PsiFormatUtilBase.SHOW_NAME, 0) override fun getText(): String { - return "Replace method call with $myReplacementText" + return InspectionGadgetsBundle.message("replace.method.call.fix.text", myReplacementText) } @Nls @@ -79,7 +79,7 @@ internal class ReplaceFieldReferenceFix(expr: PsiReferenceExpression, replacemen } override fun getText(): String { - return "Replace field reference with $myReplacementText" + return InspectionGadgetsBundle.message("replace.field.reference.fix.text", myReplacementText) } override fun invoke(project: Project, file: PsiFile, startElement: PsiElement, endElement: PsiElement) { diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/AbstractToStringInspection.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/AbstractToStringInspection.java index 313a9655c151..2f113aa32850 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/AbstractToStringInspection.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/AbstractToStringInspection.java @@ -15,6 +15,7 @@ */ package org.jetbrains.java.generate.inspection; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemsHolder; @@ -30,7 +31,7 @@ public abstract class AbstractToStringInspection extends LocalInspectionTool { @Override @NotNull public String getGroupDisplayName() { - return "toString() issues"; + return InspectionsBundle.message("group.names.toString.issues" ); } protected static LocalQuickFix[] createFixes(@NotNull ProblemsHolder holder) { diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java index 3a77fc34d74b..535c2b792056 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java @@ -16,6 +16,7 @@ package org.jetbrains.java.generate.inspection; import com.intellij.codeInsight.TestFrameworks; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.codeInspection.ui.RegExFormatter; @@ -151,7 +152,8 @@ public class ClassHasNoToStringMethodInspection extends AbstractToStringInspecti return; } } - holder.registerProblem(nameIdentifier, "Class '" + clazz.getName() + "' does not override 'toString()' method", + holder.registerProblem(nameIdentifier, + InspectionsBundle.message("inspection.class.has.no.to.string.method.description", clazz.getName()), ProblemHighlightType.GENERIC_ERROR_OR_WARNING, createFixes(holder)); } }; @@ -172,7 +174,7 @@ public class ClassHasNoToStringMethodInspection extends AbstractToStringInspecti constraints.weightx = 0.0; constraints.anchor = GridBagConstraints.WEST; constraints.fill = GridBagConstraints.NONE; - panel.add(new JLabel("Exclude classes (reg exp):"), constraints); + panel.add(new JLabel(InspectionsBundle.message("inspection.class.has.no.to.string.method.exclude.classes.reg.exp.option")), constraints); final JFormattedTextField excludeClassNamesField = new JFormattedTextField(new RegExFormatter()); excludeClassNamesField.setValue(excludeClassNamesPattern); @@ -200,30 +202,36 @@ public class ClassHasNoToStringMethodInspection extends AbstractToStringInspecti constraints.fill = GridBagConstraints.NONE; panel.add(excludeClassNamesField, constraints); - final CheckBox excludeExceptionCheckBox = new CheckBox("Ignore exception classes", this, "excludeException"); + final CheckBox excludeExceptionCheckBox = new CheckBox( + InspectionsBundle.message("inspection.class.has.no.to.string.method.ignore.exception.classes.option"), this, "excludeException"); constraints.gridx = 0; constraints.gridy = 1; constraints.gridwidth = 2; constraints.fill = GridBagConstraints.HORIZONTAL; panel.add(excludeExceptionCheckBox, constraints); - final CheckBox excludeDeprecatedCheckBox = new CheckBox("Ignore deprecated classes", this, "excludeDeprecated"); + final CheckBox excludeDeprecatedCheckBox = new CheckBox( + InspectionsBundle.message("inspection.class.has.no.to.string.method.ignore.deprecated.classes.option"), this, "excludeDeprecated"); constraints.gridy = 2; panel.add(excludeDeprecatedCheckBox, constraints); - final CheckBox excludeEnumCheckBox = new CheckBox("Ignore enum classes", this, "excludeEnum"); + final CheckBox excludeEnumCheckBox = new CheckBox( + InspectionsBundle.message("inspection.class.has.no.to.string.method.ignore.enum.classes.option"), this, "excludeEnum"); constraints.gridy = 3; panel.add(excludeEnumCheckBox, constraints); - final CheckBox excludeAbstractCheckBox = new CheckBox("Ignore abstract classes", this, "excludeAbstract"); + final CheckBox excludeAbstractCheckBox = new CheckBox( + InspectionsBundle.message("inspection.class.has.no.to.string.method.ignore.abstract.classes.option"), this, "excludeAbstract"); constraints.gridy = 4; panel.add(excludeAbstractCheckBox, constraints); - final CheckBox excludeInTestCodeCheckBox = new CheckBox("Ignore test classes", this, "excludeTestCode"); + final CheckBox excludeInTestCodeCheckBox = new CheckBox( + InspectionsBundle.message("inspection.class.has.no.to.string.method.ignore.test.classes.option"), this, "excludeTestCode"); constraints.gridy = 5; panel.add(excludeInTestCodeCheckBox, constraints); - final CheckBox excludeInnerClasses = new CheckBox("Ignore inner classes", this, "excludeInnerClasses"); + final CheckBox excludeInnerClasses = new CheckBox( + InspectionsBundle.message("inspection.class.has.no.to.string.method.ignore.inner.classes.option"), this, "excludeInnerClasses"); constraints.gridy = 6; constraints.weighty = 1.0; panel.add(excludeInnerClasses, constraints); diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java index d1f26ffec443..daba31a5a20b 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java @@ -15,6 +15,7 @@ */ package org.jetbrains.java.generate.inspection; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.psi.*; @@ -93,13 +94,15 @@ public class FieldNotUsedInToStringInspection extends AbstractToStringInspection method.accept(visitor); for (PsiField field : visitor.getUnusedFields()) { final String fieldName = field.getName(); - myHolder.registerProblem(field.getNameIdentifier(), "Field '" + fieldName + "' is not used in 'toString()' method", + myHolder.registerProblem(field.getNameIdentifier(), + InspectionsBundle.message("inspection.field.not.used.in.to.string.description2", fieldName), ProblemHighlightType.GENERIC_ERROR_OR_WARNING, createFixes(myHolder)); } for (PsiMethod unusedMethod : visitor.getUnusedMethods()) { final PsiIdentifier identifier = unusedMethod.getNameIdentifier(); final PsiElement target = identifier == null ? unusedMethod : identifier; - myHolder.registerProblem(target, "Method '" + unusedMethod.getName() + "' is not used in 'toString()' method", + myHolder.registerProblem(target, + InspectionsBundle.message("inspection.field.not.used.in.to.string.description", unusedMethod.getName()), ProblemHighlightType.GENERIC_ERROR_OR_WARNING, createFixes(myHolder)); } } diff --git a/java/openapi/src/com/intellij/codeInsight/AnnotationsPanel.java b/java/openapi/src/com/intellij/codeInsight/AnnotationsPanel.java index a73c130dd285..be5388bb2236 100644 --- a/java/openapi/src/com/intellij/codeInsight/AnnotationsPanel.java +++ b/java/openapi/src/com/intellij/codeInsight/AnnotationsPanel.java @@ -1,6 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.codeInsight; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.icons.AllIcons; import com.intellij.ide.util.ClassFilter; import com.intellij.ide.util.TreeClassChooser; @@ -84,7 +85,7 @@ public class AnnotationsPanel { myTable = new JBTable(myTableModel, columnModel); if (showInstrumentationOptions) { - columnModel.getColumn(0).setHeaderValue("Annotation"); + columnModel.getColumn(0).setHeaderValue(CodeInsightBundle.message("node.annotation.tooltip")); TableColumn checkColumn = new TableColumn(1, 100, new BooleanTableCellRenderer(), new BooleanTableCellEditor()); columnModel.addColumn(checkColumn); @@ -103,7 +104,7 @@ public class AnnotationsPanel { Component component = defaultRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); if (component instanceof JComponent) { ((JComponent)component) - .setToolTipText(column == 1 ? "Add runtime assertions for notnull-annotated methods and parameters" : null); + .setToolTipText(column == 1 ? InspectionsBundle.message("nullable.notnull.annotations.runtime.instrumentation.tooltip") : null); } return component; } @@ -151,7 +152,7 @@ public class AnnotationsPanel { } final JPanel panel = toolbarDecorator.createPanel(); myComponent = new JPanel(new BorderLayout()); - myComponent.setBorder(IdeBorderFactory.createTitledBorder(name + " annotations", false, JBUI.insetsTop(10))); + myComponent.setBorder(IdeBorderFactory.createTitledBorder(InspectionsBundle.message("nullable.notnull.annotations.panel.title", name), false, JBUI.insetsTop(10))); myComponent.add(panel); myComponent.setPreferredSize(new JBDimension(myComponent.getPreferredSize().width, 200)); diff --git a/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java b/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java index d8a61b62d392..546a51e4b566 100644 --- a/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java +++ b/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java @@ -46,7 +46,7 @@ public class NullableNotNullDialog extends DialogWrapper { new HashSet<>(manager.getInstrumentedNotNulls()), showInstrumentationOptions, true); init(); - setTitle("Nullable/NotNull Configuration"); + setTitle(InspectionsBundle.message("nullable.notnull.configuration.dialog.title")); } public static JButton createConfigureAnnotationsButton(Component context) { diff --git a/platform/analysis-api/resources/messages/InspectionsBundle.properties b/platform/analysis-api/resources/messages/InspectionsBundle.properties index cccd99103703..a2d86c0384b1 100644 --- a/platform/analysis-api/resources/messages/InspectionsBundle.properties +++ b/platform/analysis-api/resources/messages/InspectionsBundle.properties @@ -1286,4 +1286,29 @@ entry.points.label=Entry points: unused.declaration.unused.option=unused unused.declaration.used.option=used unused.declaration.reachable.from.tests.option=When entry points are in test sources, mark callees as: -inspection.suspicious.names.ignore.methods.title=Ignore methods \ No newline at end of file +inspection.suspicious.names.ignore.methods.title=Ignore methods +nullable.notnull.configuration.dialog.title=Nullable/NotNull Configuration +nullable.notnull.annotations.panel.title={0} annotations +nullable.notnull.annotations.runtime.instrumentation.tooltip=Add runtime assertions for notnull-annotated methods and parameters +inspection.field.not.used.in.to.string.description=Method ''{0}'' is not used in ''toString()'' method +inspection.field.not.used.in.to.string.description2=Field ''{0}'' is not used in ''toString()'' method +inspection.class.has.no.to.string.method.description=Class ''{0}'' does not override ''toString()'' method +inspection.class.has.no.to.string.method.ignore.inner.classes.option=Ignore inner classes +inspection.class.has.no.to.string.method.ignore.test.classes.option=Ignore test classes +inspection.class.has.no.to.string.method.ignore.abstract.classes.option=Ignore abstract classes +inspection.class.has.no.to.string.method.ignore.enum.classes.option=Ignore enum classes +inspection.class.has.no.to.string.method.ignore.deprecated.classes.option=Ignore deprecated classes +inspection.class.has.no.to.string.method.ignore.exception.classes.option=Ignore exception classes +inspection.class.has.no.to.string.method.exclude.classes.reg.exp.option=Exclude classes (reg exp): +make.default.the.last.case.family.name=Make 'default' the last case +inspection.suspicious.integer.div.assignment.option=Report suspicious but possibly exact divisions +junit.rule.classrule.option=Report @ClassRule problems +junit.rule.rule.option=Report @Rule problems +inspection.constant.on.wrong.side.of.a.comparison.side.option=Constant should be on this side of a comparison: +static.inheritrance.fix.replace.progress=Replacing usages of {0} +inspection.suspicious.getter.setter.field.option=Only warn when field matching getter/setter name is present +inspection.c.style.array.declarations.option=Ignore C-style declarations in variables +inspection.unary.plus.unary.binary.option=Only report in confusing binary or unary expression context +inspection.infinite.loop.option=Ignore when placed in Thread.run +inspection.redundant.field.initialization.option=Only warn on initialization to null +inspection.unnecessary.super.qualifier.option=Ignore clarification 'super' qualifier \ No newline at end of file diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/resources/messages/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/resources/messages/InspectionGadgetsBundle.properties index c3815657b58d..f65461f0e96c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/resources/messages/InspectionGadgetsBundle.properties +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/resources/messages/InspectionGadgetsBundle.properties @@ -2315,7 +2315,9 @@ junit5.malformed.parameterized.fix.family.name=Replace annotation array.hash.code.fix.family.name=Replace with implicit 'hashCode' unqualified.static.access.fix.family.name=Qualify static access replace.field.reference.fix.family.name=Replace Field Reference +replace.field.reference.fix.text=Replace field reference with {0} replace.method.call.fix.family.name=Replace Method Call +replace.method.call.fix.text=Replace method call with {0} delete.unnecessary.statement.fix.family.name=Remove redundant statement increment.decrement.used.as.expression.fix.family.name=Extract to separate statement use.of.properties.as.hashtable.fix.family.name=Fix property access diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousIntegerDivAssignmentInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousIntegerDivAssignmentInspection.java index beaf3ea664e2..cfbe0db7715c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousIntegerDivAssignmentInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/SuspiciousIntegerDivAssignmentInspection.java @@ -1,6 +1,7 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.siyeh.ig.bugs; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.dataFlow.CommonDataflow; import com.intellij.codeInspection.dataFlow.rangeSet.LongRangeSet; @@ -39,7 +40,7 @@ public class SuspiciousIntegerDivAssignmentInspection extends BaseInspection { @Override public JComponent createOptionsPanel() { MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this); - panel.addCheckbox("Report suspicious but possibly exact divisions", "myReportPossiblyExactDivision"); + panel.addCheckbox(InspectionsBundle.message("inspection.suspicious.integer.div.assignment.option"), "myReportPossiblyExactDivision"); return panel; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java index f4926a1bb6f8..05a260139e51 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java @@ -15,6 +15,7 @@ */ package com.siyeh.ig.controlflow; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; @@ -75,7 +76,7 @@ public class DefaultNotLastCaseInSwitchInspection extends BaseInspection { @NotNull @Override public String getFamilyName() { - return "Make 'default' the last case"; + return InspectionsBundle.message("make.default.the.last.case.family.name"); } }; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/InfiniteLoopStatementInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/InfiniteLoopStatementInspection.java index 88425b0af47d..46d9cdbd40a3 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/InfiniteLoopStatementInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/InfiniteLoopStatementInspection.java @@ -15,6 +15,7 @@ */ package com.siyeh.ig.controlflow; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.lang.jvm.JvmModifier; import com.intellij.psi.*; @@ -38,7 +39,7 @@ public class InfiniteLoopStatementInspection extends BaseInspection { @Nullable @Override public JComponent createOptionsPanel() { - return new SingleCheckboxOptionsPanel("Ignore when placed in Thread.run", this, "myIgnoreInThreadTopLevel"); + return new SingleCheckboxOptionsPanel(InspectionsBundle.message("inspection.infinite.loop.option"), this, "myIgnoreInThreadTopLevel"); } @Override diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java index d310474a7cbc..0b54140052fd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java @@ -17,6 +17,7 @@ package com.siyeh.ig.inheritance; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.QuickFixFactory; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.command.WriteCommandAction; @@ -73,7 +74,8 @@ class StaticInheritanceFix extends InspectionGadgetsFix { assert implementingClass != null; final PsiFile file = implementingClass.getContainingFile(); - ProgressManager.getInstance().run(new Task.Modal(project, "Replacing usages of " + iface.getName(), false) { + ProgressManager.getInstance().run(new Task.Modal(project, + InspectionsBundle.message("static.inheritrance.fix.replace.progress", iface.getName()), false) { @Override public void run(@NotNull ProgressIndicator indicator) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/SuspiciousGetterSetterInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/SuspiciousGetterSetterInspection.java index 16a91bd35410..61e0421f4c5c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/SuspiciousGetterSetterInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/SuspiciousGetterSetterInspection.java @@ -15,6 +15,7 @@ */ package com.siyeh.ig.javabeans; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiField; @@ -49,7 +50,7 @@ public class SuspiciousGetterSetterInspection extends BaseInspection { @Nullable @Override public JComponent createOptionsPanel() { - return new SingleCheckboxOptionsPanel("Only warn when field matching getter/setter name is present", this, "onlyWarnWhenFieldPresent"); + return new SingleCheckboxOptionsPanel(InspectionsBundle.message("inspection.suspicious.getter.setter.field.option"), this, "onlyWarnWhenFieldPresent"); } @Override diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitRuleInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitRuleInspection.java index a19136aa8f0c..7f6f898036b6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitRuleInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnitRuleInspection.java @@ -2,6 +2,7 @@ package com.siyeh.ig.junit; import com.intellij.codeInsight.AnnotationUtil; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiField; @@ -28,8 +29,8 @@ public class JUnitRuleInspection extends BaseInspection { @Override public JComponent createOptionsPanel() { final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this); - panel.addCheckbox("Report @Rule problems", "REPORT_RULE_PROBLEMS"); - panel.addCheckbox("Report @ClassRule problems", "REPORT_CLASS_RULE_PROBLEMS"); + panel.addCheckbox(InspectionsBundle.message("junit.rule.rule.option"), "REPORT_RULE_PROBLEMS"); + panel.addCheckbox(InspectionsBundle.message("junit.rule.classrule.option"), "REPORT_CLASS_RULE_PROBLEMS"); return panel; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnaryPlusInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnaryPlusInspection.java index 8884047e91b7..6ee227ff4f20 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnaryPlusInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/numeric/UnaryPlusInspection.java @@ -15,6 +15,7 @@ */ package com.siyeh.ig.numeric; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; @@ -50,7 +51,7 @@ public class UnaryPlusInspection extends BaseInspection { @Nullable @Override public JComponent createOptionsPanel() { - return new SingleCheckboxOptionsPanel("Only report in confusing binary or unary expression context", this, + return new SingleCheckboxOptionsPanel(InspectionsBundle.message("inspection.unary.plus.unary.binary.option"), this, "onlyReportInsideBinaryExpression"); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CStyleArrayDeclarationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CStyleArrayDeclarationInspection.java index cd042b8e0c01..ee2c12e5ef70 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CStyleArrayDeclarationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CStyleArrayDeclarationInspection.java @@ -16,6 +16,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; import com.intellij.psi.*; @@ -52,7 +53,7 @@ public class CStyleArrayDeclarationInspection extends BaseInspection implements @Nullable @Override public JComponent createOptionsPanel() { - return new SingleCheckboxOptionsPanel("Ignore C-style declarations in variables", this, "ignoreVariables"); + return new SingleCheckboxOptionsPanel(InspectionsBundle.message("inspection.c.style.array.declarations.option"), this, "ignoreVariables"); } @Override diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantOnWrongSideOfComparisonInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantOnWrongSideOfComparisonInspection.java index e789c0f31010..cdb2f07b0063 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantOnWrongSideOfComparisonInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/ConstantOnWrongSideOfComparisonInspection.java @@ -1,6 +1,7 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.siyeh.ig.style; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.ComboBox; @@ -48,7 +49,7 @@ public class ConstantOnWrongSideOfComparisonInspection extends BaseInspection { myConstantShouldGoLeft = (e.getItem() == left); } }); - final JLabel label = new JLabel("Constant should be on this side of a comparison:"); + final JLabel label = new JLabel(InspectionsBundle.message("inspection.constant.on.wrong.side.of.a.comparison.side.option")); final JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEADING)); panel.add(label); panel.add(comboBox); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantFieldInitializationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantFieldInitializationInspection.java index 83ec6407381b..d3808f6b7c59 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantFieldInitializationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/RedundantFieldInitializationInspection.java @@ -16,6 +16,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; @@ -48,7 +49,7 @@ public class RedundantFieldInitializationInspection extends BaseInspection imple @Nullable @Override public JComponent createOptionsPanel() { - return new SingleCheckboxOptionsPanel("Only warn on initialization to null", this, "onlyWarnOnNull"); + return new SingleCheckboxOptionsPanel(InspectionsBundle.message("inspection.redundant.field.initialization.option"), this, "onlyWarnOnNull"); } @Override diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java index 4a95a9ba18b2..7203614a5df6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java @@ -16,6 +16,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.CleanupLocalInspectionTool; +import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; @@ -47,7 +48,7 @@ public class UnnecessarySuperQualifierInspection extends BaseInspection implemen @Nullable @Override public JComponent createOptionsPanel() { - return new SingleCheckboxOptionsPanel("Ignore clarification 'super' qualifier", this, "ignoreClarification"); + return new SingleCheckboxOptionsPanel(InspectionsBundle.message("inspection.unnecessary.super.qualifier.option"), this, "ignoreClarification"); } @Override diff --git a/plugins/IntentionPowerPak/resources/messages/IntentionPowerPackBundle.properties b/plugins/IntentionPowerPak/resources/messages/IntentionPowerPackBundle.properties index 5ccef8263202..25b64acac86c 100644 --- a/plugins/IntentionPowerPak/resources/messages/IntentionPowerPackBundle.properties +++ b/plugins/IntentionPowerPak/resources/messages/IntentionPowerPackBundle.properties @@ -184,3 +184,7 @@ intention.category.other=Java/Other 0.will.no.longer.be.visible.from.overriding.1={0} will no longer be visible from overriding {1} 0.will.have.incompatible.access.privileges.with.overriding.1={0} will have incompatible access privileges with overriding {1} 0.already.extends.1.and.will.not.compile.after.converting.2.to.a.class={0} implementing {2} already extends {1} and will not compile after converting {2} to a class +change.modifier.text=Make ''{0}'' {1} +convert.datapoints.fix.family.name=Convert @DataPoint(s) annotation holder +make.method.\u0432default.family.name=Make method default +create.missing.switch.branches.family.name=Create missing switch branches diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java index 8b98f5a7fb33..df042ad911b0 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java @@ -15,6 +15,7 @@ import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.util.PsiTreeUtil; +import com.siyeh.IntentionPowerPackBundle; import org.jetbrains.annotations.NotNull; /** @@ -139,6 +140,6 @@ public class DataPointHolderConversionIntention extends PsiElementBaseIntentionA @NotNull @Override public String getFamilyName() { - return "Convert @DataPoint(s) annotation holder"; + return IntentionPowerPackBundle.message("convert.datapoints.fix.family.name"); } } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/modifiers/ChangeModifierIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/modifiers/ChangeModifierIntention.java index 2ec4e0bb60cc..45e8299847c9 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/modifiers/ChangeModifierIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/modifiers/ChangeModifierIntention.java @@ -100,7 +100,7 @@ public class ChangeModifierIntention extends BaseElementAtCaretIntentionAction { if (modifiers.isEmpty()) return false; if (modifiers.size() == 1) { target = modifiers.get(0); - setText("Make '" + identifier.getText() + "' " + target); + setText(IntentionPowerPackBundle.message("change.modifier.text", identifier.getText(), target)); } else { setText(getFamilyName()); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchbranches/CreateMissingSwitchBranchesAction.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchbranches/CreateMissingSwitchBranchesAction.java index 41cb042cd7f9..3664d98a0a98 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchbranches/CreateMissingSwitchBranchesAction.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchbranches/CreateMissingSwitchBranchesAction.java @@ -17,6 +17,7 @@ import com.intellij.psi.util.TypeConversionUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; +import com.siyeh.IntentionPowerPackBundle; import com.siyeh.ig.psiutils.CreateSwitchBranchesUtil; import com.siyeh.ig.psiutils.ExpressionUtils; import com.siyeh.ig.psiutils.TypeUtils; @@ -134,7 +135,7 @@ public class CreateMissingSwitchBranchesAction extends PsiElementBaseIntentionAc @NotNull @Override public String getFamilyName() { - return "Create missing switch branches"; + return IntentionPowerPackBundle.message("create.missing.switch.branches.family.name"); } @NotNull diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/MakeMethodDefaultIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/MakeMethodDefaultIntention.java index 7264e9922e41..15992a2881d5 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/MakeMethodDefaultIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/MakeMethodDefaultIntention.java @@ -8,6 +8,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; +import com.siyeh.IntentionPowerPackBundle; import org.jetbrains.annotations.NotNull; public class MakeMethodDefaultIntention extends BaseElementAtCaretIntentionAction { @@ -23,7 +24,7 @@ public class MakeMethodDefaultIntention extends BaseElementAtCaretIntentionActio @NotNull @Override public String getFamilyName() { - return "Make method default"; + return IntentionPowerPackBundle.message("make.method.вdefault.family.name"); } @Override