diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/InterruptThreadAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/InterruptThreadAction.java index 99a3516b9f01..bc1c062e8a2a 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/InterruptThreadAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/InterruptThreadAction.java @@ -92,7 +92,7 @@ public class InterruptThreadAction extends DebuggerAction{ } } final Presentation presentation = e.getPresentation(); - presentation.setText(DebuggerBundle.message("action.interrupt.thread.text")); + presentation.setText(() -> DebuggerBundle.message("action.interrupt.thread.text")); presentation.setEnabledAndVisible(visible && enabled); } } diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java index 01d540b687da..6efd5f03d3bd 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java @@ -92,7 +92,7 @@ public class ToggleFieldBreakpointAction extends AnAction { presentation.setVisible(toEnable); } else if(DebuggerAction.isContextView(event)) { - presentation.setText(DebuggerBundle.message("action.add.field.watchpoint.text")); + presentation.setText(() -> DebuggerBundle.message("action.add.field.watchpoint.text")); Project project = event.getData(CommonDataKeys.PROJECT); if(project != null && place != null) { Document document = PsiDocumentManager.getInstance(project).getDocument(place.getFile()); diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ViewTextAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/ViewTextAction.java index 3a66eb2fc6a1..1d16cf136278 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/ViewTextAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/ViewTextAction.java @@ -59,7 +59,7 @@ public class ViewTextAction extends XFetchValueActionBase { public void update(@NotNull AnActionEvent e) { super.update(e); if (getStringNode(e) != null) { - e.getPresentation().setText(ActionsBundle.message("action.Debugger.ViewEditText.text")); + e.getPresentation().setText(() -> ActionsBundle.message("action.Debugger.ViewEditText.text")); } } diff --git a/java/idea-ui/src/com/intellij/ide/actions/TemplateProjectStructureAction.java b/java/idea-ui/src/com/intellij/ide/actions/TemplateProjectStructureAction.java index cf35f329c21a..e08c1f8f46e7 100644 --- a/java/idea-ui/src/com/intellij/ide/actions/TemplateProjectStructureAction.java +++ b/java/idea-ui/src/com/intellij/ide/actions/TemplateProjectStructureAction.java @@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull; public class TemplateProjectStructureAction extends ShowStructureSettingsAction { public TemplateProjectStructureAction() { String projectConceptName = StringUtil.capitalize(IdeUICustomization.getInstance().getProjectConceptName()); - getTemplatePresentation().setText(ActionsBundle.message("action.TemplateProjectStructure.text.template", projectConceptName)); + getTemplatePresentation().setText(() -> ActionsBundle.message("action.TemplateProjectStructure.text.template", projectConceptName)); getTemplatePresentation().setDescription(ActionsBundle.message("action.TemplateProjectStructure.description.template", projectConceptName)); } diff --git a/java/idea-ui/src/com/intellij/openapi/externalSystem/action/AttachExternalProjectAction.java b/java/idea-ui/src/com/intellij/openapi/externalSystem/action/AttachExternalProjectAction.java index 28672b7f104c..90ffcd219663 100644 --- a/java/idea-ui/src/com/intellij/openapi/externalSystem/action/AttachExternalProjectAction.java +++ b/java/idea-ui/src/com/intellij/openapi/externalSystem/action/AttachExternalProjectAction.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; public class AttachExternalProjectAction extends DumbAwareAction { public AttachExternalProjectAction() { - getTemplatePresentation().setText(ExternalSystemBundle.message("action.attach.external.project.text", "External")); + getTemplatePresentation().setText(() -> ExternalSystemBundle.message("action.attach.external.project.text", "External")); getTemplatePresentation().setDescription(ExternalSystemBundle.message("action.attach.external.project.description", "external")); } @@ -34,7 +34,7 @@ public class AttachExternalProjectAction extends DumbAwareAction { ProjectSystemId externalSystemId = e.getData(ExternalSystemDataKeys.EXTERNAL_SYSTEM_ID); if (externalSystemId != null) { String name = externalSystemId.getReadableName(); - presentation.setText(ExternalSystemBundle.message("action.attach.external.project.text", name)); + presentation.setText(() -> ExternalSystemBundle.message("action.attach.external.project.text", name)); presentation.setDescription(ExternalSystemBundle.message("action.attach.external.project.description", name)); } diff --git a/platform/execution-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java b/platform/execution-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java index cf62f9503b89..65bcfcba3ee4 100644 --- a/platform/execution-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java +++ b/platform/execution-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java @@ -34,7 +34,7 @@ public class EditRunConfigurationsAction extends DumbAwareAction { Project project = e.getProject(); presentation.setEnabled(project == null || !DumbService.isDumb(project)); if (ActionPlaces.RUN_CONFIGURATIONS_COMBOBOX.equals(e.getPlace())) { - presentation.setText(ExecutionBundle.message("edit.configuration.action")); + presentation.setText(() -> ExecutionBundle.message("edit.configuration.action")); presentation.setDescription(presentation.getText()); } } diff --git a/platform/execution-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java b/platform/execution-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java index 2c65e9847a28..f87ec7db740d 100644 --- a/platform/execution-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java +++ b/platform/execution-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java @@ -254,7 +254,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D disable(presentation); } else { - presentation.setText(ExecutionBundle.message("save.temporary.run.configuration.action.name", Executor.shortenNameIfNeeded(settings.getName()))); + presentation.setText(() -> ExecutionBundle.message("save.temporary.run.configuration.action.name", Executor.shortenNameIfNeeded(settings.getName()))); presentation.setDescription(presentation.getText()); presentation.setEnabledAndVisible(true); } diff --git a/platform/execution-impl/src/com/intellij/execution/actions/StopAction.java b/platform/execution-impl/src/com/intellij/execution/actions/StopAction.java index 4148681ab4f6..df749c4dd051 100644 --- a/platform/execution-impl/src/com/intellij/execution/actions/StopAction.java +++ b/platform/execution-impl/src/com/intellij/execution/actions/StopAction.java @@ -57,7 +57,7 @@ public class StopAction extends DumbAwareAction implements AnAction.TransparentU icon = IconUtil.addText(icon, String.valueOf(stopCount)); } else if (stopCount == 1) { - presentation.setText(ExecutionBundle.message("stop.configuration.action.name", + presentation.setText(() -> ExecutionBundle.message("stop.configuration.action.name", StringUtil.escapeMnemonics( StringUtil.notNullize(stoppableDescriptors.get(0).getDisplayName())))); } @@ -81,7 +81,7 @@ public class StopAction extends DumbAwareAction implements AnAction.TransparentU presentation.setText(getTemplatePresentation().getText()); } else { - presentation.setText(ExecutionBundle.message("stop.configuration.action.name", + presentation.setText(() -> ExecutionBundle.message("stop.configuration.action.name", StringUtil.escapeMnemonics(runProfile == null ? StringUtil.notNullize(contentDescriptor.getDisplayName()) : runProfile.getName()))); diff --git a/platform/execution-impl/src/com/intellij/execution/runners/FakeRerunAction.java b/platform/execution-impl/src/com/intellij/execution/runners/FakeRerunAction.java index 23052aaf7b83..5c42119fc31d 100644 --- a/platform/execution-impl/src/com/intellij/execution/runners/FakeRerunAction.java +++ b/platform/execution-impl/src/com/intellij/execution/runners/FakeRerunAction.java @@ -26,7 +26,7 @@ public class FakeRerunAction extends AnAction { Presentation presentation = event.getPresentation(); ExecutionEnvironment environment = getEnvironment(event); if (environment != null) { - presentation.setText(ExecutionBundle.message("rerun.configuration.action.name", + presentation.setText(() -> ExecutionBundle.message("rerun.configuration.action.name", StringUtil.escapeMnemonics(environment.getRunProfile().getName()))); presentation.setIcon( ActionPlaces.TOUCHBAR_GENERAL.equals(event.getPlace()) || ExecutionManagerImpl.isProcessRunning(getDescriptor(event)) ? diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/DetachExternalProjectAction.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/DetachExternalProjectAction.java index 47179e990a99..1d83bc6c443c 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/DetachExternalProjectAction.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/DetachExternalProjectAction.java @@ -29,7 +29,7 @@ public class DetachExternalProjectAction extends ExternalSystemNodeAction ExternalSystemBundle.message("action.detach.external.project.text", "External")); getTemplatePresentation().setDescription(ExternalSystemBundle.message("action.detach.external.project.description")); getTemplatePresentation().setIcon(AllIcons.General.Remove); } @@ -42,7 +42,7 @@ public class DetachExternalProjectAction extends ExternalSystemNodeAction ExternalSystemBundle.message("action.detach.external.project.text", systemIdName)); } @Override @@ -58,7 +58,7 @@ public class DetachExternalProjectAction extends ExternalSystemNodeAction ExternalSystemBundle.message("action.detach.external.project.text", projectSystemId.getReadableName()) ); final ProjectNode projectNode = e.getData(ExternalSystemDataKeys.SELECTED_PROJECT_NODE); diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/IgnoreExternalProjectAction.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/IgnoreExternalProjectAction.java index d6b9720e606a..3d35ed3651e0 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/IgnoreExternalProjectAction.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/IgnoreExternalProjectAction.java @@ -38,7 +38,7 @@ public class IgnoreExternalProjectAction extends ExternalSystemToggleAction { private static final Logger LOG = Logger.getInstance(IgnoreExternalProjectAction.class); public IgnoreExternalProjectAction() { - getTemplatePresentation().setText(ExternalSystemBundle.message("action.ignore.external.projects.text", "External", 1)); + getTemplatePresentation().setText(() -> ExternalSystemBundle.message("action.ignore.external.projects.text", "External", 1)); getTemplatePresentation() .setDescription(ExternalSystemBundle.message("action.ignore.external.projects.description", "external", 1)); } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/OpenExternalConfigAction.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/OpenExternalConfigAction.java index 35d5dfcb6a0c..f4049ccf65da 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/OpenExternalConfigAction.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/OpenExternalConfigAction.java @@ -19,7 +19,7 @@ public class OpenExternalConfigAction extends ExternalSystemNodeAction ExternalSystemBundle.message("action.open.config.text", "External")); getTemplatePresentation().setDescription(ExternalSystemBundle.message("action.open.config.description", "external")); } @@ -34,7 +34,7 @@ public class OpenExternalConfigAction extends ExternalSystemNodeAction ExternalSystemBundle.message("action.open.config.text", externalSystemId.getReadableName())); e.getPresentation().setDescription(ExternalSystemBundle.message("action.open.config.description", externalSystemId.getReadableName())); final ExternalSystemUiAware uiAware = getExternalSystemUiAware(e); if (uiAware != null) { diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/OpenTasksActivationManagerAction.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/OpenTasksActivationManagerAction.java index 2961eb623562..ac90711b3b24 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/OpenTasksActivationManagerAction.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/OpenTasksActivationManagerAction.java @@ -25,7 +25,7 @@ public class OpenTasksActivationManagerAction extends ExternalSystemNodeAction ExternalSystemBundle.message("external.system.task.activation.title")); getTemplatePresentation().setDescription( ExternalSystemBundle.message("external.system.task.activation.description", "external system")); } @@ -38,7 +38,7 @@ public class OpenTasksActivationManagerAction extends ExternalSystemNodeAction ExternalSystemBundle.message("external.system.task.activation.title")); e.getPresentation().setDescription( ExternalSystemBundle.message("external.system.task.activation.description", projectSystemId.getReadableName())); final boolean isProjectNode = externalData instanceof ProjectData || externalData instanceof ModuleData; diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/RefreshAllExternalProjectsAction.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/RefreshAllExternalProjectsAction.java index 6f1c83b98b92..627357603226 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/RefreshAllExternalProjectsAction.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/RefreshAllExternalProjectsAction.java @@ -30,7 +30,7 @@ import java.util.List; */ public class RefreshAllExternalProjectsAction extends AnAction implements AnAction.TransparentUpdate, DumbAware { public RefreshAllExternalProjectsAction() { - getTemplatePresentation().setText(ExternalSystemBundle.message("action.refresh.all.projects.text", "External")); + getTemplatePresentation().setText(() -> ExternalSystemBundle.message("action.refresh.all.projects.text", "External")); getTemplatePresentation().setDescription(ExternalSystemBundle.message("action.refresh.all.projects.description", "external")); } @@ -49,7 +49,7 @@ public class RefreshAllExternalProjectsAction extends AnAction implements AnActi } final String name = StringUtil.join(systemIds, projectSystemId -> projectSystemId.getReadableName(), ","); - e.getPresentation().setText(ExternalSystemBundle.message("action.refresh.all.projects.text", name)); + e.getPresentation().setText(() -> ExternalSystemBundle.message("action.refresh.all.projects.text", name)); e.getPresentation().setDescription(ExternalSystemBundle.message("action.refresh.all.projects.description", name)); ExternalSystemProcessingManager processingManager = ServiceManager.getService(ExternalSystemProcessingManager.class); diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/RefreshExternalProjectAction.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/RefreshExternalProjectAction.java index 17e2e95c34a1..3a74872084d2 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/RefreshExternalProjectAction.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/RefreshExternalProjectAction.java @@ -32,7 +32,7 @@ import java.util.List; public class RefreshExternalProjectAction extends ExternalSystemNodeAction implements DumbAware { public RefreshExternalProjectAction() { super(AbstractExternalEntityData.class); - getTemplatePresentation().setText(ExternalSystemBundle.message("action.refresh.project.text", "External")); + getTemplatePresentation().setText(() -> ExternalSystemBundle.message("action.refresh.project.text", "External")); getTemplatePresentation().setDescription(ExternalSystemBundle.message("action.refresh.project.description", "External")); } @@ -45,7 +45,7 @@ public class RefreshExternalProjectAction extends ExternalSystemNodeAction ExternalSystemBundle.message("action.refresh.project.text", systemIdNameText)); presentation.setDescription(ExternalSystemBundle.message("action.refresh.project.description", systemIdNameDescription)); } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/ShowExternalSystemSettingsAction.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/ShowExternalSystemSettingsAction.java index fcdcb3aaa023..cf6266330399 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/ShowExternalSystemSettingsAction.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/ShowExternalSystemSettingsAction.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull; public class ShowExternalSystemSettingsAction extends ExternalSystemAction { public ShowExternalSystemSettingsAction() { - getTemplatePresentation().setText(ExternalSystemBundle.message("action.open.settings.text", "External")); + getTemplatePresentation().setText(() -> ExternalSystemBundle.message("action.open.settings.text", "External")); getTemplatePresentation().setDescription(ExternalSystemBundle.message("action.open.settings.description", "external")); } @@ -40,7 +40,7 @@ public class ShowExternalSystemSettingsAction extends ExternalSystemAction { ProjectSystemId systemId = getSystemId(e); if (systemId == null) return false; - e.getPresentation().setText(ExternalSystemBundle.message("action.open.settings.text", systemId.getReadableName())); + e.getPresentation().setText(() -> ExternalSystemBundle.message("action.open.settings.text", systemId.getReadableName())); e.getPresentation().setDescription(ExternalSystemBundle.message("action.open.settings.description", systemId.getReadableName())); return true; } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java index 106c2b714333..1178c20f8eef 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java @@ -250,7 +250,7 @@ public class ExternalSystemRunConfiguration extends LocatableConfigurationBase i Presentation presentation = event.getPresentation(); ExecutionEnvironment environment = getEnvironment(event); if (environment != null) { - presentation.setText(ExecutionBundle.message("rerun.configuration.action.name", + presentation.setText(() -> ExecutionBundle.message("rerun.configuration.action.name", StringUtil.escapeMnemonics(environment.getRunProfile().getName()))); Icon icon = ExecutionManagerImpl.isProcessRunning(getDescriptor(event)) ? AllIcons.Actions.Restart diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java index c94274204e17..5f5d2ab1e7b4 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java @@ -448,7 +448,7 @@ public final class ExternalSystemUtil { } }; String systemId = id.getProjectSystemId().getReadableName(); - rerunImportAction.getTemplatePresentation().setText(ExternalSystemBundle.message("action.refresh.project.text", systemId)); + rerunImportAction.getTemplatePresentation().setText(() -> ExternalSystemBundle.message("action.refresh.project.text", systemId)); rerunImportAction.getTemplatePresentation() .setDescription(ExternalSystemBundle.message("action.refresh.project.description", systemId)); rerunImportAction.getTemplatePresentation().setIcon(AllIcons.Actions.Refresh); diff --git a/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java b/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java index 279d76119c4c..c015ac3f1742 100644 --- a/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java +++ b/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java @@ -28,7 +28,7 @@ public class CloseAction extends AnAction implements DumbAware { ActionUtil.copyFrom(this, IdeActions.ACTION_CLOSE); final Presentation templatePresentation = getTemplatePresentation(); templatePresentation.setIcon(AllIcons.Actions.Cancel); - templatePresentation.setText(ExecutionBundle.message("close.tab.action.name")); + templatePresentation.setText(() -> ExecutionBundle.message("close.tab.action.name")); templatePresentation.setDescription(Presentation.NULL_STRING); } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java index 0d71889e6d8f..6e378c1dc8ef 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull; public class AddArrangementRuleAction extends AbstractArrangementRuleAction implements DumbAware { public AddArrangementRuleAction() { - getTemplatePresentation().setText(ApplicationBundle.message("arrangement.action.rule.add.text")); + getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.rule.add.text")); getTemplatePresentation().setDescription(ApplicationBundle.message("arrangement.action.rule.add.description")); getTemplatePresentation().setIcon(IconUtil.getAddIcon()); setEnabledInModalContext(true); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementSectionRuleAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementSectionRuleAction.java index 5e0db6ad637f..5dfb991e0469 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementSectionRuleAction.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementSectionRuleAction.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull; public class AddArrangementSectionRuleAction extends AddArrangementRuleAction { public AddArrangementSectionRuleAction() { - getTemplatePresentation().setText(ApplicationBundle.message("arrangement.action.section.rule.add.text")); + getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.section.rule.add.text")); getTemplatePresentation().setDescription(ApplicationBundle.message("arrangement.action.section.rule.add.description")); getTemplatePresentation().setIcon(AllIcons.CodeStyle.AddNewSectionRule); } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/EditArrangementRuleAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/EditArrangementRuleAction.java index d530384dcfcc..8f16fa83e2a3 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/EditArrangementRuleAction.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/EditArrangementRuleAction.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull; public class EditArrangementRuleAction extends AbstractArrangementRuleAction implements DumbAware, Toggleable { public EditArrangementRuleAction() { - getTemplatePresentation().setText(ApplicationBundle.message("arrangement.action.rule.edit.text")); + getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.rule.edit.text")); getTemplatePresentation().setDescription(ApplicationBundle.message("arrangement.action.rule.edit.description")); getTemplatePresentation().setIcon(IconUtil.getEditIcon()); setEnabledInModalContext(true); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/EditRuleAliasesDefinitionAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/EditRuleAliasesDefinitionAction.java index afa374758c64..b891d8202797 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/EditRuleAliasesDefinitionAction.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/EditRuleAliasesDefinitionAction.java @@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull; public class EditRuleAliasesDefinitionAction extends AnAction { public EditRuleAliasesDefinitionAction() { - getTemplatePresentation().setText(ApplicationBundle.message("arrangement.action.alias.rule.add.edit.text")); + getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.alias.rule.add.edit.text")); getTemplatePresentation().setDescription(ApplicationBundle.message("arrangement.action.alias.rule.add.edit.description")); getTemplatePresentation().setIcon(AllIcons.General.GearPlain); } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementGroupingRuleDownAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementGroupingRuleDownAction.java index 7229fa960720..0cbcc28dbfa7 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementGroupingRuleDownAction.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementGroupingRuleDownAction.java @@ -17,7 +17,7 @@ import javax.swing.table.DefaultTableModel; public class MoveArrangementGroupingRuleDownAction extends AnAction implements DumbAware { public MoveArrangementGroupingRuleDownAction() { - getTemplatePresentation().setText(ApplicationBundle.message("arrangement.action.rule.move.down.text")); + getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.rule.move.down.text")); getTemplatePresentation().setDescription(ApplicationBundle.message("arrangement.action.rule.move.down.description")); getTemplatePresentation().setIcon(IconUtil.getMoveDownIcon()); } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementGroupingRuleUpAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementGroupingRuleUpAction.java index 620cc9dbd9ac..d91f7a391f8d 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementGroupingRuleUpAction.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementGroupingRuleUpAction.java @@ -17,7 +17,7 @@ import javax.swing.table.DefaultTableModel; public class MoveArrangementGroupingRuleUpAction extends AnAction implements DumbAware { public MoveArrangementGroupingRuleUpAction() { - getTemplatePresentation().setText(ApplicationBundle.message("arrangement.action.rule.move.up.text")); + getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.rule.move.up.text")); getTemplatePresentation().setDescription(ApplicationBundle.message("arrangement.action.rule.move.up.description")); getTemplatePresentation().setIcon(IconUtil.getMoveUpIcon()); } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementMatchingRuleDownAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementMatchingRuleDownAction.java index d48507d128a9..0f5af72e66fe 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementMatchingRuleDownAction.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementMatchingRuleDownAction.java @@ -29,7 +29,7 @@ import java.util.List; public class MoveArrangementMatchingRuleDownAction extends AbstractMoveArrangementRuleAction { public MoveArrangementMatchingRuleDownAction() { - getTemplatePresentation().setText(ApplicationBundle.message("arrangement.action.rule.move.down.text")); + getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.rule.move.down.text")); getTemplatePresentation().setDescription(ApplicationBundle.message("arrangement.action.rule.move.down.description")); getTemplatePresentation().setIcon(IconUtil.getMoveDownIcon()); setEnabledInModalContext(true); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementMatchingRuleUpAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementMatchingRuleUpAction.java index a2c3412671f5..676eb4a64334 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementMatchingRuleUpAction.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementMatchingRuleUpAction.java @@ -29,7 +29,7 @@ import java.util.List; public class MoveArrangementMatchingRuleUpAction extends AbstractMoveArrangementRuleAction { public MoveArrangementMatchingRuleUpAction() { - getTemplatePresentation().setText(ApplicationBundle.message("arrangement.action.rule.move.up.text")); + getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.rule.move.up.text")); getTemplatePresentation().setDescription(ApplicationBundle.message("arrangement.action.rule.move.up.description")); getTemplatePresentation().setIcon(IconUtil.getMoveUpIcon()); setEnabledInModalContext(true); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RemoveArrangementRuleAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RemoveArrangementRuleAction.java index 531981a68aec..72cf8ca71c10 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RemoveArrangementRuleAction.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RemoveArrangementRuleAction.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull; public class RemoveArrangementRuleAction extends AbstractArrangementRuleAction implements DumbAware { public RemoveArrangementRuleAction() { - getTemplatePresentation().setText(ApplicationBundle.message("arrangement.action.rule.remove.text")); + getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.rule.remove.text")); getTemplatePresentation().setDescription(ApplicationBundle.message("arrangement.action.rule.remove.description")); getTemplatePresentation().setIcon(IconUtil.getRemoveIcon()); setEnabledInModalContext(true); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java b/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java index ad7a6c4e56f5..f451e1f5b677 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java @@ -64,7 +64,7 @@ public class RunInspectionAction extends GotoActionBase implements DataProvider public RunInspectionAction(String predefinedText) { myPredefinedText = predefinedText; - getTemplatePresentation().setText(IdeBundle.message("goto.inspection.action.text")); + getTemplatePresentation().setText(() -> IdeBundle.message("goto.inspection.action.text")); } @Override diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/DebugAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/DebugAction.java index ea05154411a1..3fbf01a187d6 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/DebugAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/DebugAction.java @@ -37,12 +37,12 @@ public class DebugAction extends ExecutorAction { protected void update(@NotNull AnActionEvent e, boolean running) { Presentation presentation = e.getPresentation(); if (running) { - presentation.setText(ExecutionBundle.message("run.dashboard.restart.debugger.action.name")); + presentation.setText(() -> ExecutionBundle.message("run.dashboard.restart.debugger.action.name")); presentation.setDescription(ExecutionBundle.message("run.dashboard.restart.debugger.action.description")); presentation.setIcon(AllIcons.Actions.RestartDebugger); } else { - presentation.setText(ExecutionBundle.message("run.dashboard.debug.action.name")); + presentation.setText(() -> ExecutionBundle.message("run.dashboard.debug.action.name")); presentation.setDescription(ExecutionBundle.message("run.dashboard.debug.action.description")); presentation.setIcon(AllIcons.Actions.StartDebugger); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RemoveRunConfigurationTypeAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RemoveRunConfigurationTypeAction.java index 1516dc5b9148..322c184e9567 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RemoveRunConfigurationTypeAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RemoveRunConfigurationTypeAction.java @@ -28,7 +28,7 @@ public class RemoveRunConfigurationTypeAction extends DumbAwareAction { Presentation presentation = e.getPresentation(); presentation.setEnabledAndVisible(true); - presentation.setText(ExecutionBundle.message("run.dashboard.remove.run.configuration.type.action.name", + presentation.setText(() -> ExecutionBundle.message("run.dashboard.remove.run.configuration.type.action.name", "Configuration " + StringUtil.pluralize("Type", types.size()))); } diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunAction.java b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunAction.java index 946253262a91..ef04c92d6178 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunAction.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunAction.java @@ -36,12 +36,12 @@ public class RunAction extends ExecutorAction { protected void update(@NotNull AnActionEvent e, boolean running) { Presentation presentation = e.getPresentation(); if (running) { - presentation.setText(ExecutionBundle.message("run.dashboard.rerun.action.name")); + presentation.setText(() -> ExecutionBundle.message("run.dashboard.rerun.action.name")); presentation.setDescription(ExecutionBundle.message("run.dashboard.rerun.action.description")); presentation.setIcon(AllIcons.Actions.Restart); } else { - presentation.setText(ExecutionBundle.message("run.dashboard.run.action.name")); + presentation.setText(() -> ExecutionBundle.message("run.dashboard.run.action.name")); presentation.setDescription(ExecutionBundle.message("run.dashboard.run.action.description")); presentation.setIcon(AllIcons.Actions.Execute); } diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java index 9fa8c12a2d9e..1ad8f03dfbf5 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java @@ -521,7 +521,7 @@ public class FindPopupPanel extends JBPanel implements FindUI { DefaultActionGroup tabOptionsGroup = new DefaultActionGroup() {{ Presentation presentation = getTemplatePresentation(); - presentation.setText(FindBundle.message("find.popup.show.tab.options")); + presentation.setText(() -> FindBundle.message("find.popup.show.tab.options")); presentation.setIcon(AllIcons.General.GearPlain); setPopup(true); setShortcutSet(CustomShortcutSet.fromString("alt ctrl DOWN")); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java b/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java index e65a4b633f79..7f55aa64e970 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java @@ -142,11 +142,11 @@ public class CreateDirectoryOrPackageAction extends AnAction implements DumbAwar } if (isPackage) { - presentation.setText(IdeBundle.message("action.package")); + presentation.setText(() -> IdeBundle.message("action.package")); presentation.setIcon(PlatformIcons.PACKAGE_ICON); } else { - presentation.setText(IdeBundle.message("action.directory")); + presentation.setText(() -> IdeBundle.message("action.directory")); presentation.setIcon(PlatformIcons.FOLDER_ICON); } } diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.java index e014e6c74e49..b426302be1f6 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; public class ToggleBookmarkAction extends BookmarksAction implements DumbAware, Toggleable { public ToggleBookmarkAction() { - getTemplatePresentation().setText(IdeBundle.message("action.bookmark.toggle")); + getTemplatePresentation().setText(() -> IdeBundle.message("action.bookmark.toggle")); } @Override @@ -32,7 +32,7 @@ public class ToggleBookmarkAction extends BookmarksAction implements DumbAware, event.getPresentation().setText(selected ? "Clear Bookmark" : "Set Bookmark"); } else { - event.getPresentation().setText(IdeBundle.message("action.bookmark.toggle")); + event.getPresentation().setText(() -> IdeBundle.message("action.bookmark.toggle")); Toggleable.setSelected(event.getPresentation(), selected); } } diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkWithMnemonicAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkWithMnemonicAction.java index 7e798f06d0af..317440340c1c 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkWithMnemonicAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkWithMnemonicAction.java @@ -24,7 +24,7 @@ public class ToggleBookmarkWithMnemonicAction extends ToggleBookmarkAction { private boolean myPopupShown; public ToggleBookmarkWithMnemonicAction() { - getTemplatePresentation().setText(IdeBundle.message("action.bookmark.toggle.mnemonic")); + getTemplatePresentation().setText(() -> IdeBundle.message("action.bookmark.toggle.mnemonic")); } @Override @@ -42,7 +42,7 @@ public class ToggleBookmarkWithMnemonicAction extends ToggleBookmarkAction { } } else { - e.getPresentation().setText(IdeBundle.message("action.bookmark.toggle.mnemonic")); + e.getPresentation().setText(() -> IdeBundle.message("action.bookmark.toggle.mnemonic")); } } diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java index 7e94131cd624..74d5a4a9ae1d 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java @@ -25,11 +25,11 @@ public class FavoritesCompactEmptyMiddlePackagesAction extends FavoritesToolbarB Presentation presentation = e.getPresentation(); // see com.intellij.ide.projectView.impl.ProjectViewImpl.HideEmptyMiddlePackagesAction.update if (getViewSettings().isFlattenPackages()) { - presentation.setText(IdeBundle.message("action.hide.empty.middle.packages")); + presentation.setText(() -> IdeBundle.message("action.hide.empty.middle.packages")); presentation.setDescription(IdeBundle.message("action.show.hide.empty.middle.packages")); } else { - presentation.setText(IdeBundle.message("action.compact.empty.middle.packages")); + presentation.setText(() -> IdeBundle.message("action.compact.empty.middle.packages")); presentation.setDescription(IdeBundle.message("action.show.compact.empty.middle.packages")); } diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java index 018942ef12fa..72d0843d57a6 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java @@ -684,7 +684,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem else { String typeName = ElementDescriptionUtil.getElementDescription(selectedElement, UsageViewTypeLocation.INSTANCE); if (StringUtil.isNotEmpty(typeName)) { - presentation.setText(IdeBundle.message("action.base.on.this.0", StringUtil.capitalize(typeName))); + presentation.setText(() -> IdeBundle.message("action.base.on.this.0", StringUtil.capitalize(typeName))); } presentation.setEnabled(isEnabled(browser, selectedElement)); } diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseCallHierarchyAction.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseCallHierarchyAction.java index 600ea61ac70b..f824b7dcab1b 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseCallHierarchyAction.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseCallHierarchyAction.java @@ -36,7 +36,7 @@ public final class BrowseCallHierarchyAction extends BrowseHierarchyActionBase { public final void update(@NotNull final AnActionEvent event){ final Presentation presentation = event.getPresentation(); if (!ActionPlaces.isMainMenuOrActionSearch(event.getPlace())) { - presentation.setText(IdeBundle.message("action.browse.call.hierarchy")); + presentation.setText(() -> IdeBundle.message("action.browse.call.hierarchy")); } super.update(event); diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseMethodHierarchyAction.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseMethodHierarchyAction.java index acee8eca12a8..f4b73b637b62 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseMethodHierarchyAction.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseMethodHierarchyAction.java @@ -36,7 +36,7 @@ public final class BrowseMethodHierarchyAction extends BrowseHierarchyActionBase public final void update(@NotNull final AnActionEvent event){ final Presentation presentation = event.getPresentation(); if (!ActionPlaces.isMainMenuOrActionSearch(event.getPlace())) { - presentation.setText(IdeBundle.message("action.browse.method.hierarchy")); + presentation.setText(() -> IdeBundle.message("action.browse.method.hierarchy")); } super.update(event); } diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseTypeHierarchyAction.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseTypeHierarchyAction.java index 424420a04845..da2124b98f68 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseTypeHierarchyAction.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseTypeHierarchyAction.java @@ -36,7 +36,7 @@ public final class BrowseTypeHierarchyAction extends BrowseHierarchyActionBase { public final void update(@NotNull final AnActionEvent event){ final Presentation presentation = event.getPresentation(); if (!ActionPlaces.isMainMenuOrActionSearch(event.getPlace())) { - presentation.setText(IdeBundle.message("action.browse.type.hierarchy")); + presentation.setText(() -> IdeBundle.message("action.browse.type.hierarchy")); } super.update(event); } diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/HierarchyBrowserBaseEx.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/HierarchyBrowserBaseEx.java index e8c247243b79..bcaa17d86b8a 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/HierarchyBrowserBaseEx.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/HierarchyBrowserBaseEx.java @@ -683,7 +683,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem else { String typeName = ElementDescriptionUtil.getElementDescription(selectedElement, UsageViewTypeLocation.INSTANCE); if (StringUtil.isNotEmpty(typeName)) { - presentation.setText(IdeBundle.message("action.base.on.this.0", StringUtil.capitalize(typeName))); + presentation.setText(() -> IdeBundle.message("action.base.on.this.0", StringUtil.capitalize(typeName))); } presentation.setEnabled(isEnabled(browser, selectedElement)); } diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseCallHierarchyAction.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseCallHierarchyAction.java index 6f7c39694e19..b00571ddea76 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseCallHierarchyAction.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseCallHierarchyAction.java @@ -18,7 +18,7 @@ public final class BrowseCallHierarchyAction extends BrowseHierarchyActionBase { public final void update(@NotNull final AnActionEvent event){ final Presentation presentation = event.getPresentation(); if (!ActionPlaces.isMainMenuOrActionSearch(event.getPlace())) { - presentation.setText(IdeBundle.message("action.browse.call.hierarchy")); + presentation.setText(() -> IdeBundle.message("action.browse.call.hierarchy")); } super.update(event); diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseMethodHierarchyAction.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseMethodHierarchyAction.java index 1b66cb6730ad..3bc84035e57c 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseMethodHierarchyAction.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseMethodHierarchyAction.java @@ -18,7 +18,7 @@ public final class BrowseMethodHierarchyAction extends BrowseHierarchyActionBase public final void update(@NotNull final AnActionEvent event){ final Presentation presentation = event.getPresentation(); if (!ActionPlaces.isMainMenuOrActionSearch(event.getPlace())) { - presentation.setText(IdeBundle.message("action.browse.method.hierarchy")); + presentation.setText(() -> IdeBundle.message("action.browse.method.hierarchy")); } super.update(event); } diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseTypeHierarchyAction.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseTypeHierarchyAction.java index bbc1e1fe0cbd..45d429e1d7f7 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseTypeHierarchyAction.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseTypeHierarchyAction.java @@ -18,7 +18,7 @@ public final class BrowseTypeHierarchyAction extends BrowseHierarchyActionBase { public final void update(@NotNull final AnActionEvent event){ final Presentation presentation = event.getPresentation(); if (!ActionPlaces.isMainMenuOrActionSearch(event.getPlace())) { - presentation.setText(IdeBundle.message("action.browse.type.hierarchy")); + presentation.setText(() -> IdeBundle.message("action.browse.type.hierarchy")); } super.update(event); } diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java index 9698ab3fcd52..a524a91af526 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java @@ -50,7 +50,7 @@ public class ShowNavBarAction extends AnAction implements DumbAware, PopupAction // see RIDER-15982 if (!ActionPlaces.isMainMenuOrActionSearch(e.getPlace())) { - e.getPresentation().setText(ActionsBundle.message("action.ShowNavBar.ShortText")); + e.getPresentation().setText(() -> ActionsBundle.message("action.ShowNavBar.ShortText")); } } } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/actions/UnmarkRootAction.java b/platform/lang-impl/src/com/intellij/ide/projectView/actions/UnmarkRootAction.java index 57bef2f60198..bad1cdac9258 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/actions/UnmarkRootAction.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/actions/UnmarkRootAction.java @@ -27,7 +27,7 @@ public class UnmarkRootAction extends MarkRootActionBase { if (!Registry.is("ide.hide.excluded.files") && !selection.mySelectedExcludeRoots.isEmpty() && selection.mySelectedDirectories.isEmpty() && selection.mySelectedRoots.isEmpty()) { e.getPresentation().setEnabledAndVisible(true); - e.getPresentation().setText(LangBundle.message("mark.as.unmark.excluded")); + e.getPresentation().setText(() -> LangBundle.message("mark.as.unmark.excluded")); return; } diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java index 0dd82916c4e7..f3f7f993b8b6 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java @@ -125,7 +125,7 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig public static class GroupByActionGroup extends DefaultActionGroup { { getTemplatePresentation().setIcon(AllIcons.Actions.GroupBy); - getTemplatePresentation().setText(IdeBundle.message("group.group.by")); + getTemplatePresentation().setText(() -> IdeBundle.message("group.group.by")); setPopup(true); } diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java index fae0d16ebcfd..b6cfca30956f 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java @@ -159,7 +159,7 @@ public class TodoView implements PersistentStateComponent, Dispo if (toolWindow instanceof ToolWindowEx) { DefaultActionGroup group = new DefaultActionGroup() { { - getTemplatePresentation().setText(IdeBundle.message("group.view.options")); + getTemplatePresentation().setText(() -> IdeBundle.message("group.view.options")); setPopup(true); add(myAllTodos.createAutoScrollToSourceAction()); addSeparator(); diff --git a/platform/lang-impl/src/com/intellij/lang/customFolding/GotoCustomRegionAction.java b/platform/lang-impl/src/com/intellij/lang/customFolding/GotoCustomRegionAction.java index 51b1f4926ba6..936bc9eec4a2 100644 --- a/platform/lang-impl/src/com/intellij/lang/customFolding/GotoCustomRegionAction.java +++ b/platform/lang-impl/src/com/intellij/lang/customFolding/GotoCustomRegionAction.java @@ -61,7 +61,7 @@ public class GotoCustomRegionAction extends AnAction implements DumbAware, Popup @Override public void update(@NotNull AnActionEvent e) { Presentation presentation = e.getPresentation(); - presentation.setText(IdeBundle.message("goto.custom.region.menu.item")); + presentation.setText(() -> IdeBundle.message("goto.custom.region.menu.item")); final Editor editor = e.getData(CommonDataKeys.EDITOR); final Project project = e.getProject(); boolean isAvailable = editor != null && project != null; diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ToggleExcludedStateAction.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ToggleExcludedStateAction.java index 22444f5bac00..f778fe4a38ce 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ToggleExcludedStateAction.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ToggleExcludedStateAction.java @@ -37,7 +37,7 @@ public class ToggleExcludedStateAction extends ContentEntryEditingAction { super(tree); myEntryTreeEditor = entryEditor; final Presentation templatePresentation = getTemplatePresentation(); - templatePresentation.setText(ProjectBundle.message("module.toggle.excluded.action")); + templatePresentation.setText(() -> ProjectBundle.message("module.toggle.excluded.action")); templatePresentation.setDescription(ProjectBundle.message("module.toggle.excluded.action.description")); templatePresentation.setIcon(AllIcons.Modules.ExcludeRoot); } @@ -72,6 +72,6 @@ public class ToggleExcludedStateAction extends ContentEntryEditingAction { public void update(@NotNull final AnActionEvent e) { super.update(e); final Presentation presentation = e.getPresentation(); - presentation.setText(ProjectBundle.message("module.toggle.excluded.action")); + presentation.setText(() -> ProjectBundle.message("module.toggle.excluded.action")); } } diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java b/platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java index da5ec33aa463..77f4ce29f043 100644 --- a/platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java +++ b/platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java @@ -35,7 +35,7 @@ public class ChangeTemplateDataLanguageAction extends AnAction { if (provider instanceof ConfigurableTemplateLanguageFileViewProvider) { final TemplateLanguageFileViewProvider viewProvider = (TemplateLanguageFileViewProvider)provider; - e.getPresentation().setText(LangBundle.message("quickfix.change.template.data.language.text", viewProvider.getTemplateDataLanguage().getDisplayName())); + e.getPresentation().setText(() -> LangBundle.message("quickfix.change.template.data.language.text", viewProvider.getTemplateDataLanguage().getDisplayName())); e.getPresentation().setEnabledAndVisible(true); } diff --git a/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeAction.java b/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeAction.java index 2d6fb8c23060..be7bcd3b00b7 100644 --- a/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeAction.java +++ b/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeAction.java @@ -43,10 +43,10 @@ public class GotoTestOrCodeAction extends BaseCodeInsightAction { presentation.setEnabledAndVisible(true); if (TestFinderHelper.isTest(element)) { - presentation.setText(ActionsBundle.message("action.GotoTestSubject.text")); + presentation.setText(() -> ActionsBundle.message("action.GotoTestSubject.text")); presentation.setDescription(ActionsBundle.message("action.GotoTestSubject.description")); } else { - presentation.setText(ActionsBundle.message("action.GotoTest.text")); + presentation.setText(() -> ActionsBundle.message("action.GotoTest.text")); presentation.setDescription(ActionsBundle.message("action.GotoTest.description")); } } diff --git a/platform/platform-impl/src/com/intellij/designer/LightToolWindow.java b/platform/platform-impl/src/com/intellij/designer/LightToolWindow.java index f8feecebcda3..df1aca99476e 100644 --- a/platform/platform-impl/src/com/intellij/designer/LightToolWindow.java +++ b/platform/platform-impl/src/com/intellij/designer/LightToolWindow.java @@ -365,7 +365,7 @@ public class LightToolWindow extends JPanel { private class HideAction extends AnAction { HideAction() { Presentation presentation = getTemplatePresentation(); - presentation.setText(UIBundle.message("tool.window.hide.action.name")); + presentation.setText(() -> UIBundle.message("tool.window.hide.action.name")); presentation.setIcon(AllIcons.General.HideToolWindow); } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsAction.java index 77534e3a18a9..69f6f333e658 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsAction.java @@ -46,10 +46,10 @@ public class CloseAllEditorsAction extends AnAction implements DumbAware { Presentation presentation = event.getPresentation(); final EditorWindow editorWindow = event.getData(EditorWindow.DATA_KEY); if (editorWindow != null && editorWindow.inSplitter()) { - presentation.setText(IdeBundle.message("action.close.all.editors.in.tab.group")); + presentation.setText(() -> IdeBundle.message("action.close.all.editors.in.tab.group")); } else { - presentation.setText(IdeBundle.message("action.close.all.editors")); + presentation.setText(() -> IdeBundle.message("action.close.all.editors")); } Project project = event.getData(CommonDataKeys.PROJECT); if (project == null) { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsToTheLeftAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsToTheLeftAction.java index d48bd7a73942..c9a2cedfb7a5 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsToTheLeftAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsToTheLeftAction.java @@ -45,7 +45,7 @@ public class CloseAllEditorsToTheLeftAction extends CloseEditorsActionBase { super.update(event); int tabPlacement = UISettings.getInstance().getEditorTabPlacement(); if (tabPlacement == SwingConstants.LEFT || tabPlacement == SwingConstants.RIGHT) { - event.getPresentation().setText(IdeBundle.message(getAlternativeTextKey())); + event.getPresentation().setText(() -> IdeBundle.message(getAlternativeTextKey())); } } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CloseProjectAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CloseProjectAction.java index 3b23167b8b0d..063596e3051c 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CloseProjectAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CloseProjectAction.java @@ -43,7 +43,7 @@ public final class CloseProjectAction extends AnAction implements DumbAware { Project project = event.getData(CommonDataKeys.PROJECT); presentation.setEnabled(project != null); if (ProjectAttachProcessor.canAttachToProject() && project != null && ModuleManager.getInstance(project).getModules().length > 1) { - presentation.setText(IdeBundle.message("action.close.projects.in.current.window")); + presentation.setText(() -> IdeBundle.message("action.close.projects.in.current.window")); } else { presentation.setText(IdeUICustomization.getInstance().getCloseProjectActionText()); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CopyPathsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CopyPathsAction.java index 8b2d5ccd7d4f..e2ff22050758 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CopyPathsAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CopyPathsAction.java @@ -48,7 +48,7 @@ public class CopyPathsAction extends AnAction implements DumbAware { Presentation presentation = event.getPresentation(); presentation.setEnabled(num > 0); presentation.setVisible(num > 0 || !ActionPlaces.isPopupPlace(event.getPlace())); - presentation.setText(IdeBundle.message(num == 1 ? "action.copy.path" : "action.copy.paths")); + presentation.setText(() -> IdeBundle.message(num == 1 ? "action.copy.path" : "action.copy.paths")); } public static boolean isCopyReferencePopupAvailable() { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/DeleteAction.java b/platform/platform-impl/src/com/intellij/ide/actions/DeleteAction.java index d7b7fa332aa4..b9286a59f112 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/DeleteAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/DeleteAction.java @@ -49,10 +49,10 @@ public class DeleteAction extends AnAction implements DumbAware { Presentation presentation = e.getPresentation(); if (ActionPlaces.isPopupPlace(e.getPlace())) { - presentation.setText(IdeBundle.message("action.delete.ellipsis")); + presentation.setText(() -> IdeBundle.message("action.delete.ellipsis")); } else { - presentation.setText(IdeBundle.message("action.delete")); + presentation.setText(() -> IdeBundle.message("action.delete")); } if (e.isFromActionToolbar() && e.getPresentation().getIcon() == null) { e.getPresentation().setIcon(IconUtil.getRemoveIcon()); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/RecentProjectsGroup.java b/platform/platform-impl/src/com/intellij/ide/actions/RecentProjectsGroup.java index 79a8ab32d789..9a5691ab30f3 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/RecentProjectsGroup.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/RecentProjectsGroup.java @@ -21,7 +21,7 @@ import java.util.List; public class RecentProjectsGroup extends ActionGroup implements DumbAware { public RecentProjectsGroup() { Presentation presentation = getTemplatePresentation(); - presentation.setText(ActionsBundle.message(SystemInfo.isMac ? "group.reopen.mac.text" : "group.reopen.win.text")); + presentation.setText(() -> ActionsBundle.message(SystemInfo.isMac ? "group.reopen.mac.text" : "group.reopen.win.text")); } @Override diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowFilePathAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowFilePathAction.java index 539498955c6f..df3a457eef6a 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ShowFilePathAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowFilePathAction.java @@ -45,7 +45,7 @@ public class ShowFilePathAction extends DumbAwareAction { if (visible) { VirtualFile file = getFile(e); e.getPresentation().setEnabled(file != null); - e.getPresentation().setText(ActionsBundle.message(file != null && file.isDirectory() ? "action.ShowFilePath.directory" : "action.ShowFilePath.file")); + e.getPresentation().setText(() -> ActionsBundle.message(file != null && file.isDirectory() ? "action.ShowFilePath.directory" : "action.ShowFilePath.file")); } } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/TabNavigationActionBase.java b/platform/platform-impl/src/com/intellij/ide/actions/TabNavigationActionBase.java index d226b88265ff..701be9f943fe 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/TabNavigationActionBase.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/TabNavigationActionBase.java @@ -147,10 +147,10 @@ abstract class TabNavigationActionBase extends AnAction implements DumbAware { protected GoToTabAction(@NotNull NavigationType navigationType) { super(navigationType); if (navigationType == NavigationType.LAST) { - getTemplatePresentation().setText(ActionsBundle.message("action.GoToLastTab.text")); + getTemplatePresentation().setText(() -> ActionsBundle.message("action.GoToLastTab.text")); getTemplatePresentation().setDescription(ActionsBundle.message("action.GoToLastTab.description")); } else { - getTemplatePresentation().setText(ActionsBundle.message("action.GoToTab.text", navigationType.ordinal() + 1)); + getTemplatePresentation().setText(() -> ActionsBundle.message("action.GoToTab.text", navigationType.ordinal() + 1)); getTemplatePresentation().setDescription(ActionsBundle.message("action.GoToTab.description", navigationType.ordinal() + 1)); } } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/TemplateProjectPropertiesAction.java b/platform/platform-impl/src/com/intellij/ide/actions/TemplateProjectPropertiesAction.java index a077e58d65fc..37bc63d86b12 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/TemplateProjectPropertiesAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/TemplateProjectPropertiesAction.java @@ -16,7 +16,7 @@ import org.jetbrains.annotations.NotNull; public class TemplateProjectPropertiesAction extends AnAction implements DumbAware { public TemplateProjectPropertiesAction() { String projectConceptName = StringUtil.capitalize(IdeUICustomization.getInstance().getProjectConceptName()); - getTemplatePresentation().setText(ActionsBundle.message("action.TemplateProjectProperties.text.template", CommonBundle.settingsTitle(), projectConceptName)); + getTemplatePresentation().setText(() -> ActionsBundle.message("action.TemplateProjectProperties.text.template", CommonBundle.settingsTitle(), projectConceptName)); getTemplatePresentation().setDescription(ActionsBundle.message("action.TemplateProjectProperties.description.template", projectConceptName)); } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ToggleReadOnlyAttributeAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ToggleReadOnlyAttributeAction.java index 62e24661255a..c3f871df4fc4 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ToggleReadOnlyAttributeAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ToggleReadOnlyAttributeAction.java @@ -45,17 +45,21 @@ public class ToggleReadOnlyAttributeAction extends AnAction implements DumbAware if (file.isWritable()) ++rw; else ++ro; if (file.isDirectory()) ++d; else ++f; } + int finalRo = ro; + int finalRw = rw; + int finalF = f; + int finalD = d; if (ro > 0 && rw > 0) { - e.getPresentation().setText(ActionsBundle.message("action.ToggleReadOnlyAttribute.text")); + e.getPresentation().setText(() -> ActionsBundle.message("action.ToggleReadOnlyAttribute.text")); } else if (f > 0 && d == 0) { - e.getPresentation().setText(ActionsBundle.message("action.ToggleReadOnlyAttribute.files", ro, rw, f, d)); + e.getPresentation().setText(() -> ActionsBundle.message("action.ToggleReadOnlyAttribute.files", finalRo, finalRw, finalF, finalD)); } else if (f == 0 && d > 0) { - e.getPresentation().setText(ActionsBundle.message("action.ToggleReadOnlyAttribute.dirs", ro, rw, f, d)); + e.getPresentation().setText(() -> ActionsBundle.message("action.ToggleReadOnlyAttribute.dirs", finalRo, finalRw, finalF, finalD)); } else { - e.getPresentation().setText(ActionsBundle.message("action.ToggleReadOnlyAttribute.mixed", ro, rw, f, d)); + e.getPresentation().setText(() -> ActionsBundle.message("action.ToggleReadOnlyAttribute.mixed", finalRo, finalRw, finalF, finalD)); } } } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/WhatsNewAction.java b/platform/platform-impl/src/com/intellij/ide/actions/WhatsNewAction.java index e8252b49d3f5..6b7b13edae00 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/WhatsNewAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/WhatsNewAction.java @@ -22,7 +22,7 @@ public class WhatsNewAction extends AnAction implements DumbAware { e.getPresentation().setVisible(visible); if (visible) { e.getPresentation() - .setText(IdeBundle.message("whatsnew.action.custom.text", ApplicationNamesInfo.getInstance().getFullProductName())); + .setText(() -> IdeBundle.message("whatsnew.action.custom.text", ApplicationNamesInfo.getInstance().getFullProductName())); e.getPresentation().setDescription( IdeBundle.message("whatsnew.action.custom.description", ApplicationNamesInfo.getInstance().getFullProductName())); } diff --git a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java index e50c585f24a2..6fca7e97ec3e 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java @@ -865,10 +865,10 @@ public class CustomizableActionsPanel { Pair, List> selection = findActionsUnderSelection(); e.getPresentation().setEnabled(!selection.second.isEmpty()); if (selection.first.size() != 1) { - e.getPresentation().setText(IdeBundle.message("button.restore.selected.groups")); + e.getPresentation().setText(() -> IdeBundle.message("button.restore.selected.groups")); } else { - e.getPresentation().setText(IdeBundle.message("button.restore.selection", selection.first.iterator().next())); + e.getPresentation().setText(() -> IdeBundle.message("button.restore.selection", selection.first.iterator().next())); } } } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleUseSoftWrapsMenuAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleUseSoftWrapsMenuAction.java index fc28f1d5314b..afa9d78d46a3 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleUseSoftWrapsMenuAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleUseSoftWrapsMenuAction.java @@ -39,7 +39,7 @@ public class ToggleUseSoftWrapsMenuAction extends AbstractToggleUseSoftWrapsActi e.getPresentation().setIcon(null); } if (ActionPlaces.UNKNOWN.equals(e.getPlace())) { - e.getPresentation().setText(ActionsBundle.message("action.EditorGutterToggleLocalSoftWraps.gutterText")); + e.getPresentation().setText(() -> ActionsBundle.message("action.EditorGutterToggleLocalSoftWraps.gutterText")); } e.getPresentation().setEnabled(getEditor(e) != null); } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/TogglePathShowingAction.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/TogglePathShowingAction.java index 5eb4fd9822a2..3f4ed22cf1dd 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/TogglePathShowingAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/TogglePathShowingAction.java @@ -17,7 +17,7 @@ public class TogglePathShowingAction extends AnAction implements DumbAware { @Override public void update(@NotNull final AnActionEvent e) { - e.getPresentation().setText(IdeBundle.message("file.chooser.hide.path.tooltip.text")); + e.getPresentation().setText(() -> IdeBundle.message("file.chooser.hide.path.tooltip.text")); DialogWrapper dialog = DialogWrapper.findInstance(e.getData(PlatformDataKeys.CONTEXT_COMPONENT)); e.getPresentation().setEnabled(dialog instanceof FileChooserDialogImpl); } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java index 902c14fec2c7..b3ed91b27691 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java @@ -306,7 +306,7 @@ public abstract class ToolWindowHeader extends JPanel implements UISettingsListe HideAction() { ActionUtil.copyFrom(this, InternalDecorator.HIDE_ACTIVE_WINDOW_ACTION_ID); getTemplatePresentation().setIcon(AllIcons.General.HideToolWindow); - getTemplatePresentation().setText(UIBundle.message("tool.window.hide.action.name")); + getTemplatePresentation().setText(() -> UIBundle.message("tool.window.hide.action.name")); } @Override diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/AddCloudConnectionActionGroup.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/AddCloudConnectionActionGroup.java index ff696abf601d..110d396b1b4c 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/AddCloudConnectionActionGroup.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/AddCloudConnectionActionGroup.java @@ -42,7 +42,7 @@ public class AddCloudConnectionActionGroup extends ActionGroup { @Override public void update(@NotNull AnActionEvent e) { if (e.getPlace().equals(ActionPlaces.ACTION_SEARCH)) { - e.getPresentation().setText(CloudBundle.message("new.cloud.connection.configurable.title", myServerType.getPresentableName())); + e.getPresentation().setText(() -> CloudBundle.message("new.cloud.connection.configurable.title", myServerType.getPresentableName())); } else { e.getPresentation().setText(myServerType.getPresentableName()); diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java index a59c3a70c229..868eb8c21118 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java @@ -1237,7 +1237,7 @@ public class StructuralSearchDialog extends DialogWrapper implements ProjectMana } private void init() { - getTemplatePresentation().setText(SSRBundle.message(myReplace ? "switch.to.search.action" : "switch.to.replace.action")); + getTemplatePresentation().setText(() -> SSRBundle.message(myReplace ? "switch.to.search.action" : "switch.to.replace.action")); final ActionManager actionManager = ActionManager.getInstance(); final ShortcutSet searchShortcutSet = actionManager.getAction("StructuralSearchPlugin.StructuralSearchAction").getShortcutSet(); final ShortcutSet replaceShortcutSet = actionManager.getAction("StructuralSearchPlugin.StructuralReplaceAction").getShortcutSet(); diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java index 3e9af2d47d6d..0c33ce5b921c 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java @@ -839,7 +839,7 @@ public class UsageViewImpl implements UsageViewEx { DefaultActionGroup group = new DefaultActionGroup(); group.setPopup(true); group.getTemplatePresentation().setIcon(AllIcons.Actions.GroupBy); - group.getTemplatePresentation().setText(UsageViewBundle.message("action.group.by.title")); + group.getTemplatePresentation().setText(() -> UsageViewBundle.message("action.group.by.title")); group.getTemplatePresentation().setDescription(UsageViewBundle.message("action.group.by.title")); final AnAction[] groupingActions = createGroupingActions(); if (groupingActions.length > 0) { diff --git a/platform/vcs-impl/src/com/intellij/ide/actions/StartUseVcsAction.java b/platform/vcs-impl/src/com/intellij/ide/actions/StartUseVcsAction.java index 21de0a20f164..8556de5ecc45 100644 --- a/platform/vcs-impl/src/com/intellij/ide/actions/StartUseVcsAction.java +++ b/platform/vcs-impl/src/com/intellij/ide/actions/StartUseVcsAction.java @@ -23,7 +23,7 @@ public class StartUseVcsAction extends DumbAwareAction { Presentation presentation = e.getPresentation(); presentation.setEnabledAndVisible(enabled); if (enabled) { - presentation.setText(VcsBundle.message("action.enable.version.control.integration.text")); + presentation.setText(() -> VcsBundle.message("action.enable.version.control.integration.text")); } } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RestoreShelvedChange.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RestoreShelvedChange.java index 76961d4265fe..08c7e3249e1f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RestoreShelvedChange.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RestoreShelvedChange.java @@ -32,7 +32,7 @@ public class RestoreShelvedChange extends DumbAwareAction { return; } Collection deletedLists = notNullize(e.getData(ShelvedChangesViewManager.SHELVED_DELETED_CHANGELIST_KEY)); - presentation.setText(VcsBundle.message("vcs.shelf.action.restore.text")); + presentation.setText(() -> VcsBundle.message("vcs.shelf.action.restore.text")); presentation .setDescription(VcsBundle.message("vcs.shelf.action.restore.description", StringUtil.pluralize("changelist", deletedLists.size()))); presentation.setEnabled(!isEmpty(deletedLists)); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/actions/CompareRevisionsAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/actions/CompareRevisionsAction.java index f00d5565fd49..87325ba5d9a3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/actions/CompareRevisionsAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/actions/CompareRevisionsAction.java @@ -39,7 +39,7 @@ public class CompareRevisionsAction implements AnActionExtensionProvider { @Override public void update(@NotNull AnActionEvent e) { - e.getPresentation().setText(VcsBundle.message("action.name.compare")); + e.getPresentation().setText(() -> VcsBundle.message("action.name.compare")); e.getPresentation().setDescription(VcsBundle.message("action.description.compare")); VcsFileRevision[] revisions = e.getData(VcsDataKeys.VCS_FILE_REVISIONS); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/actions/CreatePatchFromDirectoryAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/actions/CreatePatchFromDirectoryAction.java index e8a0b8834ab2..c0c117e6bb57 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/actions/CreatePatchFromDirectoryAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/actions/CreatePatchFromDirectoryAction.java @@ -63,7 +63,7 @@ public class CreatePatchFromDirectoryAction implements AnActionExtensionProvider @Override public void update(@NotNull AnActionEvent e) { e.getPresentation().setVisible(true); - e.getPresentation().setText(VcsBundle.message("action.name.create.patch.for.selected.revisions")); + e.getPresentation().setText(() -> VcsBundle.message("action.name.create.patch.for.selected.revisions")); e.getPresentation().setDescription(VcsBundle.message("action.description.create.patch.for.selected.revisions")); VcsFileRevision[] revisions = e.getData(VcsDataKeys.VCS_FILE_REVISIONS); diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/RunTargetAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/RunTargetAction.java index 86a0552abf45..bce303710993 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/RunTargetAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/RunTargetAction.java @@ -58,10 +58,10 @@ public class RunTargetAction extends AnAction { Pair antTarget = findAntTarget(e); if (antTarget == null) { presentation.setEnabled(false); - presentation.setText(AntActionsBundle.message("action.RunTargetAction.text.template", "")); + presentation.setText(() -> AntActionsBundle.message("action.RunTargetAction.text.template", "")); } else { presentation.setEnabled(true); - presentation.setText(AntActionsBundle.message("action.RunTargetAction.text.template", "'" + antTarget.second.getName().getValue() + "'")); + presentation.setText(() -> AntActionsBundle.message("action.RunTargetAction.text.template", "'" + antTarget.second.getName().getValue() + "'")); } } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java index 8b6072393926..c49f3b575772 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java @@ -636,20 +636,20 @@ public class AntExplorer extends SimpleToolWindowPanel implements DataProvider, final Presentation presentation = event.getPresentation(); final String place = event.getPlace(); if (ActionPlaces.ANT_EXPLORER_TOOLBAR.equals(place)) { - presentation.setText(AntBundle.message("run.ant.file.or.target.action.name")); + presentation.setText(() -> AntBundle.message("run.ant.file.or.target.action.name")); } else { final TreePath[] paths = myTree.getSelectionPaths(); if (paths != null && paths.length == 1 && ((DefaultMutableTreeNode)paths[0].getLastPathComponent()).getUserObject() instanceof AntBuildFileNodeDescriptor) { - presentation.setText(AntBundle.message("run.ant.build.action.name")); + presentation.setText(() -> AntBundle.message("run.ant.build.action.name")); } else { if (paths == null || paths.length == 1) { - presentation.setText(AntBundle.message("run.ant.target.action.name")); + presentation.setText(() -> AntBundle.message("run.ant.target.action.name")); } else { - presentation.setText(AntBundle.message("run.ant.targets.action.name")); + presentation.setText(() -> AntBundle.message("run.ant.targets.action.name")); } } } @@ -911,7 +911,7 @@ public class AntExplorer extends SimpleToolWindowPanel implements DataProvider, presentation.setEnabled(enabled); } else { - presentation.setText(AntBundle.message("remove.selected.meta.targets.action.name")); + presentation.setText(() -> AntBundle.message("remove.selected.meta.targets.action.name")); final AntBuildTarget[] targets = getTargetObjectsFromPaths(paths); boolean enabled = targets.length > 0; for (final AntBuildTarget buildTarget : targets) { diff --git a/plugins/devkit/devkit-core/src/build/PrepareAllToDeployAction.java b/plugins/devkit/devkit-core/src/build/PrepareAllToDeployAction.java index 00620c0eca9d..0930863a0985 100644 --- a/plugins/devkit/devkit-core/src/build/PrepareAllToDeployAction.java +++ b/plugins/devkit/devkit-core/src/build/PrepareAllToDeployAction.java @@ -59,7 +59,7 @@ public class PrepareAllToDeployAction extends PrepareToDeployAction { } e.getPresentation().setEnabledAndVisible(enabled); if (enabled) { - e.getPresentation().setText(DevKitBundle.message("prepare.for.deployment.all")); + e.getPresentation().setText(() -> DevKitBundle.message("prepare.for.deployment.all")); } } } \ No newline at end of file diff --git a/plugins/devkit/devkit-core/src/build/PrepareToDeployAction.java b/plugins/devkit/devkit-core/src/build/PrepareToDeployAction.java index 8e1a7feaf384..a444c1154f40 100644 --- a/plugins/devkit/devkit-core/src/build/PrepareToDeployAction.java +++ b/plugins/devkit/devkit-core/src/build/PrepareToDeployAction.java @@ -335,7 +335,7 @@ public class PrepareToDeployAction extends AnAction { boolean enabled = module != null && PluginModuleType.isOfType(module); e.getPresentation().setEnabledAndVisible(enabled); if (enabled) { - e.getPresentation().setText(DevKitBundle.message("prepare.for.deployment", module.getName())); + e.getPresentation().setText(() -> DevKitBundle.message("prepare.for.deployment", module.getName())); } } } \ No newline at end of file diff --git a/plugins/gradle-maven/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyAction.java b/plugins/gradle-maven/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyAction.java index e73e367bdc7c..f9e0ed36a215 100644 --- a/plugins/gradle-maven/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyAction.java +++ b/plugins/gradle-maven/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyAction.java @@ -38,7 +38,7 @@ public class AddGradleDslDependencyAction extends CodeInsightAction { public AddGradleDslDependencyAction() { getTemplatePresentation().setDescription(GradleBundle.message("gradle.codeInsight.action.add_maven_dependency.description")); - getTemplatePresentation().setText(GradleBundle.message("gradle.codeInsight.action.add_maven_dependency.text")); + getTemplatePresentation().setText(() -> GradleBundle.message("gradle.codeInsight.action.add_maven_dependency.text")); getTemplatePresentation().setIcon(AllIcons.Nodes.PpLib); } diff --git a/plugins/gradle/java/src/codeInsight/actions/AddGradleDslPluginAction.java b/plugins/gradle/java/src/codeInsight/actions/AddGradleDslPluginAction.java index 48933134760c..8edabb61d9bf 100644 --- a/plugins/gradle/java/src/codeInsight/actions/AddGradleDslPluginAction.java +++ b/plugins/gradle/java/src/codeInsight/actions/AddGradleDslPluginAction.java @@ -32,7 +32,7 @@ public class AddGradleDslPluginAction extends CodeInsightAction { public AddGradleDslPluginAction() { getTemplatePresentation().setDescription(GradleBundle.message("gradle.codeInsight.action.apply_plugin.description")); - getTemplatePresentation().setText(GradleBundle.message("gradle.codeInsight.action.apply_plugin.text")); + getTemplatePresentation().setText(() -> GradleBundle.message("gradle.codeInsight.action.apply_plugin.text")); getTemplatePresentation().setIcon(GradleIcons.Gradle); myPlugins = new ArrayList<>(); diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleRefreshProjectDependenciesAction.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleRefreshProjectDependenciesAction.java index e35b93b19779..2caa6d509f78 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleRefreshProjectDependenciesAction.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleRefreshProjectDependenciesAction.java @@ -26,7 +26,7 @@ import java.util.List; */ public class GradleRefreshProjectDependenciesAction extends RefreshExternalProjectAction { public GradleRefreshProjectDependenciesAction() { - getTemplatePresentation().setText(GradleBundle.message("gradle.action.refresh.dependencies.text")); + getTemplatePresentation().setText(() -> GradleBundle.message("gradle.action.refresh.dependencies.text")); getTemplatePresentation().setDescription(GradleBundle.message("gradle.action.refresh.dependencies.description")); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRebuildAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRebuildAction.java index 006f3bc32897..3bc6222e2058 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRebuildAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRebuildAction.java @@ -39,7 +39,7 @@ public class MavenRebuildAction extends FakeRerunAction { public void update(@NotNull AnActionEvent event) { Presentation presentation = event.getPresentation(); - presentation.setText(ExecutionBundle.message("rerun.configuration.action.name", + presentation.setText(() -> ExecutionBundle.message("rerun.configuration.action.name", StringUtil.escapeMnemonics(myEnvironment.getRunProfile().getName()))); presentation.setIcon( ExecutionManagerImpl.isProcessRunning(myEnvironment.getContentToReuse()) ? diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleIgnoredProjectsAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleIgnoredProjectsAction.java index b5b938c922fb..2d6d01414068 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleIgnoredProjectsAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleIgnoredProjectsAction.java @@ -41,13 +41,13 @@ public class ToggleIgnoredProjectsAction extends MavenAction { List projects = MavenActionUtil.getMavenProjects(context); if (isIgnoredInSettings(projectsManager, projects)) { - e.getPresentation().setText(MavenProjectBundle.message("maven.ignore.edit")); + e.getPresentation().setText(() -> MavenProjectBundle.message("maven.ignore.edit")); } else if (isIgnored(projectsManager, projects)) { - e.getPresentation().setText(MavenProjectBundle.message("maven.unignore")); + e.getPresentation().setText(() -> MavenProjectBundle.message("maven.unignore")); } else { - e.getPresentation().setText(MavenProjectBundle.message("maven.ignore")); + e.getPresentation().setText(() -> MavenProjectBundle.message("maven.ignore")); } } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractIntegrateChangesAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractIntegrateChangesAction.java index aa7a01cd9f9c..12cd2d3eb6b1 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractIntegrateChangesAction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractIntegrateChangesAction.java @@ -39,7 +39,7 @@ public abstract class AbstractIntegrateChangesAction SvnBundle.message("action.Subversion.integrate.changes.actionname")); presentation.setDescription(SvnBundle.message("action.Subversion.integrate.changes.description")); final T checker = createChecker(); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/IgnoreActionGroup.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/IgnoreActionGroup.java index 110a1bcca1f5..aea9ca43c885 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/IgnoreActionGroup.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/IgnoreActionGroup.java @@ -85,7 +85,7 @@ public class IgnoreActionGroup extends DefaultActionGroup implements DumbAware { add(myRemoveExtensionAction); } - e.getPresentation().setText(SvnBundle.message("group.RevertIgnoreChoicesGroup.text")); + e.getPresentation().setText(() -> SvnBundle.message("group.RevertIgnoreChoicesGroup.text")); } else if (myHelperAction.allCanBeIgnored()) { final String ignoreExactlyName = (fileGroupInfo.oneFileSelected()) ? fileGroupInfo.getFileName() : SvnBundle.message("action.Subversion.Ignore.ExactMatch.text"); @@ -95,7 +95,7 @@ public class IgnoreActionGroup extends DefaultActionGroup implements DumbAware { myAddExtensionAction.setActionText(fileGroupInfo.getExtensionMask()); add(myAddExtensionAction); } - e.getPresentation().setText(SvnBundle.message("group.IgnoreChoicesGroup.text")); + e.getPresentation().setText(() -> SvnBundle.message("group.IgnoreChoicesGroup.text")); } } } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.java index 984c94c0e020..388b6543add9 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.java @@ -32,7 +32,7 @@ public class ShareWholeProject extends AnAction implements DumbAware { presentation.setVisible(checker.isVisible()); if (checker.isEnabled()) { - presentation.setText(SvnBundle.message("action.share.whole.project.text")); + presentation.setText(() -> SvnBundle.message("action.share.whole.project.text")); } } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java index c28a1dbd23ad..bb1f592ca82c 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java @@ -334,7 +334,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { protected class HistoryAction extends DumbAwareAction { @Override public void update(@NotNull AnActionEvent e) { - e.getPresentation().setText(SvnBundle.message("repository.browser.history.action")); + e.getPresentation().setText(() -> SvnBundle.message("repository.browser.history.action")); e.getPresentation().setDescription(SvnBundle.message("repository.browser.history.action")); final RepositoryTreeNode node = getRepositoryBrowser().getSelectedNode(); e.getPresentation().setEnabled(node != null && node.getURL() != null && !myProject.isDefault()); @@ -366,7 +366,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { @Override public void update(@NotNull AnActionEvent e) { - e.getPresentation().setText(SvnBundle.message("action.name.refresh")); + e.getPresentation().setText(() -> SvnBundle.message("action.name.refresh")); e.getPresentation().setDescription(SvnBundle.message("repository.browser.refresh.action")); e.getPresentation().setIcon(AllIcons.Actions.Refresh); e.getPresentation().setEnabled(myBrowserComponent.getSelectedNode() != null); @@ -394,7 +394,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { public void update(@NotNull AnActionEvent e) { if (e.getPlace().equals(PLACE_TOOLBAR)) { e.getPresentation().setDescription(SvnBundle.message("repository.browser.add.location.action.description")); - e.getPresentation().setText(SvnBundle.message("repository.browser.add.location.action.text")); + e.getPresentation().setText(() -> SvnBundle.message("repository.browser.add.location.action.text")); e.getPresentation().setIcon(IconUtil.getAddIcon()); } } @@ -434,7 +434,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { RepositoryTreeNode node = myBrowserComponent.getSelectedNode(); if (e.getPlace().equals(PLACE_TOOLBAR)) { e.getPresentation().setDescription(SvnBundle.message("repository.browser.edit.location.menu.item")); - e.getPresentation().setText(SvnBundle.message("repository.browser.edit.location.menu.item")); + e.getPresentation().setText(() -> SvnBundle.message("repository.browser.edit.location.menu.item")); e.getPresentation().setIcon(AllIcons.Actions.EditSource); } e.getPresentation().setEnabled(node != null && node.getParent() instanceof RepositoryTreeRootNode); @@ -868,7 +868,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { @Override public void update(@NotNull AnActionEvent e) { e.getPresentation().setVisible(showImportAction()); - e.getPresentation().setText(SvnBundle.message("repository.browser.import.action")); + e.getPresentation().setText(() -> SvnBundle.message("repository.browser.import.action")); setEnabled(e, getRepositoryBrowser().getSelectedNode(), ProjectLevelVcsManager.getInstance(myProject).isBackgroundVcsOperationRunning()); } @@ -960,7 +960,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { @Override public void update(@NotNull final AnActionEvent e) { e.getPresentation().setDescription(SvnBundle.message("repository.browser.details.action")); - e.getPresentation().setText(SvnBundle.message("repository.browser.details.action")); + e.getPresentation().setText(() -> SvnBundle.message("repository.browser.details.action")); e.getPresentation().setIcon(AllIcons.Actions.Annotate); super.update(e); } diff --git a/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java b/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java index 3e45d878fa57..27a0230bf342 100644 --- a/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java +++ b/python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java @@ -34,7 +34,7 @@ public class PythonDebugLanguageConsoleView extends DuplexConsoleView PyBundle.message("run.configuration.show.command.line.action.name")); List actions = ContainerUtil.newArrayList(PyConsoleUtil.createTabCompletionAction(getPydevConsoleView())); actions.add(PyConsoleUtil.createInterruptAction(getPydevConsoleView())); diff --git a/python/src/com/jetbrains/toolWindowWithActions/PanelWithActions.java b/python/src/com/jetbrains/toolWindowWithActions/PanelWithActions.java index cbd5fc5fd6b7..534255766155 100644 --- a/python/src/com/jetbrains/toolWindowWithActions/PanelWithActions.java +++ b/python/src/com/jetbrains/toolWindowWithActions/PanelWithActions.java @@ -104,7 +104,7 @@ final class PanelWithActions extends JPanel { @Override public void update(@NotNull final AnActionEvent e) { super.update(e); - e.getPresentation().setText(PyBundle.message("windowWithActions.closeWindow")); + e.getPresentation().setText(() -> PyBundle.message("windowWithActions.closeWindow")); } @Override diff --git a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java index 5f136e069835..6343557c3ea1 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java +++ b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java @@ -84,7 +84,7 @@ public class DeleteDomElement extends BaseDomTreeAction { e.getPresentation().setText(getPresentationText(selectedNode, ApplicationBundle.message("action.remove"))); } else { - e.getPresentation().setText(ApplicationBundle.message("action.remove")); + e.getPresentation().setText(() -> ApplicationBundle.message("action.remove")); } e.getPresentation().setIcon(AllIcons.General.Remove); diff --git a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/GotoDomElementDeclarationAction.java b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/GotoDomElementDeclarationAction.java index 95d41ea144a4..88f6447df741 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/GotoDomElementDeclarationAction.java +++ b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/GotoDomElementDeclarationAction.java @@ -44,6 +44,6 @@ public class GotoDomElementDeclarationAction extends BaseDomTreeAction { @Override public void update(AnActionEvent e, DomModelTreeView treeView) { e.getPresentation().setVisible(treeView.getTree().getSelectedNode() instanceof BaseDomElementNode); - e.getPresentation().setText(ActionsBundle.message("action.EditSource.text")); + e.getPresentation().setText(() -> ActionsBundle.message("action.EditSource.text")); } }