Skip to content

Commit c105118

Browse files
VISTALLVISTALL
committed
migrate to localize value
1 parent 10548f4 commit c105118

26 files changed

Lines changed: 83 additions & 61 deletions

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/ExternalAnnotationsLineMarkerProvider.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import consulo.language.editor.intention.IntentionActionDelegate;
4444
import consulo.language.editor.intention.IntentionManager;
4545
import consulo.language.psi.*;
46+
import consulo.localize.LocalizeValue;
4647
import consulo.project.Project;
4748
import consulo.ui.annotation.RequiredUIAccess;
4849
import consulo.ui.ex.RelativePoint;
@@ -114,8 +115,8 @@ static PsiModifierListOwner getAnnotationOwner(@Nullable PsiElement element) {
114115

115116
@Nonnull
116117
@Override
117-
public String getName() {
118-
return "External annotations";
118+
public LocalizeValue getName() {
119+
return LocalizeValue.localizeTODO("External annotations");
119120
}
120121

121122
@Nullable

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/IconLineMarkerProvider.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import consulo.language.psi.PsiReference;
3434
import consulo.language.psi.PsiUtilCore;
3535
import consulo.language.psi.util.PsiTreeUtil;
36+
import consulo.localize.LocalizeValue;
3637
import consulo.project.Project;
3738
import consulo.ui.image.Image;
3839
import consulo.virtualFileSystem.VirtualFile;
@@ -141,8 +142,8 @@ public Image getIcon() {
141142

142143
@Nonnull
143144
@Override
144-
public String getName() {
145-
return "Icon preview";
145+
public LocalizeValue getName() {
146+
return LocalizeValue.localizeTODO("Icon preview");
146147
}
147148

148149
@Nonnull

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/JavaLineMarkerProvider.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,29 +67,29 @@
6767
@ExtensionImpl
6868
public class JavaLineMarkerProvider extends LineMarkerProviderDescriptor {
6969
public static final Option LAMBDA_OPTION =
70-
new Option("java.lambda", JavaLocalize.titleLambda().get(), PlatformIconGroup.gutterImplementingfunctionalinterface()) {
70+
new Option("java.lambda", JavaLocalize.titleLambda(), PlatformIconGroup.gutterImplementingfunctionalinterface()) {
7171
@Override
7272
public boolean isEnabledByDefault() {
7373
return false;
7474
}
7575
};
7676

7777
private final Option myOverriddenOption =
78-
new Option("java.overridden", JavaLocalize.gutterOverriddenMethod().get(), PlatformIconGroup.gutterOverridenmethod());
78+
new Option("java.overridden", JavaLocalize.gutterOverriddenMethod(), PlatformIconGroup.gutterOverridenmethod());
7979
private final Option myImplementedOption =
80-
new Option("java.implemented", JavaLocalize.gutterImplementedMethod().get(), PlatformIconGroup.gutterImplementedmethod());
80+
new Option("java.implemented", JavaLocalize.gutterImplementedMethod(), PlatformIconGroup.gutterImplementedmethod());
8181
private final Option myOverridingOption =
82-
new Option("java.overriding", JavaLocalize.gutterOverridingMethod().get(), PlatformIconGroup.gutterOverridingmethod());
82+
new Option("java.overriding", JavaLocalize.gutterOverridingMethod(), PlatformIconGroup.gutterOverridingmethod());
8383
private final Option myImplementingOption =
84-
new Option("java.implementing", JavaLocalize.gutterImplementingMethod().get(), PlatformIconGroup.gutterImplementingmethod());
84+
new Option("java.implementing", JavaLocalize.gutterImplementingMethod(), PlatformIconGroup.gutterImplementingmethod());
8585
private final Option mySiblingsOption =
8686
new Option(
8787
"java.sibling.inherited",
88-
JavaLocalize.gutterSiblingInheritedMethod().get(),
88+
JavaLocalize.gutterSiblingInheritedMethod(),
8989
PlatformIconGroup.gutterSiblinginheritedmethod()
9090
);
9191
private final Option myServiceOption =
92-
new Option("java.service", JavaLocalize.gutterService().get(), JavaPsiImplIconGroup.gutterJava9service());
92+
new Option("java.service", JavaLocalize.gutterService(), JavaPsiImplIconGroup.gutterJava9service());
9393

9494
protected final Application myApplication;
9595
protected final DaemonCodeAnalyzerSettings myDaemonSettings;
@@ -433,8 +433,8 @@ private List<LineMarkerInfo<PsiElement>> collectOverridingMethods(
433433
}
434434

435435
@Override
436-
public String getName() {
437-
return "Java line markers";
436+
public LocalizeValue getName() {
437+
return LocalizeValue.localizeTODO("Java line markers");
438438
}
439439

440440
@Override

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import consulo.language.editor.gutter.LineMarkerProviderDescriptor;
3030
import consulo.language.psi.PsiElement;
3131
import consulo.language.psi.util.PsiTreeUtil;
32+
import consulo.localize.LocalizeValue;
3233
import consulo.ui.ex.action.AnAction;
3334
import consulo.ui.image.Image;
3435
import consulo.util.lang.Comparing;
@@ -85,8 +86,8 @@ public static boolean isRecursiveMethodCall(@Nonnull PsiMethodCallExpression met
8586

8687
@Nonnull
8788
@Override
88-
public String getName() {
89-
return "Recursive call";
89+
public LocalizeValue getName() {
90+
return LocalizeValue.localizeTODO("Recursive call");
9091
}
9192

9293
@Nullable

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaExpressionSurrounder.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,17 @@
2121
import consulo.annotation.component.ComponentScope;
2222
import consulo.annotation.component.ExtensionAPI;
2323
import consulo.codeEditor.Editor;
24-
import consulo.component.extension.ExtensionPointName;
2524
import consulo.document.util.TextRange;
2625
import consulo.language.editor.surroundWith.Surrounder;
2726
import consulo.language.psi.PsiElement;
2827
import consulo.language.util.IncorrectOperationException;
2928
import consulo.logging.Logger;
3029
import consulo.project.Project;
31-
3230
import jakarta.annotation.Nonnull;
3331

3432
@ExtensionAPI(ComponentScope.APPLICATION)
3533
public abstract class JavaExpressionSurrounder implements Surrounder {
36-
public static ExtensionPointName<JavaExpressionSurrounder> EP_NAME = ExtensionPointName.create(JavaExpressionSurrounder.class);
37-
38-
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.surroundWith.SurroundExpressionHandler");
34+
private static final Logger LOG = Logger.getInstance(JavaExpressionSurrounder.class);
3935

4036
@Override
4137
public boolean isApplicable(@Nonnull PsiElement[] elements) {

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaWithBlockSurrounder.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.intellij.java.language.psi.PsiCodeBlock;
2222
import com.intellij.java.language.psi.PsiElementFactory;
2323
import consulo.codeEditor.Editor;
24+
import consulo.localize.LocalizeValue;
2425
import consulo.project.Project;
2526
import consulo.document.util.TextRange;
2627
import consulo.language.psi.*;
@@ -29,8 +30,8 @@
2930

3031
class JavaWithBlockSurrounder extends JavaStatementsSurrounder{
3132
@Override
32-
public String getTemplateDescription() {
33-
return "{ }";
33+
public LocalizeValue getTemplateDescription() {
34+
return LocalizeValue.localizeTODO("{ }");
3435
}
3536

3637
@Override

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaWithCastSurrounder.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import consulo.language.editor.localize.CodeInsightLocalize;
3030
import consulo.language.editor.template.*;
3131
import consulo.language.util.IncorrectOperationException;
32+
import consulo.localize.LocalizeValue;
3233
import consulo.project.Project;
3334
import org.jetbrains.annotations.NonNls;
3435

@@ -105,7 +106,7 @@ public Result calculateQuickResult(ExpressionContext context) {
105106
}
106107

107108
@Override
108-
public String getTemplateDescription() {
109-
return CodeInsightLocalize.surroundWithCastTemplate().get();
109+
public LocalizeValue getTemplateDescription() {
110+
return CodeInsightLocalize.surroundWithCastTemplate();
110111
}
111112
}

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaWithDoWhileSurrounder.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@
2626
import consulo.language.psi.PsiElement;
2727
import consulo.language.psi.PsiManager;
2828
import consulo.language.util.IncorrectOperationException;
29+
import consulo.localize.LocalizeValue;
2930
import consulo.project.Project;
3031
import org.jetbrains.annotations.NonNls;
3132

3233
class JavaWithDoWhileSurrounder extends JavaStatementsSurrounder{
3334
@Override
34-
public String getTemplateDescription() {
35-
return CodeInsightLocalize.surroundWithDowhileTemplate().get();
35+
public LocalizeValue getTemplateDescription() {
36+
return CodeInsightLocalize.surroundWithDowhileTemplate();
3637
}
3738

3839
@Override

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaWithForSurrounder.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@
2626
import consulo.language.psi.PsiElement;
2727
import consulo.language.psi.PsiManager;
2828
import consulo.language.util.IncorrectOperationException;
29+
import consulo.localize.LocalizeValue;
2930
import consulo.project.Project;
3031
import org.jetbrains.annotations.NonNls;
3132

3233
class JavaWithForSurrounder extends JavaStatementsSurrounder{
3334
@Override
34-
public String getTemplateDescription() {
35-
return CodeInsightLocalize.surroundWithForTemplate().get();
35+
public LocalizeValue getTemplateDescription() {
36+
return CodeInsightLocalize.surroundWithForTemplate();
3637
}
3738

3839
@Override

‎plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/surroundWith/JavaWithIfElseExpressionSurrounder.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import consulo.language.editor.localize.CodeInsightLocalize;
2626
import consulo.language.psi.PsiManager;
2727
import consulo.language.util.IncorrectOperationException;
28+
import consulo.localize.LocalizeValue;
2829
import consulo.project.Project;
2930
import org.jetbrains.annotations.NonNls;
3031

@@ -55,7 +56,7 @@ public TextRange surroundExpression(Project project, Editor editor, PsiExpressio
5556
}
5657

5758
@Override
58-
public String getTemplateDescription() {
59-
return CodeInsightLocalize.surroundWithIfelseExpressionTemplate().get();
59+
public LocalizeValue getTemplateDescription() {
60+
return CodeInsightLocalize.surroundWithIfelseExpressionTemplate();
6061
}
6162
}

0 commit comments

Comments
 (0)