Skip to content

Commit 10e2bc5

Browse files
VISTALLVISTALL
committed
migrated from raw string to localize
1 parent c460e9e commit 10e2bc5

61 files changed

Lines changed: 508 additions & 548 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.

‎plugin/src/main/java/com/intellij/java/impl/codeInspection/compiler/JavacQuirksInspection.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@
2121
import consulo.language.editor.inspection.ProblemsHolder;
2222
import consulo.language.editor.inspection.localize.InspectionLocalize;
2323
import consulo.language.psi.PsiElementVisitor;
24+
import consulo.localize.LocalizeValue;
2425
import jakarta.annotation.Nonnull;
25-
import org.jetbrains.annotations.Nls;
2626

2727
@ExtensionImpl
2828
public class JavacQuirksInspection extends BaseLocalInspectionTool {
29-
@Nls @Nonnull
29+
@Nonnull
3030
@Override
31-
public String getGroupDisplayName() {
32-
return InspectionLocalize.groupNamesCompilerIssues().get();
31+
public LocalizeValue getGroupDisplayName() {
32+
return InspectionLocalize.groupNamesCompilerIssues();
3333
}
3434

35-
@Nls @Nonnull
35+
@Nonnull
3636
@Override
37-
public String getDisplayName() {
38-
return InspectionLocalize.inspectionCompilerJavacQuirksName().get();
37+
public LocalizeValue getDisplayName() {
38+
return InspectionLocalize.inspectionCompilerJavacQuirksName();
3939
}
4040

4141
@Nonnull

‎plugin/src/main/java/com/intellij/java/impl/codeInspection/concurrencyAnnotations/FieldAccessNotGuardedInspection.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,23 @@
2525
import consulo.language.psi.PsiElement;
2626
import consulo.language.psi.PsiElementVisitor;
2727
import consulo.language.psi.util.PsiTreeUtil;
28-
import jakarta.annotation.Nullable;
29-
import org.jetbrains.annotations.Nls;
30-
28+
import consulo.localize.LocalizeValue;
3129
import jakarta.annotation.Nonnull;
30+
import jakarta.annotation.Nullable;
3231

3332
@ExtensionImpl
3433
public class FieldAccessNotGuardedInspection extends BaseJavaLocalInspectionTool {
3534

3635
@Override
3736
@Nonnull
38-
public String getGroupDisplayName() {
39-
return InspectionLocalize.groupNamesConcurrencyAnnotationIssues().get();
37+
public LocalizeValue getGroupDisplayName() {
38+
return InspectionLocalize.groupNamesConcurrencyAnnotationIssues();
4039
}
4140

4241
@Override
43-
@Nls
4442
@Nonnull
45-
public String getDisplayName() {
46-
return "Unguarded field access";
43+
public LocalizeValue getDisplayName() {
44+
return LocalizeValue.localizeTODO("Unguarded field access");
4745
}
4846

4947
@Override

‎plugin/src/main/java/com/intellij/java/impl/codeInspection/concurrencyAnnotations/InstanceGuardedByStaticInspection.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,32 @@
1515
*/
1616
package com.intellij.java.impl.codeInspection.concurrencyAnnotations;
1717

18-
import consulo.annotation.component.ExtensionImpl;
19-
import consulo.language.editor.inspection.LocalInspectionToolSession;
20-
import consulo.language.editor.inspection.ProblemsHolder;
2118
import com.intellij.java.analysis.impl.codeInspection.BaseJavaLocalInspectionTool;
2219
import com.intellij.java.analysis.impl.codeInspection.concurrencyAnnotations.JCiPUtil;
2320
import com.intellij.java.language.psi.*;
24-
import consulo.language.editor.inspection.localize.InspectionLocalize;
25-
import consulo.language.psi.*;
2621
import com.intellij.java.language.psi.javadoc.PsiDocTag;
22+
import consulo.annotation.component.ExtensionImpl;
23+
import consulo.language.editor.inspection.LocalInspectionToolSession;
24+
import consulo.language.editor.inspection.ProblemsHolder;
25+
import consulo.language.editor.inspection.localize.InspectionLocalize;
26+
import consulo.language.psi.PsiElementVisitor;
2727
import consulo.language.psi.util.PsiTreeUtil;
28-
import org.jetbrains.annotations.Nls;
29-
28+
import consulo.localize.LocalizeValue;
3029
import jakarta.annotation.Nonnull;
3130

3231
@ExtensionImpl
3332
public class InstanceGuardedByStaticInspection extends BaseJavaLocalInspectionTool {
3433

3534
@Override
3635
@Nonnull
37-
public String getGroupDisplayName() {
38-
return InspectionLocalize.groupNamesConcurrencyAnnotationIssues().get();
36+
public LocalizeValue getGroupDisplayName() {
37+
return InspectionLocalize.groupNamesConcurrencyAnnotationIssues();
3938
}
4039

4140
@Override
42-
@Nls
4341
@Nonnull
44-
public String getDisplayName() {
45-
return "Instance member guarded by static field";
42+
public LocalizeValue getDisplayName() {
43+
return LocalizeValue.localizeTODO("Instance member guarded by static field");
4644
}
4745

4846
@Override

‎plugin/src/main/java/com/intellij/java/impl/codeInspection/inconsistentLanguageLevel/InconsistentLanguageLevelInspection.java‎

Lines changed: 105 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import consulo.language.psi.PsiElement;
3434
import consulo.language.psi.PsiElementVisitor;
3535
import consulo.language.util.ModuleUtilCore;
36+
import consulo.localize.LocalizeValue;
3637
import consulo.logging.Logger;
3738
import consulo.module.Module;
3839
import consulo.module.content.ModuleRootManager;
@@ -42,142 +43,113 @@
4243
import consulo.project.localize.ProjectLocalize;
4344
import consulo.ui.annotation.RequiredUIAccess;
4445
import jakarta.annotation.Nonnull;
45-
import org.jetbrains.annotations.Nls;
4646
import org.jetbrains.annotations.NonNls;
4747

4848
import java.util.HashSet;
4949
import java.util.Set;
5050

51-
public abstract class InconsistentLanguageLevelInspection extends GlobalInspectionTool
52-
{
53-
private static final Logger LOGGER = Logger.getInstance(InconsistentLanguageLevelInspection.class);
54-
55-
@Override
56-
public boolean isGraphNeeded()
57-
{
58-
return false;
59-
}
60-
61-
@Override
62-
@RequiredReadAction
63-
public void runInspection(
64-
@Nonnull AnalysisScope scope,
65-
@Nonnull InspectionManager manager,
66-
@Nonnull GlobalInspectionContext globalContext,
67-
@Nonnull ProblemDescriptionsProcessor problemProcessor,
68-
@Nonnull Object state
69-
)
70-
{
71-
final Set<Module> modules = new HashSet<>();
72-
scope.accept(new PsiElementVisitor()
73-
{
74-
@Override
75-
@RequiredReadAction
76-
public void visitElement(PsiElement element)
77-
{
78-
final Module module = ModuleUtilCore.findModuleForPsiElement(element);
79-
if (module != null)
80-
{
81-
modules.add(module);
82-
}
83-
}
84-
});
85-
86-
for (Module module : modules)
87-
{
88-
LanguageLevel languageLevel = EffectiveLanguageLevelUtil.getEffectiveLanguageLevel(module);
89-
90-
final RefModule refModule = globalContext.getRefManager().getRefModule(module);
91-
for (OrderEntry entry : ModuleRootManager.getInstance(module).getOrderEntries())
92-
{
93-
if (!(entry instanceof ModuleOrderEntry))
94-
{
95-
continue;
96-
}
97-
final Module dependantModule = ((ModuleOrderEntry) entry).getModule();
98-
if (dependantModule == null)
99-
{
100-
continue;
101-
}
102-
LanguageLevel dependantLanguageLevel = EffectiveLanguageLevelUtil.getEffectiveLanguageLevel(dependantModule);
103-
if (languageLevel.compareTo(dependantLanguageLevel) < 0)
104-
{
105-
final CommonProblemDescriptor problemDescriptor = manager.createProblemDescriptor(
106-
"Inconsistent language level settings: module " + module.getName() + " with language level " +
107-
languageLevel + " depends on module " + dependantModule.getName() + " with language level " + dependantLanguageLevel,
108-
new UnnecessaryModuleDependencyInspection.RemoveModuleDependencyFix(module, dependantModule),
109-
new OpenModuleSettingsFix(module)
110-
);
111-
problemProcessor.addProblemElement(refModule, problemDescriptor);
112-
}
113-
}
114-
}
115-
}
116-
117-
@Override
118-
public boolean isEnabledByDefault()
119-
{
120-
return false;
121-
}
122-
123-
@Override
124-
@Nls
125-
@Nonnull
126-
public String getGroupDisplayName()
127-
{
128-
return InspectionLocalize.groupNamesModularizationIssues().get();
129-
}
130-
131-
@Override
132-
@Nonnull
133-
public String getDisplayName()
134-
{
135-
return "Inconsistent language level settings";
136-
}
137-
138-
@Override
139-
@NonNls
140-
@Nonnull
141-
public String getShortName()
142-
{
143-
return "InconsistentLanguageLevel";
144-
}
145-
146-
private static class OpenModuleSettingsFix implements QuickFix
147-
{
148-
private final Module myModule;
149-
150-
private OpenModuleSettingsFix(Module module)
151-
{
152-
myModule = module;
153-
}
154-
155-
@Override
156-
@Nonnull
157-
public String getName()
158-
{
159-
return "Open module " + myModule.getName() + " settings";
160-
}
161-
162-
@Override
163-
@Nonnull
164-
public String getFamilyName()
165-
{
166-
return getName();
167-
}
168-
169-
@RequiredUIAccess
170-
@Override
171-
public void applyFix(@Nonnull Project project, @Nonnull CommonProblemDescriptor descriptor)
172-
{
173-
if (!myModule.isDisposed())
174-
{
175-
ShowSettingsUtil.getInstance().showProjectStructureDialog(
176-
project,
177-
projectStructureSelector ->
178-
projectStructureSelector.select(myModule.getName(), ProjectLocalize.modulesClasspathTitle().get(), true)
179-
);
180-
}
181-
}
182-
}
51+
public abstract class InconsistentLanguageLevelInspection extends GlobalInspectionTool {
52+
private static final Logger LOGGER = Logger.getInstance(InconsistentLanguageLevelInspection.class);
53+
54+
@Override
55+
public boolean isGraphNeeded() {
56+
return false;
57+
}
58+
59+
@Override
60+
@RequiredReadAction
61+
public void runInspection(
62+
@Nonnull AnalysisScope scope,
63+
@Nonnull InspectionManager manager,
64+
@Nonnull GlobalInspectionContext globalContext,
65+
@Nonnull ProblemDescriptionsProcessor problemProcessor,
66+
@Nonnull Object state
67+
) {
68+
final Set<Module> modules = new HashSet<>();
69+
scope.accept(new PsiElementVisitor() {
70+
@Override
71+
@RequiredReadAction
72+
public void visitElement(PsiElement element) {
73+
final Module module = ModuleUtilCore.findModuleForPsiElement(element);
74+
if (module != null) {
75+
modules.add(module);
76+
}
77+
}
78+
});
79+
80+
for (Module module : modules) {
81+
LanguageLevel languageLevel = EffectiveLanguageLevelUtil.getEffectiveLanguageLevel(module);
82+
83+
final RefModule refModule = globalContext.getRefManager().getRefModule(module);
84+
for (OrderEntry entry : ModuleRootManager.getInstance(module).getOrderEntries()) {
85+
if (!(entry instanceof ModuleOrderEntry)) {
86+
continue;
87+
}
88+
final Module dependantModule = ((ModuleOrderEntry) entry).getModule();
89+
if (dependantModule == null) {
90+
continue;
91+
}
92+
LanguageLevel dependantLanguageLevel = EffectiveLanguageLevelUtil.getEffectiveLanguageLevel(dependantModule);
93+
if (languageLevel.compareTo(dependantLanguageLevel) < 0) {
94+
final CommonProblemDescriptor problemDescriptor = manager.createProblemDescriptor(
95+
"Inconsistent language level settings: module " + module.getName() + " with language level " +
96+
languageLevel + " depends on module " + dependantModule.getName() + " with language level " + dependantLanguageLevel,
97+
new UnnecessaryModuleDependencyInspection.RemoveModuleDependencyFix(module, dependantModule),
98+
new OpenModuleSettingsFix(module)
99+
);
100+
problemProcessor.addProblemElement(refModule, problemDescriptor);
101+
}
102+
}
103+
}
104+
}
105+
106+
@Override
107+
public boolean isEnabledByDefault() {
108+
return false;
109+
}
110+
111+
@Override
112+
@Nonnull
113+
public LocalizeValue getGroupDisplayName() {
114+
return InspectionLocalize.groupNamesModularizationIssues();
115+
}
116+
117+
@Override
118+
@Nonnull
119+
public LocalizeValue getDisplayName() {
120+
return LocalizeValue.localizeTODO("Inconsistent language level settings");
121+
}
122+
123+
@Override
124+
@NonNls
125+
@Nonnull
126+
public String getShortName() {
127+
return "InconsistentLanguageLevel";
128+
}
129+
130+
private static class OpenModuleSettingsFix implements QuickFix {
131+
private final Module myModule;
132+
133+
private OpenModuleSettingsFix(Module module) {
134+
myModule = module;
135+
}
136+
137+
@Override
138+
@Nonnull
139+
public LocalizeValue getName() {
140+
return LocalizeValue.localizeTODO("Open module " + myModule.getName() + " settings");
141+
}
142+
143+
@RequiredUIAccess
144+
@Override
145+
public void applyFix(@Nonnull Project project, @Nonnull CommonProblemDescriptor descriptor) {
146+
if (!myModule.isDisposed()) {
147+
ShowSettingsUtil.getInstance().showProjectStructureDialog(
148+
project,
149+
projectStructureSelector ->
150+
projectStructureSelector.select(myModule.getName(), ProjectLocalize.modulesClasspathTitle().get(), true)
151+
);
152+
}
153+
}
154+
}
183155
}

0 commit comments

Comments
 (0)