diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressAllForClassFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressAllForClassFix.java index d4abb6b235f4..2197706b1f14 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressAllForClassFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressAllForClassFix.java @@ -61,6 +61,12 @@ public class SuppressAllForClassFix extends SuppressFix { @Override @NotNull public String getText() { + return getFamilyName(); + } + + @NotNull + @Override + public String getFamilyName() { return InspectionsBundle.message("suppress.all.for.class"); } diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressFix.java index 8715882bd37a..6d3ae35dea34 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressFix.java @@ -19,7 +19,6 @@ import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInsight.daemon.HighlightDisplayKey; import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.JavaSuppressionUtil; -import com.intellij.codeInspection.SuppressionUtil; import com.intellij.codeInspection.SuppressionUtilCore; import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.command.undo.UndoUtil; @@ -55,7 +54,7 @@ public class SuppressFix extends AbstractBatchSuppressByNoInspectionCommentFix { @NotNull public String getText() { String myText = super.getText(); - return StringUtil.isEmpty(myText) ? "Suppress for member" : myText; + return StringUtil.isEmpty(myText) ? InspectionsBundle.message("suppress.inspection.member") : myText; } @Override @@ -101,6 +100,12 @@ public class SuppressFix extends AbstractBatchSuppressByNoInspectionCommentFix { UndoUtil.markPsiFileForUndo(element.getContainingFile()); } + @NotNull + @Override + public String getFamilyName() { + return InspectionsBundle.message("suppress.inspection.member"); + } + private boolean doSuppress(@NotNull Project project, PsiDocCommentOwner container) { assert container != null; if (!FileModificationService.getInstance().preparePsiElementForWrite(container)) return true; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressForClassFix.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressForClassFix.java index a24fd46960cb..614d852e7645 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressForClassFix.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressForClassFix.java @@ -58,6 +58,12 @@ public class SuppressForClassFix extends SuppressFix { @Override @NotNull public String getText() { + return getFamilyName(); + } + + @NotNull + @Override + public String getFamilyName() { return InspectionsBundle.message("suppress.inspection.class"); } } diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/AbstractBatchSuppressByNoInspectionCommentFix.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/AbstractBatchSuppressByNoInspectionCommentFix.java index 56188b949649..12d4083a6ca5 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/AbstractBatchSuppressByNoInspectionCommentFix.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/actions/AbstractBatchSuppressByNoInspectionCommentFix.java @@ -23,6 +23,7 @@ import com.intellij.lang.Language; import com.intellij.openapi.command.undo.UndoUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Iconable; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiComment; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiWhiteSpace; @@ -175,6 +176,7 @@ public abstract class AbstractBatchSuppressByNoInspectionCommentFix implements C @Override @NotNull public String getFamilyName() { - return InspectionsBundle.message("suppress.inspection.family"); + final String text = getText(); + return StringUtil.isEmpty(text) ? InspectionsBundle.message("suppress.inspection.family") : text; } } diff --git a/platform/platform-resources-en/src/messages/InspectionsBundle.properties b/platform/platform-resources-en/src/messages/InspectionsBundle.properties index 11899eae540d..8974f885daeb 100644 --- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties +++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties @@ -477,6 +477,7 @@ suppress.inspection.statement=Suppress for statement suppress.inspection.class=Suppress for class suppress.inspection.field=Suppress for field suppress.inspection.method=Suppress for method +suppress.inspection.member=Suppress for member inspection.options.action.text=Inspection ''{0}'' options edit.dependency.rules.family=Edit dependency rules edit.dependency.rules.text=Edit dependency rule \"{0} \"