Skip to content

Commit c0eefdc

Browse files
VISTALLVISTALL
committed
drop usage of IntentionPowerPackBundle - migrated to localize
1 parent 0ddbd2f commit c0eefdc

31 files changed

Lines changed: 617 additions & 376 deletions

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

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

18+
import consulo.application.CommonBundle;
19+
import org.jetbrains.annotations.NonNls;
20+
import org.jetbrains.annotations.PropertyKey;
21+
1822
import java.lang.ref.Reference;
1923
import java.lang.ref.SoftReference;
2024
import java.util.ResourceBundle;
2125

22-
import org.jetbrains.annotations.NonNls;
23-
import org.jetbrains.annotations.PropertyKey;
24-
import consulo.application.CommonBundle;
25-
2626
/**
2727
* @author max
2828
*/
29+
@Deprecated
2930
public class IntentionPowerPackBundle {
3031
private static Reference<ResourceBundle> ourBundle;
3132

‎plugin/src/main/java/com/intellij/java/impl/ipp/bool/FlipComparisonIntention.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.intellij.java.language.psi.PsiBinaryExpression;
2121
import com.intellij.java.language.psi.PsiExpression;
2222
import com.intellij.java.language.psi.PsiJavaToken;
23-
import com.siyeh.IntentionPowerPackBundle;
2423
import com.siyeh.ig.PsiReplacementUtil;
2524
import com.siyeh.ig.psiutils.ComparisonUtils;
2625
import com.siyeh.localize.IntentionPowerPackLocalize;

‎plugin/src/main/java/com/intellij/java/impl/ipp/fqnames/ReplaceFullyQualifiedNameWithImportIntention.java‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.intellij.java.impl.ipp.psiutils.HighlightUtil;
2222
import com.intellij.java.impl.ipp.psiutils.ImportUtils;
2323
import com.intellij.java.language.psi.*;
24-
import com.siyeh.IntentionPowerPackBundle;
2524
import com.siyeh.localize.IntentionPowerPackLocalize;
2625
import consulo.annotation.component.ExtensionImpl;
2726
import consulo.language.editor.intention.IntentionMetaData;
@@ -89,18 +88,7 @@ public void processIntention(@Nonnull PsiElement element) {
8988
final QualificationRemover qualificationRemover = new QualificationRemover(fullyQualifiedText);
9089
file.accept(qualificationRemover);
9190
final Collection<PsiJavaCodeReferenceElement> shortenedElements = qualificationRemover.getShortenedElements();
92-
final int elementCount = shortenedElements.size();
93-
final String text;
94-
if (elementCount == 1) {
95-
text = IntentionPowerPackBundle.message(
96-
"1.fully.qualified.name.status.bar.escape.highlighting.message");
97-
}
98-
else {
99-
text = IntentionPowerPackBundle.message(
100-
"multiple.fully.qualified.names.status.bar.escape.highlighting.message",
101-
Integer.valueOf(elementCount));
102-
}
103-
HighlightUtil.highlightElements(shortenedElements, text);
91+
HighlightUtil.highlightElements(shortenedElements);
10492
}
10593

10694
private static class QualificationRemover extends JavaRecursiveElementWalkingVisitor {

‎plugin/src/main/java/com/intellij/java/impl/ipp/initialization/SplitDeclarationAndInitializationIntention.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.intellij.java.impl.ipp.base.PsiElementPredicate;
2020
import com.intellij.java.impl.ipp.psiutils.HighlightUtil;
2121
import com.intellij.java.language.psi.*;
22-
import com.siyeh.IntentionPowerPackBundle;
2322
import com.siyeh.localize.IntentionPowerPackLocalize;
2423
import consulo.annotation.component.ExtensionImpl;
2524
import consulo.language.codeStyle.CodeStyleManager;
@@ -127,8 +126,6 @@ public void processIntention(@Nonnull PsiElement element)
127126
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(manager.getProject());
128127
codeStyleManager.reformat(field);
129128
codeStyleManager.reformat(classInitializer);
130-
HighlightUtil.highlightElement(addedElement,
131-
IntentionPowerPackBundle.message(
132-
"press.escape.to.remove.highlighting.message"));
129+
HighlightUtil.highlightElement(addedElement);
133130
}
134131
}

‎plugin/src/main/java/com/intellij/java/impl/ipp/modifiers/ModifierIntention.java‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.intellij.java.language.impl.psi.impl.source.resolve.JavaResolveUtil;
2222
import com.intellij.java.language.psi.*;
2323
import com.intellij.java.language.psi.search.searches.SuperMethodsSearch;
24-
import com.siyeh.IntentionPowerPackBundle;
24+
import com.siyeh.localize.IntentionPowerPackLocalize;
2525
import consulo.application.WriteAction;
2626
import consulo.application.util.query.Query;
2727
import consulo.language.editor.intention.LowPriorityAction;
@@ -96,11 +96,7 @@ private MultiMap<PsiElement, String> checkForConflicts(@Nonnull final PsiMember
9696
return MultiMap.empty();
9797
}
9898
final MultiMap<PsiElement, String> conflicts = new MultiMap();
99-
conflicts.putValue(aClass, IntentionPowerPackBundle.message(
100-
"0.is.declared.in.1.but.when.public.should.be.declared.in.a.file.named.2",
101-
RefactoringUIUtil.getDescription(aClass, false),
102-
RefactoringUIUtil.getDescription(javaFile, false),
103-
CommonRefactoringUtil.htmlEmphasize(className + ".java")));
99+
conflicts.putValue(aClass, IntentionPowerPackLocalize.zeroIsDeclaredIn1ButWhenPublicShouldBeDeclaredInAFileNamed2(RefactoringUIUtil.getDescription(aClass, false), RefactoringUIUtil.getDescription(javaFile, false), CommonRefactoringUtil.htmlEmphasize(className + ".java")).get());
104100
return conflicts;
105101
}
106102
final PsiModifierList modifierList = member.getModifierList();
@@ -113,25 +109,16 @@ private MultiMap<PsiElement, String> checkForConflicts(@Nonnull final PsiMember
113109
SuperMethodsSearch.search(method, method.getContainingClass(), true, false).forEach(methodSignature -> {
114110
final PsiMethod superMethod = methodSignature.getMethod();
115111
if (!hasCompatibleVisibility(superMethod, true)) {
116-
conflicts.putValue(superMethod, IntentionPowerPackBundle.message(
117-
"0.will.have.incompatible.access.privileges.with.super.1",
118-
RefactoringUIUtil.getDescription(method, false),
119-
RefactoringUIUtil.getDescription(superMethod, true)));
112+
conflicts.putValue(superMethod, IntentionPowerPackLocalize.zeroWillHaveIncompatibleAccessPrivilegesWithSuper1(RefactoringUIUtil.getDescription(method, false), RefactoringUIUtil.getDescription(superMethod, true)).get());
120113
}
121114
return true;
122115
});
123116
OverridingMethodsSearch.search(method).forEach(overridingMethod -> {
124117
if (!isVisibleFromOverridingMethod(method, overridingMethod)) {
125-
conflicts.putValue(overridingMethod, IntentionPowerPackBundle.message(
126-
"0.will.no.longer.be.visible.from.overriding.1",
127-
RefactoringUIUtil.getDescription(method, false),
128-
RefactoringUIUtil.getDescription(overridingMethod, true)));
118+
conflicts.putValue(overridingMethod, IntentionPowerPackLocalize.zeroWillNoLongerBeVisibleFromOverriding1(RefactoringUIUtil.getDescription(method, false), RefactoringUIUtil.getDescription(overridingMethod, true)).get());
129119
}
130120
else if (!hasCompatibleVisibility(overridingMethod, false)) {
131-
conflicts.putValue(overridingMethod, IntentionPowerPackBundle.message(
132-
"0.will.have.incompatible.access.privileges.with.overriding.1",
133-
RefactoringUIUtil.getDescription(method, false),
134-
RefactoringUIUtil.getDescription(overridingMethod, true)));
121+
conflicts.putValue(overridingMethod, IntentionPowerPackLocalize.zeroWillHaveIncompatibleAccessPrivilegesWithOverriding1(RefactoringUIUtil.getDescription(method, false), RefactoringUIUtil.getDescription(overridingMethod, true)).get());
135122
}
136123
return false;
137124
});

‎plugin/src/main/java/com/intellij/java/impl/ipp/psiutils/HighlightUtil.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ public class HighlightUtil {
4343
private HighlightUtil() {
4444
}
4545

46-
public static void highlightElements(
47-
@Nonnull final Collection<? extends PsiElement> elementCollection,
48-
@Nonnull final String statusBarText) {
46+
public static void highlightElements(@Nonnull final Collection<? extends PsiElement> elementCollection) {
4947
if (elementCollection.isEmpty()) {
5048
return;
5149
}
@@ -75,9 +73,9 @@ public static void highlightElements(
7573
});
7674
}
7775

78-
public static void highlightElement(@Nonnull PsiElement element, @Nonnull final String statusBarText) {
76+
public static void highlightElement(@Nonnull PsiElement element) {
7977
final List<PsiElement> elements = Collections.singletonList(element);
80-
highlightElements(elements, statusBarText);
78+
highlightElements(elements);
8179
}
8280

8381
@RequiredReadAction

‎plugin/src/test/java_/com/siyeh/ipp/bool/DemorgansIntentionTest.java‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,29 @@
1515
*/
1616
package com.siyeh.ipp.bool;
1717

18-
import com.siyeh.IntentionPowerPackBundle;
1918
import com.siyeh.ipp.IPPTestCase;
19+
import com.siyeh.localize.IntentionPowerPackLocalize;
2020

2121
public abstract class DemorgansIntentionTest extends IPPTestCase {
22-
public void testNeedsParentheses() { doTest(); }
23-
public void testNeedsMoreParentheses() { doTest(); }
24-
public void testNotTooManyParentheses() { doTest(); }
22+
public void testNeedsParentheses() {
23+
doTest();
24+
}
2525

26-
@Override
27-
protected String getIntentionName() {
28-
return IntentionPowerPackBundle.message("demorgans.intention.name2");
29-
}
26+
public void testNeedsMoreParentheses() {
27+
doTest();
28+
}
3029

31-
@Override
32-
protected String getRelativePath() {
33-
return "bool/demorgans";
34-
}
30+
public void testNotTooManyParentheses() {
31+
doTest();
32+
}
33+
34+
@Override
35+
protected String getIntentionName() {
36+
return IntentionPowerPackLocalize.demorgansIntentionName2().get();
37+
}
38+
39+
@Override
40+
protected String getRelativePath() {
41+
return "bool/demorgans";
42+
}
3543
}

‎plugin/src/test/java_/com/siyeh/ipp/commutative/FlipCommutativeMethodCallIntentionTest.java‎

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

18-
import com.siyeh.IntentionPowerPackBundle;
1918
import com.siyeh.ipp.IPPTestCase;
19+
import com.siyeh.localize.IntentionPowerPackLocalize;
2020

2121
public abstract class FlipCommutativeMethodCallIntentionTest extends IPPTestCase {
22-
public void testSubstitution() { doTest(); }
22+
public void testSubstitution() {
23+
doTest();
24+
}
2325

2426
@Override
2527
protected String getIntentionName() {
26-
return IntentionPowerPackBundle.message("flip.commutative.method.call.intention.name1", "foo");
28+
return IntentionPowerPackLocalize.flipCommutativeMethodCallIntentionName1("foo").get();
2729
}
2830

2931
@Override

‎plugin/src/test/java_/com/siyeh/ipp/concatenation/JoinConcatenatedStringLiteralsIntentionTest.java‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,36 @@
11
package com.siyeh.ipp.concatenation;
22

3-
import com.siyeh.IntentionPowerPackBundle;
43
import com.siyeh.ipp.IPPTestCase;
4+
import com.siyeh.localize.IntentionPowerPackLocalize;
55

66
public abstract class JoinConcatenatedStringLiteralsIntentionTest extends IPPTestCase {
7-
public void testSimple() { doTest(); }
8-
public void testPolyadic() { doTest(); }
9-
public void testNonString() { doTest(); }
10-
public void testNonString2() { doTest(); }
11-
public void testNotAvailable() { assertIntentionNotAvailable(); }
12-
public void testKeepCommentsAndWhitespace() { doTest(); }
7+
public void testSimple() {
8+
doTest();
9+
}
10+
11+
public void testPolyadic() {
12+
doTest();
13+
}
14+
15+
public void testNonString() {
16+
doTest();
17+
}
18+
19+
public void testNonString2() {
20+
doTest();
21+
}
22+
23+
public void testNotAvailable() {
24+
assertIntentionNotAvailable();
25+
}
26+
27+
public void testKeepCommentsAndWhitespace() {
28+
doTest();
29+
}
1330

1431
@Override
1532
protected String getIntentionName() {
16-
return IntentionPowerPackBundle.message(
17-
"join.concatenated.string.literals.intention.name");
33+
return IntentionPowerPackLocalize.joinConcatenatedStringLiteralsIntentionName().get();
1834
}
1935

2036
@Override

‎plugin/src/test/java_/com/siyeh/ipp/concatenation/MergeCallSequenceToChainIntentionTest.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11

22
package com.siyeh.ipp.concatenation;
33

4-
import com.siyeh.IntentionPowerPackBundle;
54
import com.siyeh.ipp.IPPTestCase;
5+
import com.siyeh.localize.IntentionPowerPackLocalize;
66

77
/**
88
* @author Bas Leijdekkers
99
*/
1010
public abstract class MergeCallSequenceToChainIntentionTest extends IPPTestCase {
1111

12-
public void testAppend() { doTest(); }
12+
public void testAppend() {
13+
doTest();
14+
}
1315

14-
@Override
15-
protected String getIntentionName() {
16-
return IntentionPowerPackBundle.message("merge.call.sequence.to.chain.intention.name");
17-
}
16+
@Override
17+
protected String getIntentionName() {
18+
return IntentionPowerPackLocalize.mergeCallSequenceToChainIntentionName().get();
19+
}
1820

19-
@Override
20-
protected String getRelativePath() {
21-
return "concatenation/merge_sequence";
22-
}
21+
@Override
22+
protected String getRelativePath() {
23+
return "concatenation/merge_sequence";
24+
}
2325
}

0 commit comments

Comments
 (0)