Skip to content

Commit

Permalink
Merge pull request #120 from unv-unv/unv/inspection-gadgets-localize-8
Browse files Browse the repository at this point in the history 
InspectionGadgetsBundle → InspectionGadgetsLocalize (part 8).
  • Loading branch information
@VISTALL
VISTALL authored Jul 21, 2024
2 parents ede03a3 + 9bfb9ce commit 157d9a6
Show file tree
Hide file tree
Showing 50 changed files with 334 additions and 382 deletions.
8 changes: 3 additions & 5 deletions java-analysis-impl/src/main/java/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...main/resources/LOCALIZE-LIB/en_US/consulo.java.analysis.impl.JavaInspectionsLocalize.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
22 changes: 14 additions & 8 deletions ...in/java/com/intellij/java/impl/ig/abstraction/DeclareCollectionAsInterfaceInspection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -63,24 +63,30 @@ public String getID()
@Nonnull
public String getDisplayName()
{
return InspectionGadgetsBundle.message("collection.declared.by.class.display.name");
return InspectionGadgetsLocalize.collectionDeclaredByClassDisplayName().get();
}

@Override
@Nonnull
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
@Nullable
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;
}

Expand All @@ -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
Expand Down
33 changes: 24 additions & 9 deletions .../java/com/intellij/java/impl/ig/abstraction/StaticMethodOnlyUsedInOneClassInspection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand All @@ -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
Expand All @@ -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;
}

Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
22 changes: 9 additions & 13 deletions ...n/java/com/intellij/java/impl/ig/abstraction/StaticVariableOfConcreteClassInspection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand Down
8 changes: 3 additions & 5 deletions plugin/src/main/java/com/intellij/java/impl/ig/bugs/CovariantEqualsInspection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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() {
Expand Down
8 changes: 4 additions & 4 deletions plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedFormatStringInspection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
*/
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;
import com.siyeh.InspectionGadgetsBundle;
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
Expand All @@ -33,15 +33,15 @@ public class MalformedFormatStringInspection extends BaseInspection {
@Override
@Nonnull
public String getDisplayName() {
return InspectionGadgetsBundle.message("malformed.format.string.display.name");
return InspectionGadgetsLocalize.malformedFormatStringDisplayName().get();
}

@Override
@Nonnull
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();
Expand Down
14 changes: 5 additions & 9 deletions plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedRegexInspection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions plugin/src/main/java/com/intellij/java/impl/ig/bugs/MalformedXPathInspection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Loading

0 comments on commit 157d9a6

Please sign in to comment.