From 9bfb9cef5d2b9b27ed5e2d324da5defdf3ee4c4e Mon Sep 17 00:00:00 2001 From: UNV Date: Sun, 21 Jul 2024 22:40:31 +0300 Subject: [PATCH] =?UTF-8?q?InspectionGadgetsBundle=20=E2=86=92=20Inspectio?= =?UTF-8?q?nGadgetsLocalize=20(part=208).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fixes/DeleteUnnecessaryStatementFix.java | 8 ++--- ...analysis.impl.JavaInspectionsLocalize.yaml | 2 +- ...eclareCollectionAsInterfaceInspection.java | 22 +++++++----- ...ticMethodOnlyUsedInOneClassInspection.java | 33 +++++++++++++----- ...aticVariableOfConcreteClassInspection.java | 22 +++++------- .../ig/bugs/CovariantEqualsInspection.java | 8 ++--- .../bugs/MalformedFormatStringInspection.java | 8 ++--- .../ig/bugs/MalformedRegexInspection.java | 14 +++----- .../ig/bugs/MalformedXPathInspection.java | 8 ++--- .../bugs/MathRandomCastToIntInspection.java | 21 ++++++------ ...ngConcatenationInFormatCallInspection.java | 21 ++++++------ .../MarkerInterfaceInspection.java | 10 +++--- .../StaticNonFinalFieldInspection.java | 13 +++---- ...essionWithIdenticalBranchesInspection.java | 5 +-- .../DefaultNotLastCaseInSwitchInspection.java | 11 +++--- ...ooleanVariableAlwaysNegatedInspection.java | 11 ++---- .../CyclicClassDependencyInspection.java | 23 ++++++------- .../CyclicClassInitializationInspection.java | 17 +++++----- .../CyclicPackageDependencyInspection.java | 21 ++++++------ .../java/impl/ig/fixes/DeleteImportFix.java | 8 ++--- .../java/impl/ig/fixes/MakeFieldFinalFix.java | 19 +++++------ .../ig/fixes/MakeFieldStaticFinalFix.java | 4 +-- .../ig/fixes/MakeInitializerExplicitFix.java | 4 +-- .../imports/StaticImportInspectionBase.java | 10 +++--- .../ig/inheritance/StaticInheritanceFix.java | 9 +++-- .../StaticInheritanceInspection.java | 9 ++--- ...taticVariableInitializationInspection.java | 22 ++++++------ ...ticVariableUninitializedUseInspection.java | 21 +++++------- .../DateToStringInspection.java | 15 ++++---- .../MethodCallInLoopConditionInspection.java | 17 +++++----- .../impl/ig/junit/StaticSuiteInspection.java | 7 ++-- ...catenationArgumentToLogCallInspection.java | 24 ++++++------- .../memory/StringBufferFieldInspection.java | 7 ++-- .../CyclomaticComplexityInspection.java | 11 +++--- ...hodCanBeVariableArityMethodInspection.java | 23 ++++++++----- ...rReplaceableByStringBuilderInspection.java | 12 +++---- ...taticMethodNamingConventionInspection.java | 9 +++-- ...ticVariableNamingConventionInspection.java | 16 ++++----- .../ConvertOctalLiteralToDecimalFix.java | 16 ++++----- .../ManualArrayCopyInspection.java | 13 +++---- ...ManualArrayToCollectionCopyInspection.java | 10 +++--- .../MapReplaceableByEnumMapInspection.java | 5 +-- ...fferMustHaveInitialCapacityInspection.java | 9 ++--- ...fferToStringInConcatenationInspection.java | 24 ++++++------- .../StringConcatenationInLoopsInspection.java | 23 +++++++------ .../security/CustomClassloaderInspection.java | 15 +++----- .../CustomSecurityManagerInspection.java | 8 ++--- ...lizableClassInSecureContextInspection.java | 17 +++++----- .../CStyleArrayDeclarationInspection.java | 17 +++++----- ...ngBufferReplaceableByStringInspection.java | 34 ++++++++----------- 50 files changed, 334 insertions(+), 382 deletions(-) diff --git a/java-analysis-impl/src/main/java/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java b/java-analysis-impl/src/main/java/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java index e08f0b571..3f7c0a21d 100644 --- a/java-analysis-impl/src/main/java/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java +++ b/java-analysis-impl/src/main/java/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java @@ -16,16 +16,15 @@ package com.siyeh.ig.fixes; import com.intellij.java.language.psi.*; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.CommentTracker; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.psi.util.PsiTreeUtil; import consulo.project.Project; -import org.jetbrains.annotations.NonNls; - import jakarta.annotation.Nonnull; +import org.jetbrains.annotations.NonNls; public class DeleteUnnecessaryStatementFix extends InspectionGadgetsFix { @@ -38,8 +37,7 @@ public DeleteUnnecessaryStatementFix(@NonNls String name) { @Override @Nonnull public String getName() { - return InspectionGadgetsBundle.message( - "smth.unnecessary.remove.quickfix", name); + return InspectionGadgetsLocalize.smthUnnecessaryRemoveQuickfix(name).get(); } @Nonnull diff --git a/java-analysis-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.analysis.impl.JavaInspectionsLocalize.yaml b/java-analysis-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.analysis.impl.JavaInspectionsLocalize.yaml index df4db7469..4b0426cc5 100644 --- a/java-analysis-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.analysis.impl.JavaInspectionsLocalize.yaml +++ b/java-analysis-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.analysis.impl.JavaInspectionsLocalize.yaml @@ -47,7 +47,7 @@ inspection.can.be.final.option1: inspection.can.be.final.option2: text: Report fields inspection.data.flow.display.name: - text: Constant conditions \& exceptions + text: Constant conditions & exceptions inspection.contract.display.name: text: Contract issues inspection.data.flow.nullable.quickfix.option: diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/DeclareCollectionAsInterfaceInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/DeclareCollectionAsInterfaceInspection.java index 153909fe0..64c9f0334 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/DeclareCollectionAsInterfaceInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/DeclareCollectionAsInterfaceInspection.java @@ -19,21 +19,21 @@ import com.intellij.java.impl.ig.psiutils.WeakestTypeFinder; import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.CollectionUtils; import com.siyeh.ig.psiutils.DeclarationSearchUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.inspection.ProblemDescriptor; import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel; +import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; + import javax.swing.*; import java.util.ArrayList; import java.util.Collection; @@ -63,7 +63,7 @@ public String getID() @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("collection.declared.by.class.display.name"); + return InspectionGadgetsLocalize.collectionDeclaredByClassDisplayName().get(); } @Override @@ -71,7 +71,7 @@ public String getDisplayName() public String buildErrorString(Object... infos) { final String type = (String) infos[0]; - return InspectionGadgetsBundle.message("collection.declared.by.class.problem.descriptor", type); + return InspectionGadgetsLocalize.collectionDeclaredByClassProblemDescriptor(type).get(); } @Override @@ -79,8 +79,14 @@ public String buildErrorString(Object... infos) public JComponent createOptionsPanel() { final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this); - optionsPanel.addCheckbox(InspectionGadgetsBundle.message("collection.declared.by.class.ignore.locals.option"), "ignoreLocalVariables"); - optionsPanel.addCheckbox(InspectionGadgetsBundle.message("collection.declared.by.class.ignore.private.members.option"), "ignorePrivateMethodsAndFields"); + optionsPanel.addCheckbox( + InspectionGadgetsLocalize.collectionDeclaredByClassIgnoreLocalsOption().get(), + "ignoreLocalVariables" + ); + optionsPanel.addCheckbox( + InspectionGadgetsLocalize.collectionDeclaredByClassIgnorePrivateMembersOption().get(), + "ignorePrivateMethodsAndFields" + ); return optionsPanel; } @@ -104,7 +110,7 @@ private static class DeclareCollectionAsInterfaceFix extends InspectionGadgetsFi @Nonnull public String getName() { - return InspectionGadgetsBundle.message("declare.collection.as.interface.quickfix", typeString); + return InspectionGadgetsLocalize.declareCollectionAsInterfaceQuickfix(typeString).get(); } @Nonnull diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/StaticMethodOnlyUsedInOneClassInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/StaticMethodOnlyUsedInOneClassInspection.java index b987f55ff..924392d3e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/StaticMethodOnlyUsedInOneClassInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/StaticMethodOnlyUsedInOneClassInspection.java @@ -32,6 +32,7 @@ import com.siyeh.ig.psiutils.ClassUtils; import com.siyeh.ig.psiutils.DeclarationSearchUtils; import com.siyeh.ig.psiutils.TestUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.application.progress.ProgressManager; import consulo.application.util.function.Processor; @@ -51,9 +52,9 @@ import consulo.language.psi.util.PsiTreeUtil; import consulo.util.dataholder.Key; import consulo.util.lang.ref.Ref; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; + import javax.swing.*; import java.util.concurrent.atomic.AtomicReference; @@ -76,7 +77,7 @@ public class StaticMethodOnlyUsedInOneClassInspection extends BaseGlobalInspecti @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("static.method.only.used.in.one.class.display.name"); + return InspectionGadgetsLocalize.staticMethodOnlyUsedInOneClassDisplayName().get(); } @Nonnull @@ -91,9 +92,18 @@ public HighlightDisplayLevel getDefaultLevel() public JComponent createOptionsPanel() { final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this); - panel.addCheckbox(InspectionGadgetsBundle.message("static.method.only.used.in.one.class.ignore.test.option"), "ignoreTestClasses"); - panel.addCheckbox(InspectionGadgetsBundle.message("static.method.only.used.in.one.class.ignore.anonymous.option"), "ignoreAnonymousClasses"); - panel.addCheckbox(InspectionGadgetsBundle.message("static.method.only.used.in.one.class.ignore.on.conflicts"), "ignoreOnConflicts"); + panel.addCheckbox( + InspectionGadgetsLocalize.staticMethodOnlyUsedInOneClassIgnoreTestOption().get(), + "ignoreTestClasses" + ); + panel.addCheckbox( + InspectionGadgetsLocalize.staticMethodOnlyUsedInOneClassIgnoreAnonymousOption().get(), + "ignoreAnonymousClasses" + ); + panel.addCheckbox( + InspectionGadgetsLocalize.staticMethodOnlyUsedInOneClassIgnoreOnConflicts().get(), + "ignoreOnConflicts" + ); return panel; } @@ -175,8 +185,12 @@ else if(usageClass != ownerClass) @Nonnull static ProblemDescriptor createProblemDescriptor(@Nonnull InspectionManager manager, PsiElement problemElement, PsiClass usageClass) { - final String message = (usageClass instanceof PsiAnonymousClass) ? InspectionGadgetsBundle.message("static.method.only.used.in.one.anonymous.class.problem.descriptor", ((PsiAnonymousClass) - usageClass).getBaseClassReference().getText()) : InspectionGadgetsBundle.message("static.method.only.used.in.one.class.problem.descriptor", usageClass.getName()); + final String message = (usageClass instanceof PsiAnonymousClass) + ? InspectionGadgetsBundle.message( + "static.method.only.used.in.one.anonymous.class.problem.descriptor", + ((PsiAnonymousClass)usageClass).getBaseClassReference().getText() + ) + : InspectionGadgetsLocalize.staticMethodOnlyUsedInOneClassProblemDescriptor(usageClass.getName()).get(); return manager.createProblemDescriptor(problemElement, message, false, null, ProblemHighlightType.GENERIC_ERROR_OR_WARNING); } @@ -368,7 +382,8 @@ protected String buildErrorString(Object... infos) { final PsiClass usageClass = (PsiClass) infos[0]; return (usageClass instanceof PsiAnonymousClass) ? InspectionGadgetsBundle.message("static.method.only.used.in.one.anonymous.class.problem.descriptor", ((PsiAnonymousClass) usageClass) - .getBaseClassReference().getText()) : InspectionGadgetsBundle.message("static.method.only.used.in.one.class.problem.descriptor", usageClass.getName()); + .getBaseClassReference().getText()) : InspectionGadgetsLocalize.staticMethodOnlyUsedInOneClassProblemDescriptor( + usageClass.getName()).get(); } @Override @@ -394,7 +409,7 @@ public StaticMethodOnlyUsedInOneClassFix(PsiClass usageClass) @Nonnull public String getFamilyName() { - return InspectionGadgetsBundle.message("static.method.only.used.in.one.class.quickfix"); + return InspectionGadgetsLocalize.staticMethodOnlyUsedInOneClassQuickfix().get(); } @Nonnull diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/StaticVariableOfConcreteClassInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/StaticVariableOfConcreteClassInspection.java index f5c811173..56c06c9f3 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/StaticVariableOfConcreteClassInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/abstraction/StaticVariableOfConcreteClassInspection.java @@ -15,17 +15,18 @@ */ package com.intellij.java.impl.ig.abstraction; -import consulo.annotation.component.ExtensionImpl; -import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; import com.intellij.java.language.psi.PsiField; import com.intellij.java.language.psi.PsiModifier; import com.intellij.java.language.psi.PsiTypeElement; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; +import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; -import javax.swing.JComponent; +import javax.swing.*; @ExtensionImpl public class StaticVariableOfConcreteClassInspection extends BaseInspection { @@ -36,24 +37,19 @@ public class StaticVariableOfConcreteClassInspection extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "static.variable.of.concrete.class.display.name"); + return InspectionGadgetsLocalize.staticVariableOfConcreteClassDisplayName().get(); } @Override @Nonnull public String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "static.variable.of.concrete.class.problem.descriptor", - infos[0]); + return InspectionGadgetsLocalize.staticVariableOfConcreteClassProblemDescriptor(infos[0]).get(); } @Override public JComponent createOptionsPanel() { - return new SingleCheckboxOptionsPanel( - InspectionGadgetsBundle.message( - "static.variable.of.concrete.class.option"), - this, "ignoreAbstractClasses"); + LocalizeValue message = InspectionGadgetsLocalize.staticVariableOfConcreteClassOption(); + return new SingleCheckboxOptionsPanel(message.get(), this, "ignoreAbstractClasses"); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/CovariantEqualsInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/CovariantEqualsInspection.java index 93e24f09c..d2fc25dfe 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/CovariantEqualsInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/CovariantEqualsInspection.java @@ -17,10 +17,10 @@ import com.intellij.java.language.psi.*; import com.siyeh.HardcodedMethodConstants; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.TypeUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import jakarta.annotation.Nonnull; @@ -29,14 +29,12 @@ public class CovariantEqualsInspection extends BaseInspection { @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "covariant.equals.display.name"); + return InspectionGadgetsLocalize.covariantEqualsDisplayName().get(); } @Nonnull public String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "covariant.equals.problem.descriptor"); + return InspectionGadgetsLocalize.covariantEqualsProblemDescriptor().get(); } public BaseInspectionVisitor buildVisitor() { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedFormatStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedFormatStringInspection.java index 15f57e77b..04b6bbf42 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedFormatStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedFormatStringInspection.java @@ -15,6 +15,7 @@ */ package com.intellij.java.impl.ig.bugs; +import com.intellij.java.impl.ig.psiutils.FormatUtils; import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.ConstantExpressionUtil; import com.intellij.java.language.psi.util.PsiUtil; @@ -22,9 +23,8 @@ import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.ExpressionUtils; -import com.intellij.java.impl.ig.psiutils.FormatUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; - import jakarta.annotation.Nonnull; @ExtensionImpl @@ -33,7 +33,7 @@ public class MalformedFormatStringInspection extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("malformed.format.string.display.name"); + return InspectionGadgetsLocalize.malformedFormatStringDisplayName().get(); } @Override @@ -41,7 +41,7 @@ public String getDisplayName() { public String buildErrorString(Object... infos) { final Object value = infos[0]; if (value instanceof Exception) { - return InspectionGadgetsBundle.message("malformed.format.string.problem.descriptor.malformed"); + return InspectionGadgetsLocalize.malformedFormatStringProblemDescriptorMalformed().get(); } final Validator[] validators = (Validator[])value; final int argumentCount = ((Integer)infos[1]).intValue(); diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedRegexInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedRegexInspection.java index 045500969..d5d69c415 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedRegexInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedRegexInspection.java @@ -21,13 +21,12 @@ import com.intellij.java.language.psi.PsiType; import com.intellij.java.language.psi.util.ConstantExpressionUtil; import com.intellij.java.language.psi.util.PsiUtil; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.ExpressionUtils; import com.siyeh.ig.psiutils.MethodCallUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; - import jakarta.annotation.Nonnull; import java.util.regex.Pattern; @@ -39,18 +38,15 @@ public class MalformedRegexInspection extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("malformed.regular.expression.display.name"); + return InspectionGadgetsLocalize.malformedRegularExpressionDisplayName().get(); } @Override @Nonnull public String buildErrorString(Object... infos) { - if (infos.length == 0) { - return InspectionGadgetsBundle.message("malformed.regular.expression.problem.descriptor1"); - } - else { - return InspectionGadgetsBundle.message("malformed.regular.expression.problem.descriptor2", infos[0]); - } + return infos.length == 0 + ? InspectionGadgetsLocalize.malformedRegularExpressionProblemDescriptor1().get() + : InspectionGadgetsLocalize.malformedRegularExpressionProblemDescriptor2(infos[0]).get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedXPathInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedXPathInspection.java index 5be57a79f..e6ae179d9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedXPathInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedXPathInspection.java @@ -18,13 +18,13 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.ConstantExpressionUtil; import com.intellij.java.language.psi.util.PsiUtil; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.ExpressionUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import org.jetbrains.annotations.NonNls; import jakarta.annotation.Nonnull; +import org.jetbrains.annotations.NonNls; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathExpressionException; @@ -49,13 +49,13 @@ public class MalformedXPathInspection extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("malformed.xpath.expression.display.name"); + return InspectionGadgetsLocalize.malformedXpathExpressionDisplayName().get(); } @Override @Nonnull public String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message("malformed.xpath.expression.problem.description"); + return InspectionGadgetsLocalize.malformedXpathExpressionProblemDescription().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MathRandomCastToIntInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MathRandomCastToIntInspection.java index d4e8534e8..60aa7ace1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MathRandomCastToIntInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/MathRandomCastToIntInspection.java @@ -15,19 +15,19 @@ */ package com.intellij.java.impl.ig.bugs; -import jakarta.annotation.Nonnull; - -import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.inspection.ProblemDescriptor; import com.intellij.java.language.psi.*; -import consulo.project.Project; -import consulo.language.psi.*; -import consulo.language.ast.IElementType; -import consulo.language.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.language.ast.IElementType; +import consulo.language.editor.inspection.ProblemDescriptor; +import consulo.language.psi.PsiElement; +import consulo.language.util.IncorrectOperationException; +import consulo.project.Project; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; @@ -37,7 +37,7 @@ public class MathRandomCastToIntInspection extends BaseInspection { @Nonnull @Override public String getDisplayName() { - return InspectionGadgetsBundle.message("math.random.cast.to.int.display.name"); + return InspectionGadgetsLocalize.mathRandomCastToIntDisplayName().get(); } @Nonnull @@ -69,8 +69,7 @@ protected InspectionGadgetsFix buildFix(Object... infos) { private static class MathRandomCastToIntegerFix extends InspectionGadgetsFix { @Nonnull public String getName() { - return InspectionGadgetsBundle.message( - "math.random.cast.to.int.quickfix"); + return InspectionGadgetsLocalize.mathRandomCastToIntQuickfix().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/StringConcatenationInFormatCallInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/StringConcatenationInFormatCallInspection.java index 491ca6542..735efcbab 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/bugs/StringConcatenationInFormatCallInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/bugs/StringConcatenationInFormatCallInspection.java @@ -15,18 +15,19 @@ */ package com.intellij.java.impl.ig.bugs; -import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.inspection.ProblemDescriptor; +import com.intellij.java.impl.ig.psiutils.FormatUtils; import com.intellij.java.language.psi.*; -import consulo.project.Project; -import consulo.language.psi.*; -import consulo.language.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.ExpressionUtils; -import com.intellij.java.impl.ig.psiutils.FormatUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.language.editor.inspection.ProblemDescriptor; +import consulo.language.psi.PsiElement; +import consulo.language.util.IncorrectOperationException; +import consulo.project.Project; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; @@ -37,18 +38,18 @@ public class StringConcatenationInFormatCallInspection extends BaseInspection { @Nonnull @Override public String getDisplayName() { - return InspectionGadgetsBundle.message("string.concatenation.in.format.call.display.name"); + return InspectionGadgetsLocalize.stringConcatenationInFormatCallDisplayName().get(); } @Nonnull @Override protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message("string.concatenation.in.format.call.problem.descriptor"); + return InspectionGadgetsLocalize.stringConcatenationInFormatCallProblemDescriptor().get(); } @Override protected InspectionGadgetsFix buildFix(Object... infos) { - return new StringConcatenationInFormatCallFix(((Boolean)infos[0]).booleanValue()); + return new StringConcatenationInFormatCallFix((Boolean)infos[0]); } private static class StringConcatenationInFormatCallFix extends InspectionGadgetsFix { @@ -66,7 +67,7 @@ public String getName() { return InspectionGadgetsBundle.message("string.concatenation.in.format.call.plural.quickfix"); } else { - return InspectionGadgetsBundle.message("string.concatenation.in.format.call.quickfix"); + return InspectionGadgetsLocalize.stringConcatenationInFormatCallQuickfix().get(); } } diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MarkerInterfaceInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MarkerInterfaceInspection.java index d8c6f2590..7910ee3f6 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MarkerInterfaceInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/MarkerInterfaceInspection.java @@ -15,13 +15,12 @@ */ package com.intellij.java.impl.ig.classlayout; -import jakarta.annotation.Nonnull; - import com.intellij.java.language.psi.*; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import jakarta.annotation.Nonnull; @ExtensionImpl public class MarkerInterfaceInspection extends BaseInspection { @@ -29,14 +28,13 @@ public class MarkerInterfaceInspection extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("marker.interface.display.name"); + return InspectionGadgetsLocalize.markerInterfaceDisplayName().get(); } @Override @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "marker.interface.problem.descriptor"); + return InspectionGadgetsLocalize.markerInterfaceProblemDescriptor().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/StaticNonFinalFieldInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/StaticNonFinalFieldInspection.java index 8406a64b7..ace244f2a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/StaticNonFinalFieldInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/classlayout/StaticNonFinalFieldInspection.java @@ -15,16 +15,15 @@ */ package com.intellij.java.impl.ig.classlayout; -import jakarta.annotation.Nonnull; - +import com.intellij.java.impl.ig.fixes.MakeFieldFinalFix; import com.intellij.java.language.psi.PsiField; import com.intellij.java.language.psi.PsiModifier; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.intellij.java.impl.ig.fixes.MakeFieldFinalFix; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @ExtensionImpl @@ -32,14 +31,12 @@ public class StaticNonFinalFieldInspection extends BaseInspection { @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "static.non.final.field.display.name"); + return InspectionGadgetsLocalize.staticNonFinalFieldDisplayName().get(); } @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "static.non.final.field.problem.descriptor"); + return InspectionGadgetsLocalize.staticNonFinalFieldProblemDescriptor().get(); } @Nullable diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspection.java index 655f5ed3b..0252d5268 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspection.java @@ -87,8 +87,9 @@ public CollapseConditional(PsiConditionalExpression expression) @Nonnull public String getName() { - return InspectionGadgetsBundle.message(getEquivalenceDecision().getExactlyMatches() ? "conditional.expression.with.identical.branches.collapse.quickfix" : "conditional.expression.with" + - ".identical.branches.push.inside.quickfix"); + return getEquivalenceDecision().getExactlyMatches() + ? InspectionGadgetsLocalize.conditionalExpressionWithIdenticalBranchesCollapseQuickfix().get() + : InspectionGadgetsBundle.message("conditional.expression.with.identical.branches.push.inside.quickfix"); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java index 10b1343b4..14d63f160 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java @@ -15,30 +15,27 @@ */ package com.intellij.java.impl.ig.controlflow; -import jakarta.annotation.Nonnull; - import com.intellij.java.language.psi.PsiCodeBlock; import com.intellij.java.language.psi.PsiStatement; import com.intellij.java.language.psi.PsiSwitchLabelStatement; import com.intellij.java.language.psi.PsiSwitchStatement; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import jakarta.annotation.Nonnull; @ExtensionImpl public class DefaultNotLastCaseInSwitchInspection extends BaseInspection { @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "default.not.last.case.in.switch.display.name"); + return InspectionGadgetsLocalize.defaultNotLastCaseInSwitchDisplayName().get(); } @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "default.not.last.case.in.switch.problem.descriptor"); + return InspectionGadgetsLocalize.defaultNotLastCaseInSwitchProblemDescriptor().get(); } public BaseInspectionVisitor buildVisitor() { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/dataflow/BooleanVariableAlwaysNegatedInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/dataflow/BooleanVariableAlwaysNegatedInspection.java index bd6c5c5ba..19b8371c1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/dataflow/BooleanVariableAlwaysNegatedInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/dataflow/BooleanVariableAlwaysNegatedInspection.java @@ -47,14 +47,9 @@ public String getDisplayName() { @Override protected String buildErrorString(Object... infos) { final PsiVariable variable = (PsiVariable)infos[0]; - if (variable instanceof PsiField) { - return InspectionGadgetsBundle.message( - "boolean.field.always.inverted.problem.descriptor"); - } - else { - return InspectionGadgetsBundle.message( - "boolean.variable.always.inverted.problem.descriptor"); - } + return variable instanceof PsiField + ? InspectionGadgetsLocalize.booleanFieldAlwaysInvertedProblemDescriptor().get() + : InspectionGadgetsLocalize.booleanVariableAlwaysInvertedProblemDescriptor().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/dependency/CyclicClassDependencyInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/dependency/CyclicClassDependencyInspection.java index 34beae232..1fa727cc2 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/dependency/CyclicClassDependencyInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/dependency/CyclicClassDependencyInspection.java @@ -15,15 +15,16 @@ */ package com.intellij.java.impl.ig.dependency; -import consulo.language.editor.scope.AnalysisScope; +import com.intellij.java.analysis.codeInspection.reference.RefClass; +import com.intellij.java.impl.ig.BaseGlobalInspection; +import com.intellij.java.language.psi.PsiClass; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.language.editor.inspection.CommonProblemDescriptor; import consulo.language.editor.inspection.GlobalInspectionContext; -import consulo.language.editor.inspection.scheme.InspectionManager; -import com.intellij.java.analysis.codeInspection.reference.RefClass; import consulo.language.editor.inspection.reference.RefEntity; -import com.intellij.java.language.psi.PsiClass; -import com.siyeh.InspectionGadgetsBundle; -import com.intellij.java.impl.ig.BaseGlobalInspection; +import consulo.language.editor.inspection.scheme.InspectionManager; +import consulo.language.editor.scope.AnalysisScope; +import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -35,8 +36,7 @@ public abstract class CyclicClassDependencyInspection extends BaseGlobalInspecti @Nonnull @Override public String getDisplayName() { - return InspectionGadgetsBundle.message( - "cyclic.class.dependency.display.name"); + return InspectionGadgetsLocalize.cyclicClassDependencyDisplayName().get(); } @Nullable @@ -64,11 +64,10 @@ public CommonProblemDescriptor[] checkElement( if (numMutualDependents <= 1) { return null; } - final String errorString = InspectionGadgetsBundle.message( - "cyclic.class.dependency.problem.descriptor", - refEntity.getName(), numMutualDependents - 1); + final LocalizeValue errorString = + InspectionGadgetsLocalize.cyclicClassDependencyProblemDescriptor(refEntity.getName(), numMutualDependents - 1); return new CommonProblemDescriptor[]{ - inspectionManager.createProblemDescriptor(errorString) + inspectionManager.createProblemDescriptor(errorString.get()) }; } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/dependency/CyclicClassInitializationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/dependency/CyclicClassInitializationInspection.java index 5d21df6c9..8d4f6532e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/dependency/CyclicClassInitializationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/dependency/CyclicClassInitializationInspection.java @@ -18,12 +18,13 @@ import com.intellij.java.analysis.codeInspection.reference.RefClass; import com.intellij.java.impl.ig.BaseGlobalInspection; import com.intellij.java.language.psi.PsiClass; -import com.siyeh.InspectionGadgetsBundle; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.language.editor.inspection.CommonProblemDescriptor; import consulo.language.editor.inspection.GlobalInspectionContext; import consulo.language.editor.inspection.reference.RefEntity; import consulo.language.editor.inspection.scheme.InspectionManager; import consulo.language.editor.scope.AnalysisScope; +import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -31,12 +32,10 @@ import java.util.Set; public abstract class CyclicClassInitializationInspection extends BaseGlobalInspection { - @Nonnull @Override public String getDisplayName() { - return InspectionGadgetsBundle.message( - "cyclic.class.initialization.display.name"); + return InspectionGadgetsLocalize.cyclicClassInitializationDisplayName().get(); } @Nullable @@ -44,7 +43,8 @@ public CommonProblemDescriptor[] checkElement( RefEntity refEntity, AnalysisScope analysisScope, InspectionManager inspectionManager, - GlobalInspectionContext globalInspectionContext) { + GlobalInspectionContext globalInspectionContext + ) { if (!(refEntity instanceof RefClass)) { return null; } @@ -64,11 +64,10 @@ public CommonProblemDescriptor[] checkElement( if (numMutualDependents == 0) { return null; } - final String errorString = InspectionGadgetsBundle.message( - "cyclic.class.initialization.problem.descriptor", - refEntity.getName(), numMutualDependents); + final LocalizeValue errorString = + InspectionGadgetsLocalize.cyclicClassInitializationProblemDescriptor(refEntity.getName(), numMutualDependents); return new CommonProblemDescriptor[]{ - inspectionManager.createProblemDescriptor(errorString) + inspectionManager.createProblemDescriptor(errorString.get()) }; } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/dependency/CyclicPackageDependencyInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/dependency/CyclicPackageDependencyInspection.java index d077e1964..bc6b865c1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/dependency/CyclicPackageDependencyInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/dependency/CyclicPackageDependencyInspection.java @@ -15,14 +15,15 @@ */ package com.intellij.java.impl.ig.dependency; -import consulo.language.editor.scope.AnalysisScope; +import com.intellij.java.analysis.codeInspection.reference.RefPackage; +import com.intellij.java.impl.ig.BaseGlobalInspection; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.language.editor.inspection.CommonProblemDescriptor; import consulo.language.editor.inspection.GlobalInspectionContext; -import consulo.language.editor.inspection.scheme.InspectionManager; import consulo.language.editor.inspection.reference.RefEntity; -import com.intellij.java.analysis.codeInspection.reference.RefPackage; -import com.siyeh.InspectionGadgetsBundle; -import com.intellij.java.impl.ig.BaseGlobalInspection; +import consulo.language.editor.inspection.scheme.InspectionManager; +import consulo.language.editor.scope.AnalysisScope; +import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -34,8 +35,7 @@ public abstract class CyclicPackageDependencyInspection extends BaseGlobalInspec @Nonnull @Override public String getDisplayName() { - return InspectionGadgetsBundle.message( - "cyclic.package.dependency.display.name"); + return InspectionGadgetsLocalize.cyclicPackageDependencyDisplayName().get(); } @Nullable @@ -60,11 +60,10 @@ public CommonProblemDescriptor[] checkElement( return null; } final String packageName = refEntity.getName(); - final String errorString = InspectionGadgetsBundle.message( - "cyclic.package.dependency.problem.descriptor", - packageName, numMutualDependents - 1); + final LocalizeValue errorString = + InspectionGadgetsLocalize.cyclicPackageDependencyProblemDescriptor(packageName, numMutualDependents - 1); return new CommonProblemDescriptor[]{ - inspectionManager.createProblemDescriptor(errorString) + inspectionManager.createProblemDescriptor(errorString.get()) }; } } \ No newline at end of file diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/DeleteImportFix.java b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/DeleteImportFix.java index 209d82d0c..f08dfa60d 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/DeleteImportFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/DeleteImportFix.java @@ -15,18 +15,18 @@ */ package com.intellij.java.impl.ig.fixes; +import com.siyeh.ig.InspectionGadgetsFix; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.language.editor.inspection.ProblemDescriptor; -import consulo.project.Project; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; -import com.siyeh.ig.InspectionGadgetsFix; -import com.siyeh.InspectionGadgetsBundle; +import consulo.project.Project; import jakarta.annotation.Nonnull; public class DeleteImportFix extends InspectionGadgetsFix { @Nonnull public String getName() { - return InspectionGadgetsBundle.message("delete.import.quickfix"); + return InspectionGadgetsLocalize.deleteImportQuickfix().get(); } public void doFix(Project project, ProblemDescriptor descriptor) diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeFieldFinalFix.java b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeFieldFinalFix.java index 1eff550b9..6208a2aee 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeFieldFinalFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeFieldFinalFix.java @@ -15,20 +15,18 @@ */ package com.intellij.java.impl.ig.fixes; -import jakarta.annotation.Nonnull; - -import consulo.language.editor.inspection.ProblemDescriptor; +import com.intellij.java.impl.ig.psiutils.FinalUtils; import com.intellij.java.language.psi.PsiField; import com.intellij.java.language.psi.PsiModifier; import com.intellij.java.language.psi.PsiModifierList; import com.intellij.java.language.psi.PsiReferenceExpression; -import consulo.project.Project; -import consulo.language.psi.*; -import consulo.language.util.IncorrectOperationException; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.InspectionGadgetsFix; -import com.intellij.java.impl.ig.psiutils.FinalUtils; - +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.language.editor.inspection.ProblemDescriptor; +import consulo.language.psi.PsiElement; +import consulo.language.util.IncorrectOperationException; +import consulo.project.Project; +import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; public class MakeFieldFinalFix extends InspectionGadgetsFix { @@ -55,8 +53,7 @@ public static InspectionGadgetsFix buildFixUnconditional(PsiField field) { @Nonnull public String getName() { - return InspectionGadgetsBundle.message("make.field.final.quickfix", - fieldName); + return InspectionGadgetsLocalize.makeFieldFinalQuickfix(fieldName).get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeFieldStaticFinalFix.java b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeFieldStaticFinalFix.java index 9cdd5a09d..95b9c2463 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeFieldStaticFinalFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeFieldStaticFinalFix.java @@ -15,6 +15,7 @@ */ package com.intellij.java.impl.ig.fixes; +import com.siyeh.localize.InspectionGadgetsLocalize; import jakarta.annotation.Nonnull; import consulo.language.editor.inspection.ProblemDescriptor; @@ -58,8 +59,7 @@ public static InspectionGadgetsFix buildFix(PsiField field) { @Nonnull public String getName() { - return InspectionGadgetsBundle.message( - "make.static.final.quickfix", fieldName); + return InspectionGadgetsLocalize.makeStaticFinalQuickfix(fieldName).get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeInitializerExplicitFix.java b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeInitializerExplicitFix.java index 8ee91e490..9edf443a0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeInitializerExplicitFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/fixes/MakeInitializerExplicitFix.java @@ -18,6 +18,7 @@ import com.intellij.java.language.psi.*; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.InspectionGadgetsFix; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiManager; @@ -30,8 +31,7 @@ public class MakeInitializerExplicitFix extends InspectionGadgetsFix { @Nonnull public String getName() { - return InspectionGadgetsBundle.message( - "make.initialization.explicit.quickfix"); + return InspectionGadgetsLocalize.makeInitializationExplicitQuickfix().get(); } public void doFix(Project project, ProblemDescriptor descriptor) diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/imports/StaticImportInspectionBase.java b/plugin/src/main/java/com/intellij/java/impl/ig/imports/StaticImportInspectionBase.java index 64fb934df..3725f7f5f 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/imports/StaticImportInspectionBase.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/imports/StaticImportInspectionBase.java @@ -20,11 +20,11 @@ import com.intellij.java.language.psi.codeStyle.JavaCodeStyleManager; import com.intellij.java.language.psi.util.FileTypeUtils; import com.intellij.java.language.psi.util.InheritanceUtil; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.CommentTracker; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; @@ -33,8 +33,8 @@ import consulo.language.psi.util.PsiTreeUtil; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; - import jakarta.annotation.Nonnull; + import java.util.*; @ExtensionImpl @@ -54,13 +54,13 @@ public class StaticImportInspectionBase extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("static.import.display.name"); + return InspectionGadgetsLocalize.staticImportDisplayName().get(); } @Override @Nonnull public String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message("static.import.problem.descriptor"); + return InspectionGadgetsLocalize.staticImportProblemDescriptor().get(); } @Override @@ -83,7 +83,7 @@ private static class StaticImportFix extends InspectionGadgetsFix { @Override @Nonnull public String getFamilyName() { - return InspectionGadgetsBundle.message("static.import.replace.quickfix"); + return InspectionGadgetsLocalize.staticImportReplaceQuickfix().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/StaticInheritanceFix.java b/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/StaticInheritanceFix.java index 6aad16ec2..d890578fd 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/StaticInheritanceFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/StaticInheritanceFix.java @@ -18,9 +18,9 @@ import com.intellij.java.analysis.codeInsight.intention.QuickFixFactory; import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.InheritanceUtil; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.ClassUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.application.Application; import consulo.application.ApplicationManager; import consulo.application.Result; @@ -38,9 +38,9 @@ import consulo.language.psi.search.ReferencesSearch; import consulo.language.psi.util.PsiTreeUtil; import consulo.language.util.IncorrectOperationException; +import consulo.localize.LocalizeValue; import consulo.logging.Logger; import consulo.project.Project; - import jakarta.annotation.Nonnull; /** @@ -56,9 +56,8 @@ class StaticInheritanceFix extends InspectionGadgetsFix { @Nonnull public String getName() { - String scope = - myReplaceInWholeProject ? InspectionGadgetsBundle.message("the.whole.project") : InspectionGadgetsBundle.message("this.class"); - return InspectionGadgetsBundle.message("static.inheritance.replace.quickfix", scope); + LocalizeValue scope = myReplaceInWholeProject ? InspectionGadgetsLocalize.theWholeProject() : InspectionGadgetsLocalize.thisClass(); + return InspectionGadgetsLocalize.staticInheritanceReplaceQuickfix(scope).get(); } public void doFix(final Project project, final ProblemDescriptor descriptor) throws IncorrectOperationException { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/StaticInheritanceInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/StaticInheritanceInspection.java index 335c92e40..b151951dc 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/StaticInheritanceInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/inheritance/StaticInheritanceInspection.java @@ -18,12 +18,11 @@ import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.PsiJavaCodeReferenceElement; import com.intellij.java.language.psi.PsiReferenceList; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; - import jakarta.annotation.Nonnull; import java.util.HashSet; @@ -34,14 +33,12 @@ public class StaticInheritanceInspection extends BaseInspection { @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "static.inheritance.display.name"); + return InspectionGadgetsLocalize.staticInheritanceDisplayName().get(); } @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "static.inheritance.problem.descriptor"); + return InspectionGadgetsLocalize.staticInheritanceProblemDescriptor().get(); } @Nonnull diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/initialization/StaticVariableInitializationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/initialization/StaticVariableInitializationInspection.java index 355f5f141..7d4be8380 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/initialization/StaticVariableInitializationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/initialization/StaticVariableInitializationInspection.java @@ -15,16 +15,17 @@ */ package com.intellij.java.impl.ig.initialization; +import com.intellij.java.impl.ig.fixes.MakeInitializerExplicitFix; +import com.intellij.java.impl.ig.psiutils.InitializationUtils; import com.intellij.java.language.psi.*; -import consulo.annotation.component.ExtensionImpl; -import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.intellij.java.impl.ig.fixes.MakeInitializerExplicitFix; import com.siyeh.ig.psiutils.ClassUtils; -import com.intellij.java.impl.ig.psiutils.InitializationUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; +import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; import javax.swing.*; @@ -46,22 +47,19 @@ public String getID() { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "static.variable.may.not.be.initialized.display.name"); + return InspectionGadgetsLocalize.staticVariableMayNotBeInitializedDisplayName().get(); } @Override @Nonnull public String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "static.variable.may.not.be.initialized.problem.descriptor"); + return InspectionGadgetsLocalize.staticVariableMayNotBeInitializedProblemDescriptor().get(); } @Override public JComponent createOptionsPanel() { - return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message( - "primitive.fields.ignore.option"), - this, "m_ignorePrimitives"); + LocalizeValue message = InspectionGadgetsLocalize.primitiveFieldsIgnoreOption(); + return new SingleCheckboxOptionsPanel(message.get(), this, "m_ignorePrimitives"); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/initialization/StaticVariableUninitializedUseInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/initialization/StaticVariableUninitializedUseInspection.java index 1f41cde94..f94def983 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/initialization/StaticVariableUninitializedUseInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/initialization/StaticVariableUninitializedUseInspection.java @@ -15,14 +15,15 @@ */ package com.intellij.java.impl.ig.initialization; +import com.intellij.java.impl.ig.psiutils.UninitializedReadCollector; import com.intellij.java.language.psi.*; -import consulo.annotation.component.ExtensionImpl; -import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.ClassUtils; -import com.intellij.java.impl.ig.psiutils.UninitializedReadCollector; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; +import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; import javax.swing.*; @@ -44,23 +45,19 @@ public String getID() { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "static.variable.used.before.initialization.display.name"); + return InspectionGadgetsLocalize.staticVariableUsedBeforeInitializationDisplayName().get(); } @Override @Nonnull public String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "static.variable.used.before.initialization.problem.descriptor"); + return InspectionGadgetsLocalize.staticVariableUsedBeforeInitializationProblemDescriptor().get(); } @Override public JComponent createOptionsPanel() { - return new SingleCheckboxOptionsPanel( - InspectionGadgetsBundle.message( - "primitive.fields.ignore.option"), - this, "m_ignorePrimitives"); + LocalizeValue message = InspectionGadgetsLocalize.primitiveFieldsIgnoreOption(); + return new SingleCheckboxOptionsPanel(message.get(), this, "m_ignorePrimitives"); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/DateToStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/DateToStringInspection.java index f7e48bd49..a35fc8a35 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/DateToStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/internationalization/DateToStringInspection.java @@ -15,19 +15,18 @@ */ package com.intellij.java.impl.ig.internationalization; -import jakarta.annotation.Nonnull; - -import consulo.annotation.component.ExtensionImpl; -import consulo.java.language.module.util.JavaClassNames; import com.intellij.java.language.psi.PsiExpressionList; import com.intellij.java.language.psi.PsiMethodCallExpression; import com.intellij.java.language.psi.PsiType; import com.siyeh.HardcodedMethodConstants; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.MethodCallUtils; import com.siyeh.ig.psiutils.TypeUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.java.language.module.util.JavaClassNames; +import jakarta.annotation.Nonnull; @ExtensionImpl public class DateToStringInspection extends BaseInspection { @@ -41,15 +40,13 @@ public String getID() { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "call.to.date.tostring.display.name"); + return InspectionGadgetsLocalize.callToDateTostringDisplayName().get(); } @Override @Nonnull public String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "call.to.date.tostring.problem.descriptor"); + return InspectionGadgetsLocalize.callToDateTostringProblemDescriptor().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/j2me/MethodCallInLoopConditionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/j2me/MethodCallInLoopConditionInspection.java index 085b3e432..4b639df2a 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/j2me/MethodCallInLoopConditionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/j2me/MethodCallInLoopConditionInspection.java @@ -15,17 +15,16 @@ */ package com.intellij.java.impl.ig.j2me; -import jakarta.annotation.Nonnull; -import jakarta.annotation.Nullable; - +import com.intellij.java.impl.ig.fixes.IntroduceVariableFix; import com.intellij.java.language.psi.*; -import consulo.annotation.component.ExtensionImpl; -import consulo.language.psi.*; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.intellij.java.impl.ig.fixes.IntroduceVariableFix; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.language.psi.PsiElementVisitor; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; @ExtensionImpl public class MethodCallInLoopConditionInspection extends BaseInspection { @@ -33,13 +32,13 @@ public class MethodCallInLoopConditionInspection extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("method.call.in.loop.condition.display.name"); + return InspectionGadgetsLocalize.methodCallInLoopConditionDisplayName().get(); } @Override @Nonnull public String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message("method.call.in.loop.condition.problem.descriptor"); + return InspectionGadgetsLocalize.methodCallInLoopConditionProblemDescriptor().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/junit/StaticSuiteInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/junit/StaticSuiteInspection.java index 2cbf9a186..e4d66cf20 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/junit/StaticSuiteInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/junit/StaticSuiteInspection.java @@ -20,9 +20,9 @@ import com.intellij.java.language.psi.PsiModifier; import com.intellij.java.language.psi.PsiParameterList; import com.intellij.java.language.psi.util.InheritanceUtil; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; @@ -39,14 +39,13 @@ public String getID() { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("static.suite.display.name"); + return InspectionGadgetsLocalize.staticSuiteDisplayName().get(); } @Override @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "static.suite.problem.descriptor"); + return InspectionGadgetsLocalize.staticSuiteProblemDescriptor().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/logging/StringConcatenationArgumentToLogCallInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/logging/StringConcatenationArgumentToLogCallInspection.java index 8e107156a..811873291 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/logging/StringConcatenationArgumentToLogCallInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/logging/StringConcatenationArgumentToLogCallInspection.java @@ -15,25 +15,25 @@ */ package com.intellij.java.impl.ig.logging; -import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.inspection.ProblemDescriptor; import com.intellij.java.language.psi.*; -import consulo.project.Project; -import consulo.util.lang.StringUtil; -import consulo.language.psi.*; -import consulo.language.util.IncorrectOperationException; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.ExpressionUtils; import com.siyeh.ig.psiutils.ParenthesesUtils; import com.siyeh.ig.psiutils.TypeUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.language.editor.inspection.ProblemDescriptor; +import consulo.language.psi.PsiElement; +import consulo.language.util.IncorrectOperationException; +import consulo.project.Project; +import consulo.util.lang.StringUtil; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; -import jakarta.annotation.Nonnull; -import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -59,13 +59,13 @@ public class StringConcatenationArgumentToLogCallInspection extends BaseInspecti @Nonnull @Override public String getDisplayName() { - return InspectionGadgetsBundle.message("string.concatenation.argument.to.log.call.display.name"); + return InspectionGadgetsLocalize.stringConcatenationArgumentToLogCallDisplayName().get(); } @Nonnull @Override protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message("string.concatenation.argument.to.log.call.problem.descriptor"); + return InspectionGadgetsLocalize.stringConcatenationArgumentToLogCallProblemDescriptor().get(); } @Nullable @@ -85,7 +85,7 @@ public StringConcatenationArgumentToLogCallFix() {} @Nonnull @Override public String getName() { - return InspectionGadgetsBundle.message("string.concatenation.in.format.call.quickfix"); + return InspectionGadgetsLocalize.stringConcatenationInFormatCallQuickfix().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/memory/StringBufferFieldInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/memory/StringBufferFieldInspection.java index d25377cc2..5e75118cf 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/memory/StringBufferFieldInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/memory/StringBufferFieldInspection.java @@ -15,6 +15,7 @@ */ package com.intellij.java.impl.ig.memory; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.java.language.module.util.JavaClassNames; import com.intellij.java.language.psi.PsiField; @@ -31,8 +32,7 @@ public class StringBufferFieldInspection extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "stringbuffer.field.display.name"); + return InspectionGadgetsLocalize.stringbufferFieldDisplayName().get(); } @Override @@ -40,8 +40,7 @@ public String getDisplayName() { public String buildErrorString(Object... infos) { final PsiType type = (PsiType)infos[0]; final String typeName = type.getPresentableText(); - return InspectionGadgetsBundle.message( - "stringbuffer.field.problem.descriptor", typeName); + return InspectionGadgetsLocalize.stringbufferFieldProblemDescriptor(typeName).get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/methodmetrics/CyclomaticComplexityInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/methodmetrics/CyclomaticComplexityInspection.java index 2c6e46f01..3a176f8c1 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/methodmetrics/CyclomaticComplexityInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/methodmetrics/CyclomaticComplexityInspection.java @@ -16,8 +16,8 @@ package com.intellij.java.impl.ig.methodmetrics; import com.intellij.java.language.psi.PsiMethod; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; +import com.siyeh.localize.InspectionGadgetsLocalize; import jakarta.annotation.Nonnull; public abstract class CyclomaticComplexityInspection extends MethodMetricInspection { @@ -29,8 +29,7 @@ public String getID() { @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "cyclomatic.complexity.display.name"); + return InspectionGadgetsLocalize.cyclomaticComplexityDisplayName().get(); } protected int getDefaultLimit() { @@ -38,15 +37,13 @@ protected int getDefaultLimit() { } protected String getConfigurationLabel() { - return InspectionGadgetsBundle.message( - "method.complexity.limit.option"); + return InspectionGadgetsLocalize.methodComplexityLimitOption().get(); } @Nonnull public String buildErrorString(Object... infos) { final Integer complexity = (Integer)infos[0]; - return InspectionGadgetsBundle.message( - "cyclomatic.complexity.problem.descriptor", complexity); + return InspectionGadgetsLocalize.cyclomaticComplexityProblemDescriptor(complexity).get(); } public BaseInspectionVisitor buildVisitor() { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/migration/MethodCanBeVariableArityMethodInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/migration/MethodCanBeVariableArityMethodInspection.java index 7c1f3ae6f..a56017f74 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/migration/MethodCanBeVariableArityMethodInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/migration/MethodCanBeVariableArityMethodInspection.java @@ -23,14 +23,15 @@ import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.inspection.ProblemDescriptor; import consulo.deadCodeNotWorking.impl.MultipleCheckboxOptionsPanel; +import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.project.Project; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; -import jakarta.annotation.Nonnull; import javax.swing.*; @ExtensionImpl @@ -46,22 +47,26 @@ public class MethodCanBeVariableArityMethodInspection extends BaseInspection { @Nonnull @Override public String getDisplayName() { - return InspectionGadgetsBundle.message("method.can.be.variable.arity.method.display.name"); + return InspectionGadgetsLocalize.methodCanBeVariableArityMethodDisplayName().get(); } @Nonnull @Override protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message("method.can.be.variable.arity.method.problem.descriptor"); + return InspectionGadgetsLocalize.methodCanBeVariableArityMethodProblemDescriptor().get(); } @Override public JComponent createOptionsPanel() { final MultipleCheckboxOptionsPanel panel = new MultipleCheckboxOptionsPanel(this); - panel.addCheckbox(InspectionGadgetsBundle.message("method.can.be.variable.arity.method.ignore.byte.short.option"), - "ignoreByteAndShortArrayParameters"); - panel.addCheckbox(InspectionGadgetsBundle.message("method.can.be.variable.arity.method.ignore.overriding.methods"), - "ignoreOverridingMethods"); + panel.addCheckbox( + InspectionGadgetsLocalize.methodCanBeVariableArityMethodIgnoreByteShortOption().get(), + "ignoreByteAndShortArrayParameters" + ); + panel.addCheckbox( + InspectionGadgetsBundle.message("method.can.be.variable.arity.method.ignore.overriding.methods"), + "ignoreOverridingMethods" + ); return panel; } @@ -75,7 +80,7 @@ private static class MethodCanBeVariableArityMethodFix extends InspectionGadgets @Nonnull @Override public String getName() { - return InspectionGadgetsBundle.message("convert.to.variable.arity.method.quickfix"); + return InspectionGadgetsLocalize.convertToVariableArityMethodQuickfix().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/migration/StringBufferReplaceableByStringBuilderInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/migration/StringBufferReplaceableByStringBuilderInspection.java index e145775e6..12f0f1ec9 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/migration/StringBufferReplaceableByStringBuilderInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/migration/StringBufferReplaceableByStringBuilderInspection.java @@ -17,12 +17,12 @@ import com.intellij.java.language.psi.*; import com.intellij.java.language.psi.util.PsiUtil; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.ig.psiutils.VariableAccessUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.java.language.module.util.JavaClassNames; import consulo.language.editor.inspection.ProblemDescriptor; @@ -30,10 +30,10 @@ import consulo.language.psi.util.PsiTreeUtil; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; -import org.jetbrains.annotations.NonNls; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; + import java.util.Arrays; import java.util.HashSet; import java.util.Set; @@ -55,13 +55,13 @@ public String getID() { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("string.buffer.replaceable.by.string.builder.display.name"); + return InspectionGadgetsLocalize.stringBufferReplaceableByStringBuilderDisplayName().get(); } @Override @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message("string.buffer.replaceable.by.string.builder.problem.descriptor"); + return InspectionGadgetsLocalize.stringBufferReplaceableByStringBuilderProblemDescriptor().get(); } @Override @@ -94,7 +94,7 @@ private static class StringBufferMayBeStringBuilderFix extends InspectionGadgets @Nonnull public String getName() { - return InspectionGadgetsBundle.message("string.buffer.replaceable.by.string.builder.replace.quickfix"); + return InspectionGadgetsLocalize.stringBufferReplaceableByStringBuilderReplaceQuickfix().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/naming/StaticMethodNamingConventionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/naming/StaticMethodNamingConventionInspection.java index 0d50db77a..608cde3c7 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/naming/StaticMethodNamingConventionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/naming/StaticMethodNamingConventionInspection.java @@ -15,15 +15,15 @@ */ package com.intellij.java.impl.ig.naming; -import jakarta.annotation.Nonnull; - +import com.intellij.java.impl.ig.fixes.RenameFix; import com.intellij.java.language.psi.PsiMethod; import com.intellij.java.language.psi.PsiModifier; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.intellij.java.impl.ig.fixes.RenameFix; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import jakarta.annotation.Nonnull; @ExtensionImpl public class StaticMethodNamingConventionInspection @@ -34,8 +34,7 @@ public class StaticMethodNamingConventionInspection @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "static.method.naming.convention.display.name"); + return InspectionGadgetsLocalize.staticMethodNamingConventionDisplayName().get(); } protected InspectionGadgetsFix buildFix(Object... infos) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/naming/StaticVariableNamingConventionInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/naming/StaticVariableNamingConventionInspection.java index 02d5a1731..8a5537e04 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/naming/StaticVariableNamingConventionInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/naming/StaticVariableNamingConventionInspection.java @@ -15,20 +15,21 @@ */ package com.intellij.java.impl.ig.naming; +import com.intellij.java.impl.ig.fixes.RenameFix; import com.intellij.java.language.psi.PsiField; import com.intellij.java.language.psi.PsiModifier; import com.intellij.java.language.psi.PsiType; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.intellij.java.impl.ig.fixes.RenameFix; import com.siyeh.ig.psiutils.ClassUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.deadCodeNotWorking.impl.CheckBox; - +import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; -import javax.swing.JComponent; +import javax.swing.*; import java.util.Arrays; import java.util.Collection; @@ -45,8 +46,7 @@ public class StaticVariableNamingConventionInspection @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "static.variable.naming.convention.display.name"); + return InspectionGadgetsLocalize.staticVariableNamingConventionDisplayName().get(); } @Override @@ -93,10 +93,8 @@ protected int getDefaultMaxLength() { @Override public Collection createExtraOptions() { - return Arrays.asList( - new CheckBox(InspectionGadgetsBundle.message( - "static.variable.naming.convention.mutable.option"), - this, "checkMutableFinals")); + LocalizeValue message = InspectionGadgetsLocalize.staticVariableNamingConventionMutableOption(); + return Arrays.asList(new CheckBox(message.get(), this, "checkMutableFinals")); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ConvertOctalLiteralToDecimalFix.java b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ConvertOctalLiteralToDecimalFix.java index 45bae6631..ddcf38477 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ConvertOctalLiteralToDecimalFix.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/numeric/ConvertOctalLiteralToDecimalFix.java @@ -15,26 +15,24 @@ */ package com.intellij.java.impl.ig.numeric; -import jakarta.annotation.Nonnull; - -import consulo.language.editor.inspection.ProblemDescriptor; import com.intellij.java.language.psi.JavaPsiFacade; import com.intellij.java.language.psi.PsiElementFactory; import com.intellij.java.language.psi.PsiExpression; import com.intellij.java.language.psi.PsiLiteralExpression; -import consulo.project.Project; -import consulo.language.psi.*; -import consulo.language.util.IncorrectOperationException; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.InspectionGadgetsFix; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.language.editor.inspection.ProblemDescriptor; +import consulo.language.psi.PsiElement; +import consulo.language.util.IncorrectOperationException; +import consulo.project.Project; +import jakarta.annotation.Nonnull; class ConvertOctalLiteralToDecimalFix extends InspectionGadgetsFix { @Nonnull public String getName() { - return InspectionGadgetsBundle.message( - "convert.octal.literal.to.decimal.literal.quickfix"); + return InspectionGadgetsLocalize.convertOctalLiteralToDecimalLiteralQuickfix().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/ManualArrayCopyInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/ManualArrayCopyInspection.java index 300a4ef4e..b263070b4 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/ManualArrayCopyInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/ManualArrayCopyInspection.java @@ -16,7 +16,6 @@ package com.intellij.java.impl.ig.performance; import com.intellij.java.language.psi.*; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; @@ -24,16 +23,16 @@ import com.siyeh.ig.psiutils.ParenthesesUtils; import com.siyeh.ig.psiutils.SideEffectChecker; import com.siyeh.ig.psiutils.VariableAccessUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.language.ast.IElementType; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; -import org.jetbrains.annotations.NonNls; - import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; @ExtensionImpl public class ManualArrayCopyInspection extends BaseInspection { @@ -41,8 +40,7 @@ public class ManualArrayCopyInspection extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "manual.array.copy.display.name"); + return InspectionGadgetsLocalize.manualArrayCopyDisplayName().get(); } @Override @@ -53,8 +51,7 @@ public boolean isEnabledByDefault() { @Override @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "manual.array.copy.problem.descriptor"); + return InspectionGadgetsLocalize.manualArrayCopyProblemDescriptor().get(); } @Override @@ -79,7 +76,7 @@ public ManualArrayCopyFix(boolean decrement) { @Override @Nonnull public String getName() { - return InspectionGadgetsBundle.message("manual.array.copy.replace.quickfix"); + return InspectionGadgetsLocalize.manualArrayCopyReplaceQuickfix().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/ManualArrayToCollectionCopyInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/ManualArrayToCollectionCopyInspection.java index ce5922034..ce0a798dc 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/ManualArrayToCollectionCopyInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/ManualArrayToCollectionCopyInspection.java @@ -26,6 +26,7 @@ import com.siyeh.ig.psiutils.ParenthesesUtils; import com.siyeh.ig.psiutils.SideEffectChecker; import com.siyeh.ig.psiutils.VariableAccessUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.java.language.module.util.JavaClassNames; import consulo.language.ast.IElementType; @@ -44,8 +45,7 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "manual.array.to.collection.copy.display.name"); + return InspectionGadgetsLocalize.manualArrayToCollectionCopyDisplayName().get(); } @Override @@ -56,8 +56,7 @@ public boolean isEnabledByDefault() { @Override @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "manual.array.to.collection.copy.problem.descriptor"); + return InspectionGadgetsLocalize.manualArrayToCollectionCopyProblemDescriptor().get(); } @Override @@ -70,8 +69,7 @@ private static class ManualArrayToCollectionCopyFix @Nonnull public String getName() { - return InspectionGadgetsBundle.message( - "manual.array.to.collection.copy.replace.quickfix"); + return InspectionGadgetsLocalize.manualArrayToCollectionCopyReplaceQuickfix().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/MapReplaceableByEnumMapInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/MapReplaceableByEnumMapInspection.java index d8f5fe2da..7e8db16b4 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/MapReplaceableByEnumMapInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/MapReplaceableByEnumMapInspection.java @@ -16,6 +16,7 @@ package com.intellij.java.impl.ig.performance; import com.intellij.java.language.psi.*; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.language.psi.util.PsiTreeUtil; import com.siyeh.InspectionGadgetsBundle; @@ -32,13 +33,13 @@ public class MapReplaceableByEnumMapInspection extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("map.replaceable.by.enum.map.display.name"); + return InspectionGadgetsLocalize.mapReplaceableByEnumMapDisplayName().get(); } @Override @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message("map.replaceable.by.enum.map.problem.descriptor"); + return InspectionGadgetsLocalize.mapReplaceableByEnumMapProblemDescriptor().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferMustHaveInitialCapacityInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferMustHaveInitialCapacityInspection.java index 63908b094..90a072f1e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferMustHaveInitialCapacityInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferMustHaveInitialCapacityInspection.java @@ -19,13 +19,12 @@ import com.intellij.java.language.psi.PsiExpressionList; import com.intellij.java.language.psi.PsiNewExpression; import com.intellij.java.language.psi.PsiType; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.TypeUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import consulo.java.language.module.util.JavaClassNames; - import jakarta.annotation.Nonnull; @ExtensionImpl @@ -41,15 +40,13 @@ public String getID() { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "string.buffer.must.have.initial.capacity.display.name"); + return InspectionGadgetsLocalize.stringBufferMustHaveInitialCapacityDisplayName().get(); } @Override @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "string.buffer.must.have.initial.capacity.problem.descriptor"); + return InspectionGadgetsLocalize.stringBufferMustHaveInitialCapacityProblemDescriptor().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferToStringInConcatenationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferToStringInConcatenationInspection.java index 2ac474cd3..d4750d3ca 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferToStringInConcatenationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringBufferToStringInConcatenationInspection.java @@ -15,21 +15,20 @@ */ package com.intellij.java.impl.ig.performance; -import jakarta.annotation.Nonnull; - -import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.inspection.ProblemDescriptor; import com.intellij.java.language.psi.*; -import consulo.project.Project; -import consulo.language.psi.*; -import consulo.language.util.IncorrectOperationException; import com.siyeh.HardcodedMethodConstants; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.ExpressionUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; import consulo.java.language.module.util.JavaClassNames; +import consulo.language.editor.inspection.ProblemDescriptor; +import consulo.language.psi.PsiElement; +import consulo.language.util.IncorrectOperationException; +import consulo.project.Project; +import jakarta.annotation.Nonnull; @ExtensionImpl public class StringBufferToStringInConcatenationInspection @@ -38,15 +37,13 @@ public class StringBufferToStringInConcatenationInspection @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "string.buffer.to.string.in.concatenation.display.name"); + return InspectionGadgetsLocalize.stringBufferToStringInConcatenationDisplayName().get(); } @Override @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "string.buffer.to.string.in.concatenation.problem.descriptor"); + return InspectionGadgetsLocalize.stringBufferToStringInConcatenationProblemDescriptor().get(); } @Override @@ -63,8 +60,7 @@ private static class StringBufferToStringFix extends InspectionGadgetsFix { @Nonnull public String getName() { - return InspectionGadgetsBundle.message( - "string.buffer.to.string.in.concatenation.remove.quickfix"); + return InspectionGadgetsLocalize.stringBufferToStringInConcatenationRemoveQuickfix().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringConcatenationInLoopsInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringConcatenationInLoopsInspection.java index b87f634cb..b37f2abdc 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringConcatenationInLoopsInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/performance/StringConcatenationInLoopsInspection.java @@ -15,22 +15,23 @@ */ package com.intellij.java.impl.ig.performance; -import consulo.annotation.component.ExtensionImpl; -import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; import com.intellij.java.language.psi.*; -import consulo.language.psi.*; -import consulo.language.ast.IElementType; -import consulo.language.psi.util.PsiTreeUtil; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.ControlFlowUtils; import com.siyeh.ig.psiutils.ExpressionUtils; import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.ig.psiutils.VariableAccessUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; +import consulo.language.ast.IElementType; +import consulo.language.psi.PsiElement; +import consulo.language.psi.util.PsiTreeUtil; +import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; -import javax.swing.JComponent; +import javax.swing.*; @ExtensionImpl public class StringConcatenationInLoopsInspection extends BaseInspection { @@ -47,19 +48,19 @@ public String getID() { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("string.concatenation.in.loops.display.name"); + return InspectionGadgetsLocalize.stringConcatenationInLoopsDisplayName().get(); } @Override @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message("string.concatenation.in.loops.problem.descriptor"); + return InspectionGadgetsLocalize.stringConcatenationInLoopsProblemDescriptor().get(); } @Override public JComponent createOptionsPanel() { - return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("string.concatenation.in.loops.only.option"), - this, "m_ignoreUnlessAssigned"); + LocalizeValue message = InspectionGadgetsLocalize.stringConcatenationInLoopsOnlyOption(); + return new SingleCheckboxOptionsPanel(message.get(), this, "m_ignoreUnlessAssigned"); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/security/CustomClassloaderInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/security/CustomClassloaderInspection.java index c2ba5a432..4cf41c512 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/security/CustomClassloaderInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/security/CustomClassloaderInspection.java @@ -15,14 +15,13 @@ */ package com.intellij.java.impl.ig.security; -import jakarta.annotation.Nonnull; - import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.util.InheritanceUtil; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; +import jakarta.annotation.Nonnull; @ExtensionImpl public class CustomClassloaderInspection extends BaseInspection { @@ -30,15 +29,13 @@ public class CustomClassloaderInspection extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "custom.classloader.display.name"); + return InspectionGadgetsLocalize.customClassloaderDisplayName().get(); } @Override @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "custom.classloader.problem.descriptor"); + return InspectionGadgetsLocalize.customClassloaderProblemDescriptor().get(); } @Override @@ -46,9 +43,7 @@ public BaseInspectionVisitor buildVisitor() { return new CustomClassloaderVisitor(); } - private static class CustomClassloaderVisitor - extends BaseInspectionVisitor { - + private static class CustomClassloaderVisitor extends BaseInspectionVisitor { @Override public void visitClass(@Nonnull PsiClass aClass) { if (!InheritanceUtil.isInheritor(aClass, "java.lang.ClassLoader")) { diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/security/CustomSecurityManagerInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/security/CustomSecurityManagerInspection.java index a6f2a6aa2..731ef6694 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/security/CustomSecurityManagerInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/security/CustomSecurityManagerInspection.java @@ -17,9 +17,9 @@ import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.util.InheritanceUtil; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; +import com.siyeh.localize.InspectionGadgetsLocalize; import consulo.annotation.component.ExtensionImpl; import jakarta.annotation.Nonnull; @@ -29,15 +29,13 @@ public class CustomSecurityManagerInspection extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "custom.security.manager.display.name"); + return InspectionGadgetsLocalize.customSecurityManagerDisplayName().get(); } @Override @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message( - "custom.security.manager.problem.descriptor"); + return InspectionGadgetsLocalize.customSecurityManagerProblemDescriptor().get(); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/security/DeserializableClassInSecureContextInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/security/DeserializableClassInSecureContextInspection.java index 56f0415e5..0285ab38e 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/security/DeserializableClassInSecureContextInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/security/DeserializableClassInSecureContextInspection.java @@ -15,17 +15,18 @@ */ package com.intellij.java.impl.ig.security; -import consulo.annotation.component.ExtensionImpl; -import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; +import com.intellij.java.impl.ig.psiutils.SerializationUtils; import com.intellij.java.language.psi.PsiClass; import com.intellij.java.language.psi.PsiMethod; import com.intellij.java.language.psi.PsiTypeParameter; import com.intellij.java.language.psi.util.InheritanceUtil; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.ControlFlowUtils; -import com.intellij.java.impl.ig.psiutils.SerializationUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.deadCodeNotWorking.impl.SingleCheckboxOptionsPanel; +import consulo.localize.LocalizeValue; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; @@ -40,20 +41,20 @@ public class DeserializableClassInSecureContextInspection extends BaseInspection @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("deserializable.class.in.secure.context.display.name"); + return InspectionGadgetsLocalize.deserializableClassInSecureContextDisplayName().get(); } @Override @Nonnull protected String buildErrorString(Object... infos) { - return InspectionGadgetsBundle.message("deserializable.class.in.secure.context.problem.descriptor"); + return InspectionGadgetsLocalize.deserializableClassInSecureContextProblemDescriptor().get(); } @Nullable @Override public JComponent createOptionsPanel() { - return new SingleCheckboxOptionsPanel( - InspectionGadgetsBundle.message("ignore.classes.extending.throwable.option"), this, "ignoreThrowable"); + LocalizeValue message = InspectionGadgetsLocalize.ignoreClassesExtendingThrowableOption(); + return new SingleCheckboxOptionsPanel(message.get(), this, "ignoreThrowable"); } @Override diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/CStyleArrayDeclarationInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/CStyleArrayDeclarationInspection.java index 64b86686c..3f6e209f0 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/CStyleArrayDeclarationInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/CStyleArrayDeclarationInspection.java @@ -15,18 +15,19 @@ */ package com.intellij.java.impl.ig.style; -import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.inspection.ProblemDescriptor; -import consulo.project.Project; -import consulo.language.psi.PsiElement; import com.intellij.java.language.psi.PsiType; import com.intellij.java.language.psi.PsiTypeElement; import com.intellij.java.language.psi.PsiVariable; -import consulo.language.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; +import consulo.language.editor.inspection.ProblemDescriptor; +import consulo.language.psi.PsiElement; +import consulo.language.util.IncorrectOperationException; +import consulo.project.Project; import jakarta.annotation.Nonnull; @ExtensionImpl @@ -34,8 +35,7 @@ public class CStyleArrayDeclarationInspection extends BaseInspection { @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message( - "c.style.array.declaration.display.name"); + return InspectionGadgetsLocalize.cStyleArrayDeclarationDisplayName().get(); } @Nonnull @@ -53,8 +53,7 @@ private static class CStyleArrayDeclarationFix @Nonnull public String getName() { - return InspectionGadgetsBundle.message( - "c.style.array.declaration.replace.quickfix"); + return InspectionGadgetsLocalize.cStyleArrayDeclarationReplaceQuickfix().get(); } public void doFix(Project project, ProblemDescriptor descriptor) diff --git a/plugin/src/main/java/com/intellij/java/impl/ig/style/StringBufferReplaceableByStringInspection.java b/plugin/src/main/java/com/intellij/java/impl/ig/style/StringBufferReplaceableByStringInspection.java index 573c6b49c..d9d981e6b 100644 --- a/plugin/src/main/java/com/intellij/java/impl/ig/style/StringBufferReplaceableByStringInspection.java +++ b/plugin/src/main/java/com/intellij/java/impl/ig/style/StringBufferReplaceableByStringInspection.java @@ -15,24 +15,23 @@ */ package com.intellij.java.impl.ig.style; -import jakarta.annotation.Nonnull; - -import consulo.annotation.component.ExtensionImpl; -import consulo.language.editor.inspection.ProblemDescriptor; import com.intellij.java.language.psi.*; -import consulo.project.Project; -import consulo.util.lang.StringUtil; -import consulo.language.psi.*; -import consulo.language.psi.util.PsiTreeUtil; -import consulo.language.util.IncorrectOperationException; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.ParenthesesUtils; import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.ig.psiutils.VariableAccessUtils; +import com.siyeh.localize.InspectionGadgetsLocalize; +import consulo.annotation.component.ExtensionImpl; import consulo.java.language.module.util.JavaClassNames; +import consulo.language.editor.inspection.ProblemDescriptor; +import consulo.language.psi.PsiElement; +import consulo.language.psi.util.PsiTreeUtil; +import consulo.language.util.IncorrectOperationException; +import consulo.project.Project; +import consulo.util.lang.StringUtil; +import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; @@ -42,7 +41,7 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection { @Override @Nonnull public String getDisplayName() { - return InspectionGadgetsBundle.message("string.buffer.replaceable.by.string.display.name"); + return InspectionGadgetsLocalize.stringBufferReplaceableByStringDisplayName().get(); } @Override @@ -50,10 +49,10 @@ public String getDisplayName() { public String buildErrorString(Object... infos) { final PsiElement element = (PsiElement)infos[0]; if (element instanceof PsiNewExpression) { - return InspectionGadgetsBundle.message("new.string.buffer.replaceable.by.string.problem.descriptor"); + return InspectionGadgetsLocalize.newStringBufferReplaceableByStringProblemDescriptor().get(); } final String typeText = ((PsiType)infos[1]).getPresentableText(); - return InspectionGadgetsBundle.message("string.buffer.replaceable.by.string.problem.descriptor", typeText); + return InspectionGadgetsLocalize.stringBufferReplaceableByStringProblemDescriptor(typeText).get(); } @Override @@ -73,12 +72,9 @@ private StringBufferReplaceableByStringFix(boolean isStringBuilder) { @Nonnull @Override public String getName() { - if (isStringBuilder) { - return InspectionGadgetsBundle.message("string.builder.replaceable.by.string.quickfix"); - } - else { - return InspectionGadgetsBundle.message("string.buffer.replaceable.by.string.quickfix"); - } + return isStringBuilder + ? InspectionGadgetsLocalize.stringBuilderReplaceableByStringQuickfix().get() + : InspectionGadgetsLocalize.stringBufferReplaceableByStringQuickfix().get(); } @Override