Skip to content

Commit 8ff5be4

Browse files
VISTALLVISTALL
committed
drop usage of InspectionGadgetsBundle
1 parent 2dfbb3f commit 8ff5be4

103 files changed

Lines changed: 2741 additions & 2772 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎java-analysis-impl/src/main/java/com/siyeh/InspectionGadgetsBundle.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
*/
1616
package com.siyeh;
1717

18+
import consulo.application.CommonBundle;
19+
import org.jetbrains.annotations.PropertyKey;
20+
1821
import java.lang.ref.Reference;
1922
import java.lang.ref.SoftReference;
2023
import java.util.ResourceBundle;
2124

22-
import org.jetbrains.annotations.NonNls;
23-
import org.jetbrains.annotations.PropertyKey;
24-
import consulo.application.CommonBundle;
25-
2625
/**
2726
* @author max
2827
*/
28+
@Deprecated
2929
public class InspectionGadgetsBundle {
3030
private static Reference<ResourceBundle> ourBundle;
3131

‎java-analysis-impl/src/main/java/com/siyeh/ig/bugs/EqualsWithItselfInspection.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.siyeh.ig.bugs;
1717

1818
import com.intellij.java.language.psi.*;
19-
import com.siyeh.InspectionGadgetsBundle;
2019
import com.siyeh.ig.BaseInspection;
2120
import com.siyeh.ig.BaseInspectionVisitor;
2221
import com.siyeh.ig.psiutils.EquivalenceChecker;

‎java-analysis-impl/src/main/resources/LOCALIZE-LIB/en_US/com.siyeh.InspectionGadgetsLocalize.yaml‎

Lines changed: 277 additions & 11 deletions
Large diffs are not rendered by default.

‎java-analysis-impl/testsrc/com/siyeh/ig/fixes/controlflow/SimplifiableEqualsExpressionFixTest.java‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,24 @@
1515
*/
1616
package com.siyeh.ig.fixes.controlflow;
1717

18-
import com.siyeh.InspectionGadgetsBundle;
1918
import com.siyeh.ig.IGQuickFixesTestCase;
2019
import com.siyeh.ig.controlflow.SimplifiableEqualsExpressionInspection;
2120
import com.siyeh.localize.InspectionGadgetsLocalize;
2221

2322
public class SimplifiableEqualsExpressionFixTest extends IGQuickFixesTestCase {
2423

25-
@Override
26-
protected void setUp() throws Exception {
27-
super.setUp();
28-
myFixture.enableInspections(new SimplifiableEqualsExpressionInspection());
29-
myRelativePath = "controlflow/simplifiable_equals_expression";
30-
}
24+
@Override
25+
protected void setUp() throws Exception {
26+
super.setUp();
27+
myFixture.enableInspections(new SimplifiableEqualsExpressionInspection());
28+
myRelativePath = "controlflow/simplifiable_equals_expression";
29+
}
3130

32-
public void testNormal() { doTest(InspectionGadgetsLocalize.simplifiableEqualsExpressionQuickfix("equals").get()); }
33-
public void testNegated() { doTest(InspectionGadgetsLocalize.simplifiableEqualsExpressionQuickfix("equalsIgnoreCase").get()); }
31+
public void testNormal() {
32+
doTest(InspectionGadgetsLocalize.simplifiableEqualsExpressionQuickfix("equals").get());
33+
}
34+
35+
public void testNegated() {
36+
doTest(InspectionGadgetsLocalize.simplifiableEqualsExpressionQuickfix("equalsIgnoreCase").get());
37+
}
3438
}

‎java-analysis-impl/testsrc/com/siyeh/ig/fixes/logging/StringConcatenationArgumentToLogCallFixTest.java‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,26 @@
1616

1717
package com.siyeh.ig.fixes.logging;
1818

19-
import com.siyeh.InspectionGadgetsBundle;
2019
import com.siyeh.ig.IGQuickFixesTestCase;
2120
import com.siyeh.ig.logging.StringConcatenationArgumentToLogCallInspection;
2221
import com.siyeh.localize.InspectionGadgetsLocalize;
2322

2423
public class StringConcatenationArgumentToLogCallFixTest extends IGQuickFixesTestCase {
25-
@Override
26-
public void setUp() throws Exception {
27-
super.setUp();
28-
myDefaultHint = InspectionGadgetsLocalize.stringConcatenationInFormatCallQuickfix().get();
29-
myFixture.addClass("package org.slf4j; public interface Logger { void info(String format); }");
30-
myFixture.addClass("package org.slf4j; public class LoggerFactory { public static Logger getLogger(Class clazz) { return null; }}");
31-
myFixture.enableInspections(new StringConcatenationArgumentToLogCallInspection());
32-
}
24+
@Override
25+
public void setUp() throws Exception {
26+
super.setUp();
27+
myDefaultHint = InspectionGadgetsLocalize.stringConcatenationInFormatCallQuickfix().get();
28+
myFixture.addClass("package org.slf4j; public interface Logger { void info(String format); }");
29+
myFixture.addClass("package org.slf4j; public class LoggerFactory { public static Logger getLogger(Class clazz) { return null; }}");
30+
myFixture.enableInspections(new StringConcatenationArgumentToLogCallInspection());
31+
}
3332

34-
public void testUseOfConstant() {
35-
doTest();
36-
}
37-
38-
@Override
39-
protected String getRelativePath() {
40-
return "logging/string_concatenation_argument_to_log_call";
41-
}
33+
public void testUseOfConstant() {
34+
doTest();
35+
}
36+
37+
@Override
38+
protected String getRelativePath() {
39+
return "logging/string_concatenation_argument_to_log_call";
40+
}
4241
}

‎java-analysis-impl/testsrc/com/siyeh/ig/fixes/migration/StringBufferReplaceableByStringBuilderFixTest.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,20 @@
1515
*/
1616
package com.siyeh.ig.fixes.migration;
1717

18-
import com.siyeh.InspectionGadgetsBundle;
1918
import com.siyeh.ig.IGQuickFixesTestCase;
2019
import com.siyeh.ig.migration.StringBufferReplaceableByStringBuilderInspection;
2120
import com.siyeh.localize.InspectionGadgetsLocalize;
2221

2322
public class StringBufferReplaceableByStringBuilderFixTest extends IGQuickFixesTestCase {
24-
@Override
25-
public void setUp() throws Exception {
26-
super.setUp();
27-
myFixture.enableInspections(new StringBufferReplaceableByStringBuilderInspection());
28-
myRelativePath = "stringBuffer_stringBuilder";
29-
myDefaultHint = InspectionGadgetsLocalize.stringBufferReplaceableByStringBuilderReplaceQuickfix().get();
30-
}
23+
@Override
24+
public void setUp() throws Exception {
25+
super.setUp();
26+
myFixture.enableInspections(new StringBufferReplaceableByStringBuilderInspection());
27+
myRelativePath = "stringBuffer_stringBuilder";
28+
myDefaultHint = InspectionGadgetsLocalize.stringBufferReplaceableByStringBuilderReplaceQuickfix().get();
29+
}
3130

32-
public void testCallChain() {
33-
doTest();
34-
}
31+
public void testCallChain() {
32+
doTest();
33+
}
3534
}

‎java-analysis-impl/testsrc/com/siyeh/ig/fixes/migration/UnnecessaryBoxingFixTest.java‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,27 @@
1515
*/
1616
package com.siyeh.ig.fixes.migration;
1717

18-
import com.siyeh.InspectionGadgetsBundle;
1918
import com.siyeh.ig.IGQuickFixesTestCase;
2019
import com.siyeh.ig.migration.UnnecessaryBoxingInspection;
2120
import com.siyeh.localize.InspectionGadgetsLocalize;
2221

2322
public class UnnecessaryBoxingFixTest extends IGQuickFixesTestCase {
24-
@Override
25-
protected void setUp() throws Exception {
26-
super.setUp();
27-
myFixture.enableInspections(new UnnecessaryBoxingInspection());
28-
}
23+
@Override
24+
protected void setUp() throws Exception {
25+
super.setUp();
26+
myFixture.enableInspections(new UnnecessaryBoxingInspection());
27+
}
2928

30-
public void testCast() {
31-
doFixTest();
32-
}
29+
public void testCast() {
30+
doFixTest();
31+
}
3332

34-
private void doFixTest() {
35-
doTest(getTestName(false), InspectionGadgetsLocalize.unnecessaryBoxingRemoveQuickfix().get());
36-
}
33+
private void doFixTest() {
34+
doTest(getTestName(false), InspectionGadgetsLocalize.unnecessaryBoxingRemoveQuickfix().get());
35+
}
3736

38-
@Override
39-
protected String getRelativePath() {
40-
return "migration/unnecessary_boxing";
41-
}
37+
@Override
38+
protected String getRelativePath() {
39+
return "migration/unnecessary_boxing";
40+
}
4241
}

‎plugin/src/main/java/com/intellij/java/impl/ig/abstraction/ClassReferencesSubclassInspection.java‎

Lines changed: 76 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package com.intellij.java.impl.ig.abstraction;
1717

1818
import com.intellij.java.language.psi.*;
19-
import com.siyeh.InspectionGadgetsBundle;
2019
import com.siyeh.ig.BaseInspection;
2120
import com.siyeh.ig.BaseInspectionVisitor;
2221
import com.siyeh.ig.psiutils.ClassUtils;
@@ -30,93 +29,91 @@
3029
@ExtensionImpl
3130
public class ClassReferencesSubclassInspection extends BaseInspection {
3231

33-
@Nonnull
34-
public LocalizeValue getDisplayName() {
35-
return InspectionGadgetsLocalize.classReferencesSubclassDisplayName();
36-
}
37-
38-
@Nonnull
39-
public String buildErrorString(Object... infos) {
40-
final PsiNamedElement element = (PsiNamedElement)infos[0];
41-
final String containingClassName = element.getName();
42-
final Boolean isAnonymous = (Boolean)infos[1];
43-
if (isAnonymous.booleanValue()) {
44-
return InspectionGadgetsBundle.message(
45-
"class.references.subclass.problem.descriptor.anonymous",
46-
containingClassName);
32+
@Nonnull
33+
public LocalizeValue getDisplayName() {
34+
return InspectionGadgetsLocalize.classReferencesSubclassDisplayName();
4735
}
48-
return InspectionGadgetsLocalize.classReferencesSubclassProblemDescriptor(containingClassName).get();
49-
}
50-
51-
public BaseInspectionVisitor buildVisitor() {
52-
return new ClassReferencesSubclassVisitor();
53-
}
5436

55-
private static class ClassReferencesSubclassVisitor extends BaseInspectionVisitor {
56-
@Override
57-
public void visitVariable(@Nonnull PsiVariable variable) {
58-
final PsiTypeElement typeElement = variable.getTypeElement();
59-
checkTypeElement(typeElement);
37+
@Nonnull
38+
public String buildErrorString(Object... infos) {
39+
final PsiNamedElement element = (PsiNamedElement) infos[0];
40+
final String containingClassName = element.getName();
41+
final Boolean isAnonymous = (Boolean) infos[1];
42+
if (isAnonymous.booleanValue()) {
43+
return InspectionGadgetsLocalize.classReferencesSubclassProblemDescriptorAnonymous().get();
44+
}
45+
return InspectionGadgetsLocalize.classReferencesSubclassProblemDescriptor(containingClassName).get();
6046
}
6147

62-
@Override
63-
public void visitMethod(@Nonnull PsiMethod method) {
64-
final PsiTypeElement typeElement = method.getReturnTypeElement();
65-
checkTypeElement(typeElement);
48+
public BaseInspectionVisitor buildVisitor() {
49+
return new ClassReferencesSubclassVisitor();
6650
}
6751

68-
@Override
69-
public void visitInstanceOfExpression(
70-
@Nonnull PsiInstanceOfExpression expression) {
71-
final PsiTypeElement typeElement = expression.getCheckType();
72-
checkTypeElement(typeElement);
73-
}
52+
private static class ClassReferencesSubclassVisitor extends BaseInspectionVisitor {
53+
@Override
54+
public void visitVariable(@Nonnull PsiVariable variable) {
55+
final PsiTypeElement typeElement = variable.getTypeElement();
56+
checkTypeElement(typeElement);
57+
}
7458

75-
@Override
76-
public void visitTypeCastExpression(
77-
@Nonnull PsiTypeCastExpression expression) {
78-
final PsiTypeElement typeElement = expression.getCastType();
79-
checkTypeElement(typeElement);
80-
}
59+
@Override
60+
public void visitMethod(@Nonnull PsiMethod method) {
61+
final PsiTypeElement typeElement = method.getReturnTypeElement();
62+
checkTypeElement(typeElement);
63+
}
8164

82-
@Override
83-
public void visitClassObjectAccessExpression(
84-
@Nonnull PsiClassObjectAccessExpression expression) {
85-
final PsiTypeElement typeElement = expression.getOperand();
86-
checkTypeElement(typeElement);
87-
}
65+
@Override
66+
public void visitInstanceOfExpression(
67+
@Nonnull PsiInstanceOfExpression expression) {
68+
final PsiTypeElement typeElement = expression.getCheckType();
69+
checkTypeElement(typeElement);
70+
}
8871

89-
private void checkTypeElement(PsiTypeElement typeElement) {
90-
if (typeElement == null) {
91-
return;
92-
}
93-
final PsiType type = typeElement.getType();
94-
final PsiType componentType = type.getDeepComponentType();
95-
if (!(componentType instanceof PsiClassType)) {
96-
return;
97-
}
98-
final PsiClassType classType = (PsiClassType)componentType;
99-
final PsiClass aClass = classType.resolve();
100-
if (aClass instanceof PsiTypeParameter) {
101-
return;
102-
}
103-
final PsiClass parentClass =
104-
ClassUtils.getContainingClass(typeElement);
105-
if (!isSubclass(aClass, parentClass)) {
106-
return;
107-
}
108-
registerError(typeElement, parentClass, Boolean.FALSE);
109-
}
72+
@Override
73+
public void visitTypeCastExpression(
74+
@Nonnull PsiTypeCastExpression expression) {
75+
final PsiTypeElement typeElement = expression.getCastType();
76+
checkTypeElement(typeElement);
77+
}
78+
79+
@Override
80+
public void visitClassObjectAccessExpression(
81+
@Nonnull PsiClassObjectAccessExpression expression) {
82+
final PsiTypeElement typeElement = expression.getOperand();
83+
checkTypeElement(typeElement);
84+
}
85+
86+
private void checkTypeElement(PsiTypeElement typeElement) {
87+
if (typeElement == null) {
88+
return;
89+
}
90+
final PsiType type = typeElement.getType();
91+
final PsiType componentType = type.getDeepComponentType();
92+
if (!(componentType instanceof PsiClassType)) {
93+
return;
94+
}
95+
final PsiClassType classType = (PsiClassType) componentType;
96+
final PsiClass aClass = classType.resolve();
97+
if (aClass instanceof PsiTypeParameter) {
98+
return;
99+
}
100+
final PsiClass parentClass =
101+
ClassUtils.getContainingClass(typeElement);
102+
if (!isSubclass(aClass, parentClass)) {
103+
return;
104+
}
105+
registerError(typeElement, parentClass, Boolean.FALSE);
106+
}
110107

111-
private static boolean isSubclass(@Nullable PsiClass childClass,
112-
@Nullable PsiClass parent) {
113-
if (childClass == null) {
114-
return false;
115-
}
116-
if (parent == null) {
117-
return false;
118-
}
119-
return childClass.isInheritor(parent, true);
108+
private static boolean isSubclass(@Nullable PsiClass childClass,
109+
@Nullable PsiClass parent) {
110+
if (childClass == null) {
111+
return false;
112+
}
113+
if (parent == null) {
114+
return false;
115+
}
116+
return childClass.isInheritor(parent, true);
117+
}
120118
}
121-
}
122119
}

‎plugin/src/main/java/com/intellij/java/impl/ig/abstraction/FeatureEnvyInspection.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.intellij.java.language.psi.PsiClass;
2020
import com.intellij.java.language.psi.PsiIdentifier;
2121
import com.intellij.java.language.psi.PsiMethod;
22-
import com.siyeh.InspectionGadgetsBundle;
2322
import com.siyeh.ig.BaseInspection;
2423
import com.siyeh.ig.BaseInspectionVisitor;
2524
import com.siyeh.ig.psiutils.TestUtils;
@@ -58,8 +57,7 @@ public String buildErrorString(Object... infos) {
5857
@Nullable
5958
public JComponent createOptionsPanel() {
6059
return new SingleCheckboxOptionsPanel(
61-
InspectionGadgetsBundle.message(
62-
"feature.envy.ignore.test.cases.option"), this,
60+
InspectionGadgetsLocalize.featureEnvyIgnoreTestCasesOption().get(), this,
6361
"ignoreTestCases");
6462
}
6563

0 commit comments

Comments
 (0)