Skip to content

Commit bea1cac

Browse files
VISTALLVISTALL
committed
working on migration to localize value instead raw string or bundle string !
1 parent 2976bdf commit bea1cac

251 files changed

Lines changed: 5131 additions & 5290 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-api/src/main/java/com/intellij/java/analysis/codeInspection/AbstractBaseJavaLocalInspectionTool.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import consulo.java.deadCodeNotWorking.OldStyleInspection;
2424
import consulo.language.Language;
2525
import consulo.language.editor.inspection.*;
26+
import consulo.language.editor.inspection.localize.InspectionLocalize;
2627
import consulo.language.editor.inspection.scheme.InspectionManager;
2728
import consulo.language.editor.rawHighlight.HighlightDisplayLevel;
2829
import consulo.language.psi.PsiElement;
@@ -31,6 +32,7 @@
3132
import consulo.language.psi.PsiNamedElement;
3233
import consulo.language.psi.util.PsiTreeUtil;
3334

35+
import consulo.localize.LocalizeValue;
3436
import jakarta.annotation.Nonnull;
3537
import jakarta.annotation.Nullable;
3638

@@ -173,8 +175,8 @@ public Language getLanguage() {
173175

174176
@Nonnull
175177
@Override
176-
public String getGroupDisplayName() {
177-
return "General";
178+
public LocalizeValue getGroupDisplayName() {
179+
return InspectionLocalize.inspectionGeneralToolsGroupName();
178180
}
179181

180182
@Nonnull

‎java-analysis-api/src/main/java/consulo/java/analysis/codeInspection/DeprecationUtil.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/*
2+
* Copyright 2000-2017 JetBrains s.r.o.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package consulo.java.analysis.codeInspection;
17+
18+
import consulo.language.editor.inspection.localize.InspectionLocalize;
19+
import consulo.localize.LocalizeValue;
20+
21+
public class DeprecationUtil {
22+
public static final String DEPRECATION_SHORT_NAME = "Deprecation";
23+
public static final LocalizeValue DEPRECATION_DISPLAY_NAME = InspectionLocalize.inspectionDeprecatedDisplayName();
24+
public static final String DEPRECATION_ID = "deprecation";
25+
26+
public static final String FOR_REMOVAL_SHORT_NAME = "MarkedForRemoval";
27+
public static final LocalizeValue FOR_REMOVAL_DISPLAY_NAME = InspectionLocalize.inspectionMarkedForRemovalDisplayName();
28+
public static final String FOR_REMOVAL_ID = "removal";
29+
}

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/actions/SuppressAllForClassFix.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import consulo.language.psi.PsiElement;
2727
import consulo.language.psi.util.PsiTreeUtil;
2828
import consulo.language.util.IncorrectOperationException;
29+
import consulo.localize.LocalizeValue;
2930
import consulo.logging.Logger;
3031
import consulo.project.Project;
3132
import jakarta.annotation.Nonnull;
@@ -62,8 +63,8 @@ public PsiDocCommentOwner getContainer(final PsiElement element) {
6263

6364
@Override
6465
@Nonnull
65-
public String getText() {
66-
return InspectionLocalize.suppressAllForClass().get();
66+
public LocalizeValue getText() {
67+
return InspectionLocalize.suppressAllForClass();
6768
}
6869

6970
@RequiredReadAction

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/actions/SuppressFix.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import consulo.language.psi.SyntheticElement;
3434
import consulo.language.psi.util.PsiTreeUtil;
3535
import consulo.language.util.IncorrectOperationException;
36+
import consulo.localize.LocalizeValue;
3637
import consulo.project.Project;
37-
import consulo.util.lang.StringUtil;
3838
import jakarta.annotation.Nonnull;
3939
import jakarta.annotation.Nullable;
4040

@@ -53,9 +53,9 @@ public SuppressFix(@Nonnull String ID) {
5353

5454
@Override
5555
@Nonnull
56-
public String getText() {
57-
String myText = super.getText();
58-
return StringUtil.isEmpty(myText) ? "Suppress for member" : myText;
56+
public LocalizeValue getText() {
57+
LocalizeValue text = super.getText();
58+
return text == LocalizeValue.of() ? LocalizeValue.localizeTODO("Suppress for member") : text;
5959
}
6060

6161
@Override
@@ -93,10 +93,10 @@ public boolean isAvailable(@Nonnull final Project project, @Nonnull final PsiEle
9393
}
9494
setText(
9595
container instanceof PsiClass
96-
? InspectionLocalize.suppressInspectionClass().get()
96+
? InspectionLocalize.suppressInspectionClass()
9797
: container instanceof PsiMethod
98-
? InspectionLocalize.suppressInspectionMethod().get()
99-
: InspectionLocalize.suppressInspectionField().get()
98+
? InspectionLocalize.suppressInspectionMethod()
99+
: InspectionLocalize.suppressInspectionField()
100100
);
101101
return true;
102102
}

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/actions/SuppressForClassFix.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import consulo.language.editor.rawHighlight.HighlightDisplayKey;
2424
import consulo.language.psi.PsiElement;
2525
import consulo.language.psi.util.PsiTreeUtil;
26+
import consulo.localize.LocalizeValue;
2627
import jakarta.annotation.Nonnull;
2728
import jakarta.annotation.Nullable;
2829

@@ -60,7 +61,7 @@ public PsiDocCommentOwner getContainer(final PsiElement element) {
6061

6162
@Override
6263
@Nonnull
63-
public String getText() {
64-
return InspectionLocalize.suppressInspectionClass().get();
64+
public LocalizeValue getText() {
65+
return InspectionLocalize.suppressInspectionClass();
6566
}
6667
}

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/actions/SuppressLocalWithCommentFix.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import consulo.language.editor.rawHighlight.HighlightDisplayKey;
1919
import com.intellij.java.analysis.impl.codeInspection.JavaSuppressionUtil;
20+
import consulo.localize.LocalizeValue;
2021
import consulo.project.Project;
2122
import consulo.language.psi.PsiElement;
2223
import consulo.language.util.IncorrectOperationException;
@@ -50,7 +51,7 @@ protected void createSuppression(@Nonnull Project project, @Nonnull PsiElement e
5051

5152
@Nonnull
5253
@Override
53-
public String getText() {
54-
return "Suppress for statement with comment";
54+
public LocalizeValue getText() {
55+
return LocalizeValue.localizeTODO("Suppress for statement with comment");
5556
}
5657
}

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/actions/SuppressParameterFix.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import consulo.language.editor.rawHighlight.HighlightDisplayKey;
1919
import consulo.language.editor.inspection.AbstractBatchSuppressByNoInspectionCommentFix;
2020
import com.intellij.java.analysis.impl.codeInspection.JavaSuppressionUtil;
21+
import consulo.localize.LocalizeValue;
2122
import consulo.project.Project;
2223
import consulo.language.psi.PsiElement;
2324
import com.intellij.java.language.psi.PsiModifierList;
@@ -43,8 +44,8 @@ public SuppressParameterFix(String ID) {
4344

4445
@Override
4546
@Nonnull
46-
public String getText() {
47-
return "Suppress for parameter";
47+
public LocalizeValue getText() {
48+
return LocalizeValue.localizeTODO("Suppress for parameter");
4849
}
4950

5051
@Nullable

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -925,8 +925,8 @@ private DeleteAnnotationAction(PsiAnnotation annotation) {
925925

926926
@Nonnull
927927
@Override
928-
public String getText() {
929-
return "Remove";
928+
public LocalizeValue getText() {
929+
return LocalizeValue.localizeTODO("Remove");
930930
}
931931

932932
@Override

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import consulo.language.psi.PsiFile;
2929
import consulo.language.util.IncorrectOperationException;
3030
import consulo.language.util.ModuleUtilCore;
31+
import consulo.localize.LocalizeValue;
3132
import consulo.logging.Logger;
3233
import consulo.module.Module;
3334
import consulo.module.content.ModuleRootManager;
@@ -52,8 +53,8 @@ public IncreaseLanguageLevelFix(LanguageLevel targetLevel) {
5253

5354
@Override
5455
@Nonnull
55-
public String getText() {
56-
return CodeInsightLocalize.setLanguageLevelTo0(myLevel.getDescription().get()).get();
56+
public LocalizeValue getText() {
57+
return CodeInsightLocalize.setLanguageLevelTo0(myLevel.getDescription().get());
5758
}
5859

5960
private static boolean isJdkSupportsLevel(@Nullable final Sdk jdk, final LanguageLevel level) {

‎java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/ModuleHighlightUtil.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,15 @@ public static HighlightInfo checkFileDuplicates(@Nonnull PsiJavaModule element,
126126
if (others.size() > 1) {
127127
HighlightInfo info = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
128128
.range(range(element))
129-
.descriptionAndTooltip(JavaErrorLocalize.moduleFileDuplicate().get())
129+
.descriptionAndTooltip(JavaErrorLocalize.moduleFileDuplicate())
130130
.create();
131131
others.stream()
132132
.map(f -> PsiManager.getInstance(project).findFile(f))
133133
.filter(f -> f != file)
134134
.findFirst()
135135
.ifPresent(duplicate -> QuickFixAction.registerQuickFixAction(
136136
info,
137-
new GoToSymbolFix(duplicate, JavaErrorLocalize.moduleOpenDuplicateText().get())
137+
new GoToSymbolFix(duplicate, JavaErrorLocalize.moduleOpenDuplicateText())
138138
));
139139
return info;
140140
}
@@ -254,12 +254,12 @@ private static String refText(PsiJavaCodeReferenceElement ref) {
254254
public static HighlightInfo checkFileLocation(@Nonnull PsiJavaModule element, @Nonnull PsiFile file) {
255255
VirtualFile vFile = file.getVirtualFile();
256256
if (vFile != null) {
257-
VirtualFile root = ProjectFileIndex.SERVICE.getInstance(file.getProject()).getSourceRootForFile(vFile);
257+
VirtualFile root = ProjectFileIndex.getInstance(file.getProject()).getSourceRootForFile(vFile);
258258
if (root != null && !root.equals(vFile.getParent())) {
259259
return HighlightInfo.newHighlightInfo(HighlightInfoType.WARNING)
260260
.range(range(element))
261261
.descriptionAndTooltip(JavaErrorLocalize.moduleFileWrongLocation())
262-
.registerFix(new MoveFileFix(vFile, root, JavaQuickFixLocalize.moveFileToSourceRootText().get()))
262+
.registerFix(new MoveFileFix(vFile, root, JavaQuickFixLocalize.moveFileToSourceRootText()))
263263
.create();
264264
}
265265
}

0 commit comments

Comments
 (0)