From 2e269c30ea58544a0e361b1ac82ac84b540f3664 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 14 Feb 2020 14:33:47 +0300 Subject: [PATCH] [i18n] move some properties used in Java plugin only to JavaAnalysisBundle This is needed to reduce amount of platform properties which are included into all IDEs (IDEA-209382). GitOrigin-RevId: 642a6361f772d1611a5b24414764684a90ea046d --- .../messages/JavaAnalysisBundle.properties | 32 ++++++++++++++++++- .../daemon/impl/JavaServiceUtil.java | 6 ++-- .../actions/SuppressLocalWithCommentFix.java | 4 +-- .../impl/actions/SuppressParameterFix.java | 4 +-- .../AddTypeArgumentsConditionalFix.java | 4 +-- .../impl/quickfix/ChangeTypeArgumentsFix.java | 6 ++-- .../quickfix/ConvertDoubleToFloatFix.java | 4 +-- .../quickfix/DeleteRepeatedInterfaceFix.java | 6 ++-- .../quickfix/FlipIntersectionSidesFix.java | 6 ++-- .../daemon/impl/quickfix/MethodThrowsFix.java | 11 ++++--- .../QualifyThisOrSuperArgumentFix.java | 4 +-- .../impl/quickfix/QualifyWithThisFix.java | 4 +-- ...tFromVoidWithStatementIntentionAction.java | 4 +-- .../ReplaceGetClassWithClassLiteralFix.java | 4 +-- .../intention/AddAnnotationPsiFix.java | 9 +++--- .../RemoveAnnotationQuickFix.java | 4 +-- .../JavaClassFindUsagesOptions.java | 7 ++-- .../find/findUsages/JavaFindUsagesHelper.java | 4 +-- .../JavaMethodFindUsagesOptions.java | 8 ++--- .../daemon/impl/ServiceLineMarkerTest.kt | 5 +-- .../src/messages/CodeInsightBundle.properties | 21 ------------ .../src/messages/DaemonBundle.properties | 2 -- .../src/messages/FindBundle.properties | 7 ---- 23 files changed, 86 insertions(+), 80 deletions(-) diff --git a/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties b/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties index 82920e7816e9..c1f5e2c5e9b4 100644 --- a/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties +++ b/java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties @@ -1,6 +1,36 @@ +add.explicit.type.arguments=Add explicit type arguments +change.type.arguments=Change type arguments +change.type.arguments.to.0=Change type arguments to <{0}> +convert.0.to.float=Convert ''{0}'' to float +delete.repeated.0=Delete repeated ''{0}'' +delete.repeated.interface=Delete repeated interface +exception.removal.will.break.source.code.proceed.anyway=Exception removal will break source code. Proceed anyway? +find.searching.for.references.to.class.progress=Searching for references to class {0}... +find.usages.panel.title.derived.classes=Derived Classes +find.usages.panel.title.derived.interfaces=Derived Interfaces +find.usages.panel.title.implementing.classes=Implementing Classes +find.usages.panel.title.implementing.methods=Implementing Methods +find.usages.panel.title.overloaded.methods.usages=Overloaded Methods Usages +find.usages.panel.title.overriding.methods=Overriding Methods get.class.in.accessible.message.class.0.is.not.accessible.1=Class ''{0}'' is not accessible {1} get.class.in.accessible.message.from.module.0=from module ''{0}'' get.class.in.accessible.message.here=here +inspection.i18n.quickfix.annotate=Annotate... +inspection.i18n.quickfix.annotate.as=Annotate as @{0} +inspection.i18n.quickfix.annotate.element=Annotate {0} ''{1}''... +inspection.i18n.quickfix.annotate.element.as=Annotate {0} ''{1}'' as @{2} inspection.reference.default.package= -invalid.java.type=Invalid Java type \ No newline at end of file +invalid.java.type=Invalid Java type +move.0.to.the.beginning=Move ''{0}'' to the beginning +move.to.front=Move to front +processing.method.usages=Processing Method Usages... +qualify.0=Qualify {0} +qualify.with.0.this=Qualify with {0}.this +remove.annotation=Remove annotation +remove.left.side.of.assignment=Remove left side of assignment +replace.get.class.with.class.literal=Replace getClass() with .class literal +service.provides=Provides service {0}
Click to navigate
+service.uses=Uses service {0}
Click to navigate
+suppress.for.parameter=Suppress for parameter +suppress.for.statement.with.comment=Suppress for statement with comment \ No newline at end of file diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/JavaServiceUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/JavaServiceUtil.java index 9683813c0413..15aff9b9d96f 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/JavaServiceUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/JavaServiceUtil.java @@ -1,11 +1,11 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.codeInsight.daemon.impl; -import com.intellij.codeInsight.daemon.DaemonBundle; import com.intellij.codeInsight.daemon.GutterIconNavigationHandler; import com.intellij.codeInsight.daemon.LineMarkerInfo; import com.intellij.codeInsight.daemon.impl.analysis.JavaModuleGraphUtil; import com.intellij.icons.AllIcons; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.navigation.NavigationItem; import com.intellij.openapi.editor.markup.GutterIconRenderer; import com.intellij.psi.*; @@ -67,7 +67,7 @@ class JavaServiceUtil { if (interfaceClassName != null) { LineMarkerInfo info = new LineMarkerInfo<>(identifier, identifier.getTextRange(), AllIcons.Gutter.Java9Service, - e -> DaemonBundle.message("service.provides", interfaceClassName), + e -> JavaAnalysisBundle.message("service.provides", interfaceClassName), new ServiceProvidesNavigationHandler(interfaceClassName, implementerClassName), GutterIconRenderer.Alignment.LEFT); return Collections.singletonList(info); @@ -105,7 +105,7 @@ class JavaServiceUtil { if (usedClass != null && psiClass.equals(usedClass.resolve())) { LineMarkerInfo info = new LineMarkerInfo<>(identifier, identifier.getTextRange(), AllIcons.Gutter.Java9Service, - e -> DaemonBundle.message("service.uses", qualifiedName), + e -> JavaAnalysisBundle.message("service.uses", qualifiedName), new ServiceUsesNavigationHandler(qualifiedName), GutterIconRenderer.Alignment.LEFT); return Collections.singletonList(info); diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressLocalWithCommentFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressLocalWithCommentFix.java index 8b04a8694752..629f742960b1 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressLocalWithCommentFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressLocalWithCommentFix.java @@ -15,9 +15,9 @@ */ package com.intellij.codeInsight.daemon.impl.actions; -import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.daemon.HighlightDisplayKey; import com.intellij.codeInspection.JavaSuppressionUtil; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -46,6 +46,6 @@ public class SuppressLocalWithCommentFix extends SuppressByJavaCommentFix { @NotNull @Override public String getText() { - return CodeInsightBundle.message("suppress.for.statement.with.comment"); + return JavaAnalysisBundle.message("suppress.for.statement.with.comment"); } } diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressParameterFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressParameterFix.java index d0d385043ef5..5d92ae90b7e7 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressParameterFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressParameterFix.java @@ -15,9 +15,9 @@ */ package com.intellij.codeInsight.daemon.impl.actions; -import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.daemon.HighlightDisplayKey; import com.intellij.codeInspection.JavaSuppressionUtil; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiModifierList; @@ -46,7 +46,7 @@ public class SuppressParameterFix extends AbstractBatchSuppressByNoInspectionCom @Override @NotNull public String getText() { - return CodeInsightBundle.message("suppress.for.parameter"); + return JavaAnalysisBundle.message("suppress.for.parameter"); } @Nullable diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java index ec0a00e2cc44..888a0dc6bcb1 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsConditionalFix.java @@ -15,9 +15,9 @@ */ package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; @@ -46,7 +46,7 @@ public class AddTypeArgumentsConditionalFix implements IntentionAction { @NotNull @Override public String getText() { - return CodeInsightBundle.message("add.explicit.type.arguments"); + return JavaAnalysisBundle.message("add.explicit.type.arguments"); } @NotNull diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java index d5bb3d61e01b..fe4ca11f6a1b 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeTypeArgumentsFix.java @@ -1,11 +1,11 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.HighPriorityAction; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; @@ -45,7 +45,7 @@ public class ChangeTypeArgumentsFix implements IntentionAction, HighPriorityActi @NotNull public String getText() { final PsiSubstitutor substitutor = inferTypeArguments(); - return CodeInsightBundle.message("change.type.arguments.to.0", StringUtil.join(myPsiClass.getTypeParameters(), typeParameter -> { + return JavaAnalysisBundle.message("change.type.arguments.to.0", StringUtil.join(myPsiClass.getTypeParameters(), typeParameter -> { final PsiType substituted = substitutor.substitute(typeParameter); return substituted != null ? substituted.getPresentableText() : CommonClassNames.JAVA_LANG_OBJECT; }, ", ")); @@ -55,7 +55,7 @@ public class ChangeTypeArgumentsFix implements IntentionAction, HighPriorityActi @Override @NotNull public String getFamilyName() { - return CodeInsightBundle.message("change.type.arguments"); + return JavaAnalysisBundle.message("change.type.arguments"); } @Override diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertDoubleToFloatFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertDoubleToFloatFix.java index abcf0e849723..b07a79ced3b9 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertDoubleToFloatFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertDoubleToFloatFix.java @@ -15,10 +15,10 @@ */ package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; @@ -39,7 +39,7 @@ public class ConvertDoubleToFloatFix implements IntentionAction { @NotNull @Override public String getText() { - return CodeInsightBundle.message("convert.0.to.float", myExpression.getText()); + return JavaAnalysisBundle.message("convert.0.to.float", myExpression.getText()); } @NotNull diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteRepeatedInterfaceFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteRepeatedInterfaceFix.java index 251435b6bc29..7e5c32f3293e 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteRepeatedInterfaceFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteRepeatedInterfaceFix.java @@ -15,8 +15,8 @@ */ package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; @@ -41,13 +41,13 @@ public class DeleteRepeatedInterfaceFix implements IntentionAction { @NotNull @Override public String getText() { - return CodeInsightBundle.message("delete.repeated.0", myConjunct.getText()); + return JavaAnalysisBundle.message("delete.repeated.0", myConjunct.getText()); } @NotNull @Override public String getFamilyName() { - return CodeInsightBundle.message("delete.repeated.interface"); + return JavaAnalysisBundle.message("delete.repeated.interface"); } @Override diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FlipIntersectionSidesFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FlipIntersectionSidesFix.java index 1bd956f61600..6c7fad15bfa1 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FlipIntersectionSidesFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/FlipIntersectionSidesFix.java @@ -15,8 +15,8 @@ */ package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; @@ -50,13 +50,13 @@ public class FlipIntersectionSidesFix implements IntentionAction { @NotNull @Override public String getText() { - return CodeInsightBundle.message("move.0.to.the.beginning", myClassName); + return JavaAnalysisBundle.message("move.0.to.the.beginning", myClassName); } @NotNull @Override public String getFamilyName() { - return CodeInsightBundle.message("move.to.front"); + return JavaAnalysisBundle.message("move.to.front"); } @Override diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java index 13787aa3c1c7..bd7be605fafc 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java @@ -1,13 +1,13 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.ExceptionUtil; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInsight.javadoc.JavaDocUtil; import com.intellij.codeInspection.LocalQuickFixOnPsiElement; import com.intellij.find.findUsages.JavaFindUsagesHelper; import com.intellij.find.findUsages.JavaMethodFindUsagesOptions; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; @@ -23,7 +23,10 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; import java.util.stream.Stream; public abstract class MethodThrowsFix extends LocalQuickFixOnPsiElement { @@ -139,9 +142,9 @@ public abstract class MethodThrowsFix extends LocalQuickFixOnPsiElement { } } return true; - }), CodeInsightBundle.message("processing.method.usages"), true, project); + }), JavaAnalysisBundle.message("processing.method.usages"), true, project); - if (breakSourceCode && Messages.showYesNoDialog(project, CodeInsightBundle + if (breakSourceCode && Messages.showYesNoDialog(project, JavaAnalysisBundle .message("exception.removal.will.break.source.code.proceed.anyway"), RefactoringBundle.getCannotRefactorMessage(null), null) == Messages.NO) { return; } diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java index 430264a2a1f9..76722a86c378 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java @@ -16,8 +16,8 @@ package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; @@ -65,7 +65,7 @@ public abstract class QualifyThisOrSuperArgumentFix implements IntentionAction { @NotNull @Override public String getFamilyName() { - return CodeInsightBundle.message("qualify.0", getQualifierText()); + return JavaAnalysisBundle.message("qualify.0", getQualifierText()); } @Override diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyWithThisFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyWithThisFix.java index b4f98e32ce1b..941d3f71700e 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyWithThisFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyWithThisFix.java @@ -15,8 +15,8 @@ */ package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; @@ -36,7 +36,7 @@ public class QualifyWithThisFix implements IntentionAction { @NotNull @Override public String getText() { - return CodeInsightBundle.message("qualify.with.0.this", myContainingClass.getName()); + return JavaAnalysisBundle.message("qualify.with.0.this", myContainingClass.getName()); } @NotNull diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAssignmentFromVoidWithStatementIntentionAction.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAssignmentFromVoidWithStatementIntentionAction.java index 9ca03b87283b..749419dcbedc 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAssignmentFromVoidWithStatementIntentionAction.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAssignmentFromVoidWithStatementIntentionAction.java @@ -15,8 +15,8 @@ */ package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; @@ -46,7 +46,7 @@ public class ReplaceAssignmentFromVoidWithStatementIntentionAction implements In @NotNull @Override public String getFamilyName() { - return CodeInsightBundle.message("remove.left.side.of.assignment"); + return JavaAnalysisBundle.message("remove.left.side.of.assignment"); } @Override diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceGetClassWithClassLiteralFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceGetClassWithClassLiteralFix.java index b5628e8346ed..436920520494 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceGetClassWithClassLiteralFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceGetClassWithClassLiteralFix.java @@ -3,10 +3,10 @@ */ package com.intellij.codeInsight.daemon.impl.quickfix; -import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.HighPriorityAction; import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; @@ -59,7 +59,7 @@ public class ReplaceGetClassWithClassLiteralFix extends LocalQuickFixAndIntentio @NotNull @Override public String getFamilyName() { - return CodeInsightBundle.message("replace.get.class.with.class.literal"); + return JavaAnalysisBundle.message("replace.get.class.with.class.literal"); } public static void registerFix(PsiMethodCallExpression callExpression, HighlightInfo errorResult) { diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationPsiFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationPsiFix.java index 1558b365fc2c..5c729d2f37f2 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationPsiFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/intention/AddAnnotationPsiFix.java @@ -5,6 +5,7 @@ import com.intellij.codeInsight.*; import com.intellij.codeInsight.daemon.impl.analysis.AnnotationsHighlightUtil; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; import com.intellij.codeInspection.LocalQuickFixOnPsiElement; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.lang.findUsages.LanguageFindUsages; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.command.undo.UndoUtil; @@ -57,16 +58,16 @@ public class AddAnnotationPsiFix extends LocalQuickFixOnPsiElement { if (name != null) { String type = LanguageFindUsages.getType(modifierListOwner); if (shortName == null) { - return CodeInsightBundle.message("inspection.i18n.quickfix.annotate.element", type, name); + return JavaAnalysisBundle.message("inspection.i18n.quickfix.annotate.element", type, name); } - return CodeInsightBundle + return JavaAnalysisBundle .message("inspection.i18n.quickfix.annotate.element.as", type, name, shortName); } } if (shortName == null) { - return CodeInsightBundle.message("inspection.i18n.quickfix.annotate"); + return JavaAnalysisBundle.message("inspection.i18n.quickfix.annotate"); } - return CodeInsightBundle.message("inspection.i18n.quickfix.annotate.as", shortName); + return JavaAnalysisBundle.message("inspection.i18n.quickfix.annotate.as", shortName); } public static @Nullable PsiModifierListOwner getContainer(PsiFile file, int offset) { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/RemoveAnnotationQuickFix.java b/java/java-analysis-impl/src/com/intellij/codeInspection/RemoveAnnotationQuickFix.java index 0e3f16bc32dc..ee83f25dce9a 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/RemoveAnnotationQuickFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/RemoveAnnotationQuickFix.java @@ -2,10 +2,10 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.AnnotationUtil; -import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInspection.nullable.AnnotateOverriddenMethodParameterFix; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.project.Project; import com.intellij.psi.*; @@ -38,7 +38,7 @@ public class RemoveAnnotationQuickFix implements LocalQuickFix { @Override @NotNull public String getFamilyName() { - return CodeInsightBundle.message("remove.annotation"); + return JavaAnalysisBundle.message("remove.annotation"); } @Override diff --git a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaClassFindUsagesOptions.java b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaClassFindUsagesOptions.java index 8b0314c46303..e7c3713ae089 100644 --- a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaClassFindUsagesOptions.java +++ b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaClassFindUsagesOptions.java @@ -17,6 +17,7 @@ package com.intellij.find.findUsages; import com.intellij.find.FindBundle; import com.intellij.ide.util.PropertiesComponent; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.project.Project; import com.intellij.psi.search.SearchScope; import org.jetbrains.annotations.NotNull; @@ -73,13 +74,13 @@ public class JavaClassFindUsagesOptions extends JavaFindUsagesOptions { strings.add(FindBundle.message("find.usages.panel.title.usages")); } if (isDerivedClasses) { - strings.add(FindBundle.message("find.usages.panel.title.derived.classes")); + strings.add(JavaAnalysisBundle.message("find.usages.panel.title.derived.classes")); } if (isImplementingClasses) { - strings.add(FindBundle.message("find.usages.panel.title.implementing.classes")); + strings.add(JavaAnalysisBundle.message("find.usages.panel.title.implementing.classes")); } if (isDerivedInterfaces) { - strings.add(FindBundle.message("find.usages.panel.title.derived.interfaces")); + strings.add(JavaAnalysisBundle.message("find.usages.panel.title.derived.interfaces")); } } diff --git a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesHelper.java b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesHelper.java index a5523fd3461b..76457adf930f 100644 --- a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesHelper.java +++ b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesHelper.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.find.findUsages; -import com.intellij.find.FindBundle; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.lang.injection.InjectedLanguageManager; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; @@ -239,7 +239,7 @@ public class JavaFindUsagesHelper { for (final PsiClass aClass : classes) { if (progress != null) { String name = ReadAction.compute(aClass::getName); - progress.setText(FindBundle.message("find.searching.for.references.to.class.progress", name)); + progress.setText(JavaAnalysisBundle.message("find.searching.for.references.to.class.progress", name)); } ProgressManager.checkCanceled(); boolean success = ReferencesSearch.search(new ReferencesSearch.SearchParameters(aClass, options.searchScope, false, options.fastTrack)).forEach(new ReadActionProcessor() { diff --git a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaMethodFindUsagesOptions.java b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaMethodFindUsagesOptions.java index 4a4212760639..db589836fcfc 100644 --- a/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaMethodFindUsagesOptions.java +++ b/java/java-analysis-impl/src/com/intellij/find/findUsages/JavaMethodFindUsagesOptions.java @@ -1,8 +1,8 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.find.findUsages; -import com.intellij.find.FindBundle; import com.intellij.ide.util.PropertiesComponent; +import com.intellij.java.analysis.JavaAnalysisBundle; import com.intellij.openapi.project.Project; import com.intellij.psi.search.SearchScope; import org.jetbrains.annotations.NotNull; @@ -88,13 +88,13 @@ public class JavaMethodFindUsagesOptions extends JavaFindUsagesOptions { protected void addUsageTypes(@NotNull LinkedHashSet strings) { super.addUsageTypes(strings); if (isIncludeOverloadUsages) { - strings.add(FindBundle.message("find.usages.panel.title.overloaded.methods.usages")); + strings.add(JavaAnalysisBundle.message("find.usages.panel.title.overloaded.methods.usages")); } if (isImplementingMethods) { - strings.add(FindBundle.message("find.usages.panel.title.implementing.methods")); + strings.add(JavaAnalysisBundle.message("find.usages.panel.title.implementing.methods")); } if (isOverridingMethods) { - strings.add(FindBundle.message("find.usages.panel.title.overriding.methods")); + strings.add(JavaAnalysisBundle.message("find.usages.panel.title.overriding.methods")); } } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/ServiceLineMarkerTest.kt b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/ServiceLineMarkerTest.kt index e92b1dbd3682..6c3a2398ac4e 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/ServiceLineMarkerTest.kt +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/ServiceLineMarkerTest.kt @@ -5,6 +5,7 @@ import com.intellij.codeInsight.daemon.DaemonBundle import com.intellij.codeInsight.daemon.LineMarkerInfo import com.intellij.codeInsight.daemon.impl.JavaServiceUtil.ServiceNavigationHandler import com.intellij.icons.AllIcons +import com.intellij.java.analysis.JavaAnalysisBundle import com.intellij.psi.* import com.intellij.psi.util.PsiTreeUtil import com.intellij.testFramework.LightProjectDescriptor @@ -68,14 +69,14 @@ class ServiceLineMarkerTest : LightJavaCodeInsightFixtureTestCase() { val module = addModule("module foo.bar { uses foo.bar.MyService; provides foo.bar.MyService with foo.bar.impl.MyServiceImpl; }") addImplementer("public class MyServiceImpl implements MyService {\n @Override public void doWork() {}\n}") val file = addMain(text) - doTest(file, module, DaemonBundle.message("service.uses", "foo.bar.MyService"), + doTest(file, module, JavaAnalysisBundle.message("service.uses", "foo.bar.MyService"), "foo.bar.MyService", PsiUsesStatement::class.java) } private fun doTestImplementer(text: String) { val module = addModule("module foo.bar {\n provides foo.bar.MyService with foo.bar.impl.MyServiceImpl;\n}") val file = addImplementer(text) - doTest(file, module, DaemonBundle.message("service.provides", "foo.bar.MyService"), + doTest(file, module, JavaAnalysisBundle.message("service.provides", "foo.bar.MyService"), "foo.bar.impl.MyServiceImpl", PsiProvidesStatement::class.java) } diff --git a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties index 0c0f66dd8c70..be67202192df 100644 --- a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties +++ b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties @@ -462,10 +462,6 @@ livetemplate.description.surround.with.read.lock=Surround with ReadWriteLock.rea livetemplate.description.surround.with.write.lock=Surround with ReadWriteLock.writeLock quickfix.add.variable.text=Initialize variable ''{0}'' quickfix.add.variable.family.name=Initialize variable -inspection.i18n.quickfix.annotate.as=Annotate as @{0} -inspection.i18n.quickfix.annotate.element.as=Annotate {0} ''{1}'' as @{2} -inspection.i18n.quickfix.annotate=Annotate... -inspection.i18n.quickfix.annotate.element=Annotate {0} ''{1}''... disable.intention.action=Disable ''{0}'' enable.intention.action=Enable ''{0}'' under.construction.string=Under construction. @@ -520,7 +516,6 @@ static.class.initializer={0}class initializer intentions.category.ejb=EJB set.language.level=Set language level set.language.level.to.0=Set language level to {0} -remove.annotation=Remove annotation annotate.intention.chooser.title=Choose annotation to add deannotate.intention.action.text=Deannotate deannotate.intention.chooser.title=Choose annotation to delete @@ -685,23 +680,7 @@ action.presentation.DocumentationComponent.text=Edit Source action.presentation.LookupUi.text=action.presentation.LookupUi.text action.presentation.QuickFixPreviewPanelFactory.text=Fix partially action.presentation.QuickFixPreviewPanelFactory.text.suppress=Suppress -convert.0.to.float=Convert ''{0}'' to float -suppress.for.parameter=Suppress for parameter -exception.removal.will.break.source.code.proceed.anyway=Exception removal will break source code. Proceed anyway? -processing.method.usages=Processing Method Usages... -add.explicit.type.arguments=Add explicit type arguments -qualify.0=Qualify {0} -move.to.front=Move to front -move.0.to.the.beginning=Move ''{0}'' to the beginning -delete.repeated.interface=Delete repeated interface -delete.repeated.0=Delete repeated ''{0}'' -qualify.with.0.this=Qualify with {0}.this remove=Remove -replace.get.class.with.class.literal=Replace getClass() with .class literal -suppress.for.statement.with.comment=Suppress for statement with comment -remove.left.side.of.assignment=Remove left side of assignment -change.type.arguments=Change type arguments -change.type.arguments.to.0=Change type arguments to <{0}> process.duplicates=Process Duplicates swap.if.statements=Swap 'if' statements replace.static.import.with.qualified.access.to.0=Replace static import with qualified access to {0} diff --git a/platform/platform-resources-en/src/messages/DaemonBundle.properties b/platform/platform-resources-en/src/messages/DaemonBundle.properties index fcc6cf954d81..fc716fb99850 100644 --- a/platform/platform-resources-en/src/messages/DaemonBundle.properties +++ b/platform/platform-resources-en/src/messages/DaemonBundle.properties @@ -47,5 +47,3 @@ inspection.collapse.description=less... import.popup.text={0}? import.popup.multiple={0}? (multiple choices...) -service.provides=Provides service {0}
Click to navigate
-service.uses=Uses service {0}
Click to navigate
\ No newline at end of file diff --git a/platform/platform-resources-en/src/messages/FindBundle.properties b/platform/platform-resources-en/src/messages/FindBundle.properties index 59b3ba763082..36286f86fb55 100644 --- a/platform/platform-resources-en/src/messages/FindBundle.properties +++ b/platform/platform-resources-en/src/messages/FindBundle.properties @@ -57,14 +57,7 @@ recent.find.usages.action.title=Recent Find Usages recent.find.usages.action.nothing=No Recent Find Usages Entries find.usages.panel.title.separator=or find.usages.panel.title.usages=Usages -find.usages.panel.title.overloaded.methods.usages=Overloaded Methods Usages -find.usages.panel.title.derived.classes=Derived Classes -find.usages.panel.title.derived.interfaces=Derived Interfaces -find.usages.panel.title.implementing.classes=Implementing Classes -find.usages.panel.title.implementing.methods=Implementing Methods -find.usages.panel.title.overriding.methods=Overriding Methods find.usages.of.element_type.element_name.not.found.message=Usages of {0} {1} not found -find.searching.for.references.to.class.progress=Searching for references to class {0}... find.usage.view.no.usages.text=No usages found find.replace.in.project.dialog.title=Replace in Path find.replace.text.dialog.title=Replace Text