inspection tool window: cosmetics -- add "All" word to buttons text when multiple problems are selected

This commit is contained in:
Dmitry Batkovich
2016-03-01 10:27:13 +03:00
parent 86f04a02bc
commit 8174e25061
3 changed files with 7 additions and 14 deletions
@@ -682,7 +682,6 @@ public class DefaultInspectionToolPresentation implements ProblemDescriptionsPro
final QuickFixAction quickFixAction = result.get(clazz);
try {
String familyName = fix.getFamilyName();
familyName = !familyName.isEmpty() ? "\'" + familyName + "\'" : familyName;
((LocalQuickFixWrapper)quickFixAction)
.setText(InspectionsBundle.message("inspection.descriptor.provider.apply.fix", familyName));
}
@@ -74,7 +74,7 @@ public class QuickFixToolbar extends JPanel {
() -> getLabel(fixes, tree.getSelectionCount() == 1 ? (InspectionTreeNode)tree.getSelectionPath().getLastPathComponent() : null, problemCount), panels);
fill(getFixesPlacement(hasFixes, multipleDescriptors), () -> createFixPanel(fixes), panels);
fill(getSuppressPlacement(multipleDescriptors), () -> createSuppressionCombo(tree.getSelectedToolWrapper()
, tree.getSelectionPath(), project), panels);
, tree.getSelectionPaths(), project, multipleDescriptors), panels);
fill(multipleDescriptors && editor != null ? 1 : -1, () -> ActionManager.getInstance().createActionToolbar("", GoToSubsequentOccurrenceAction.createNextPreviousActions(
editor, descriptors), true).getComponent(), panels);
}
@@ -98,26 +98,20 @@ public class QuickFixToolbar extends JPanel {
return label;
}
@NotNull
private static JLabel createBulbIcon() {
final JLabel label = new JLabel(AllIcons.Actions.IntentionBulb);
label.setBorder(IdeBorderFactory.createEmptyBorder(0, 10, 0, 0));
return label;
}
private static JComponent createSuppressionCombo(@NotNull final InspectionToolWrapper toolWrapper,
@NotNull final TreePath path,
@NotNull final Project project) {
@NotNull final TreePath[] paths,
@NotNull final Project project,
boolean multipleDescriptors) {
final ComboBoxAction action = new ComboBoxAction() {
{
getTemplatePresentation().setText("Suppress");
getTemplatePresentation().setText(multipleDescriptors ? "Suppress All" : "Suppress");
}
@NotNull
@Override
protected DefaultActionGroup createPopupActionGroup(JComponent button) {
DefaultActionGroup group = new DefaultActionGroup();
group.addAll(new SuppressActionWrapper(project, toolWrapper, path).getChildren(null));
group.addAll(new SuppressActionWrapper(project, toolWrapper, paths).getChildren(null));
return group;
}
};
@@ -319,7 +319,7 @@ inspection.unused.symbol.check.parameters=Check &Parameters
inspection.results.for.profile.toolwindow.title=Results for Inspection Profile ''{0}''
inspection.export.results.invalidated.item=invalidated item
inspection.export.results.at.line=at line
inspection.descriptor.provider.apply.fix=Apply Fix {0}
inspection.descriptor.provider.apply.fix=Fix All: ''{0}''
inspection.export.results.capitalized.location=Location
inspection.export.results.extends.implements=Extends/implements