Use `XBundle.lazyMessage()` API for actions instead of lambda
authorDmitry.Krasilschikov <kradima@jetbrains.com>
Sun, 2 Feb 2020 15:16:03 +0000 (17:16 +0200)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Mon, 3 Feb 2020 09:39:27 +0000 (09:39 +0000)
Replace `() -> XBundle.message(...)` with `XBundle.lazyMessage()`

GitOrigin-RevId: e3a78fb386132ece124951e4411e4e07d02e5563

308 files changed:
images/src/org/intellij/images/thumbnail/actions/FilterByTagActionGroup.java
images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java
java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java
java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileAction.java
java/debugger/impl/src/com/intellij/debugger/actions/InterruptThreadAction.java
java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java
java/debugger/impl/src/com/intellij/debugger/actions/ViewTextAction.java
java/debugger/impl/src/com/intellij/debugger/settings/CaptureConfigurable.java
java/idea-ui/src/com/intellij/ide/actions/TemplateProjectStructureAction.java
java/idea-ui/src/com/intellij/openapi/externalSystem/action/AttachExternalProjectAction.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleAction.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryRootsComponent.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseLibrariesConfigurable.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
java/java-impl/src/com/intellij/application/options/ImportLayoutPanel.java
java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java
java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java
java/openapi/src/com/intellij/codeInsight/AnnotationsPanel.java
json/src/com/jetbrains/jsonSchema/settings/mappings/JsonSchemaMappingsConfigurable.java
platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/RefreshDirDiffAction.java
platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsBranchPopup.java
platform/dvcs-impl/src/com/intellij/dvcs/ui/BranchActionGroupPopup.java
platform/dvcs-impl/src/com/intellij/dvcs/ui/NewBranchAction.java
platform/execution-impl/src/com/intellij/execution/RunContentExecutor.java
platform/execution-impl/src/com/intellij/execution/actions/ClearConsoleAction.java
platform/execution-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java
platform/execution-impl/src/com/intellij/execution/actions/PauseOutputAction.java
platform/execution-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java
platform/execution-impl/src/com/intellij/execution/actions/ShowRunningListAction.java
platform/execution-impl/src/com/intellij/execution/actions/StopAction.java
platform/execution-impl/src/com/intellij/execution/runners/FakeRerunAction.java
platform/execution-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
platform/execution-impl/src/com/intellij/execution/update/UpdateRunningApplicationAction.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/DetachExternalProjectAction.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/IgnoreExternalProjectAction.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/OpenExternalConfigAction.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/OpenTasksActivationManagerAction.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/RefreshAllExternalProjectsAction.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/RefreshExternalProjectAction.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/action/ShowExternalSystemSettingsAction.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemRunConfiguration.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/util/ExternalSystemUtil.java
platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java
platform/lang-api/src/com/intellij/psi/codeStyle/ProjectCodeStyleSettingsManager.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementSectionRuleAction.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/EditArrangementRuleAction.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/EditRuleAliasesDefinitionAction.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementGroupingRuleDownAction.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementGroupingRuleUpAction.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementMatchingRuleDownAction.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/MoveArrangementMatchingRuleUpAction.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RemoveArrangementRuleAction.java
platform/lang-impl/src/com/intellij/build/BuildView.java
platform/lang-impl/src/com/intellij/build/CompositeView.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonEditorPopup.java
platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java
platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java
platform/lang-impl/src/com/intellij/codeInsight/generation/surroundWith/SurroundWithHandler.java
platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupUi.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesConfigurable.java
platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java
platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialogAction.java
platform/lang-impl/src/com/intellij/codeInspection/ui/QuickFixPreviewPanelFactory.java
platform/lang-impl/src/com/intellij/execution/console/DuplexConsoleView.java
platform/lang-impl/src/com/intellij/execution/dashboard/actions/DebugAction.java
platform/lang-impl/src/com/intellij/execution/dashboard/actions/RemoveRunConfigurationTypeAction.java
platform/lang-impl/src/com/intellij/execution/dashboard/actions/RunAction.java
platform/lang-impl/src/com/intellij/find/FindAllAction.java
platform/lang-impl/src/com/intellij/find/actions/ShowSearchHistoryAction.java
platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java
platform/lang-impl/src/com/intellij/find/impl/FindPopupScopeUIImpl.java
platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java
platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java
platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java
platform/lang-impl/src/com/intellij/ide/actions/PowerSaveModeNotifier.java
platform/lang-impl/src/com/intellij/ide/actions/QuickChangeCodeStyleSchemeAction.java
platform/lang-impl/src/com/intellij/ide/actions/WeighingActionGroup.java
platform/lang-impl/src/com/intellij/ide/actions/bigPopup/ShowFilterAction.java
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkAction.java
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/ToggleBookmarkWithMnemonicAction.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddAllOpenFilesToNewFavoritesListAction.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToNewFavoritesListAction.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java
platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java
platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseCallHierarchyAction.java
platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseMethodHierarchyAction.java
platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseTypeHierarchyAction.java
platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/CallHierarchyBrowserBase.java
platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/HierarchyBrowserBaseEx.java
platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/MethodHierarchyBrowserBase.java
platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/TypeHierarchyBrowserBase.java
platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseCallHierarchyAction.java
platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseMethodHierarchyAction.java
platform/lang-impl/src/com/intellij/ide/hierarchy/newAPI/actions/BrowseTypeHierarchyAction.java
platform/lang-impl/src/com/intellij/ide/navigationToolbar/ShowNavBarAction.java
platform/lang-impl/src/com/intellij/ide/projectView/actions/MarkSourceRootAction.java
platform/lang-impl/src/com/intellij/ide/projectView/actions/UnmarkRootAction.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
platform/lang-impl/src/com/intellij/ide/todo/SetTodoFilterAction.java
platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
platform/lang-impl/src/com/intellij/ide/todo/TodoView.java
platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java
platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilter.java
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java
platform/lang-impl/src/com/intellij/internal/AddInlayInternalAction.java
platform/lang-impl/src/com/intellij/internal/ComputeVirtualFileNameStatAction.java
platform/lang-impl/src/com/intellij/internal/DumpConfigurationTypesAction.java
platform/lang-impl/src/com/intellij/internal/DumpDirectoryInfoAction.java
platform/lang-impl/src/com/intellij/internal/DumpInspectionDescriptionsAction.java
platform/lang-impl/src/com/intellij/internal/DumpIntentionsAction.java
platform/lang-impl/src/com/intellij/internal/DumpVfsInfoForExcludedFilesAction.java
platform/lang-impl/src/com/intellij/internal/LoadAllContentsAction.java
platform/lang-impl/src/com/intellij/internal/LoadAllVfsStoredContentsAction.java
platform/lang-impl/src/com/intellij/lang/customFolding/GotoCustomRegionAction.java
platform/lang-impl/src/com/intellij/largeFilesEditor/search/actions/FindAllAction.java
platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java
platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ToggleExcludedStateAction.java
platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/actions/ToggleSourcesStateAction.java
platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java
platform/lang-impl/src/com/intellij/packageDependencies/actions/AnalyzeDependenciesOnSpecifiedTargetAction.java
platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java
platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectAction.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ScopesChooser.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ScopesOrderDialog.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/filter/InspectionFilterAction.java
platform/lang-impl/src/com/intellij/psi/templateLanguages/ChangeTemplateDataLanguageAction.java
platform/lang-impl/src/com/intellij/refactoring/actions/ExtractIncludeAction.java
platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeAction.java
platform/lang-impl/src/com/intellij/ui/debugger/ShowUiDebuggerAction.java
platform/lang-impl/src/com/intellij/ui/debugger/extensions/ActionTracer.java
platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java
platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java
platform/lang-impl/src/com/intellij/ui/popup/util/MasterDetailPopupBuilder.java
platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java
platform/lang-impl/src/com/intellij/webcore/packaging/InstalledPackagesPanel.java
platform/lang-impl/src/com/intellij/webcore/packaging/ManagePackagesDialog.java
platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java
platform/platform-api/src/com/intellij/ui/CommonActionsPanel.java
platform/platform-api/src/com/intellij/ui/InsertPathAction.java
platform/platform-api/src/com/intellij/ui/ReorderableListController.java
platform/platform-api/src/com/intellij/ui/treeStructure/actions/CollapseAllAction.java
platform/platform-api/src/com/intellij/ui/treeStructure/actions/ExpandAllAction.java
platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemeActions.java
platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
platform/platform-impl/src/com/intellij/designer/LightToolWindow.java
platform/platform-impl/src/com/intellij/ide/SystemHealthMonitor.java
platform/platform-impl/src/com/intellij/ide/actions/ActivateToolWindowAction.java
platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsAction.java
platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsToTheLeftAction.java
platform/platform-impl/src/com/intellij/ide/actions/CloseProjectAction.java
platform/platform-impl/src/com/intellij/ide/actions/CopyPathsAction.java
platform/platform-impl/src/com/intellij/ide/actions/CustomizeUIAction.java
platform/platform-impl/src/com/intellij/ide/actions/DataSharingOptionsAction.java
platform/platform-impl/src/com/intellij/ide/actions/DeleteAction.java
platform/platform-impl/src/com/intellij/ide/actions/MaintenanceAction.java
platform/platform-impl/src/com/intellij/ide/actions/RecentProjectsGroup.java
platform/platform-impl/src/com/intellij/ide/actions/SendFeedbackAction.java
platform/platform-impl/src/com/intellij/ide/actions/ShowFilePathAction.java
platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
platform/platform-impl/src/com/intellij/ide/actions/TabNavigationActionBase.java
platform/platform-impl/src/com/intellij/ide/actions/TemplateProjectPropertiesAction.java
platform/platform-impl/src/com/intellij/ide/actions/ToggleReadOnlyAttributeAction.java
platform/platform-impl/src/com/intellij/ide/actions/WhatsNewAction.java
platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java
platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditTabs.java
platform/platform-impl/src/com/intellij/ide/lightEdit/actions/LightEditExitAction.java
platform/platform-impl/src/com/intellij/ide/lightEdit/actions/LightEditNewFileAction.java
platform/platform-impl/src/com/intellij/ide/lightEdit/actions/LightEditSaveAsAction.java
platform/platform-impl/src/com/intellij/ide/plugins/InstallFromDiskAction.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java
platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java
platform/platform-impl/src/com/intellij/internal/ToggleLaggingModeAction.java
platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java
platform/platform-impl/src/com/intellij/internal/focus/FocusDebuggerAction.java
platform/platform-impl/src/com/intellij/internal/focus/FocusTracesAction.java
platform/platform-impl/src/com/intellij/internal/inspector/UiDropperAction.java
platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java
platform/platform-impl/src/com/intellij/notification/impl/actions/MarkAllNotificationsAsReadAction.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/RemoveBomAction.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/ToggleUseSoftWrapsMenuAction.java
platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/TogglePathShowingAction.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/ReopenClosedTabAction.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.java
platform/platform-impl/src/com/intellij/openapi/preview/impl/PreviewManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/AddManyTestProcesses.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ShowProcessWindowAction.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/CardActionsPanel.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/OpenSelectedProjectsAction.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/RemoveSelectedProjectsFromGroupsAction.java
platform/platform-impl/src/com/intellij/terminal/TerminalExecutionConsole.java
platform/platform-impl/src/com/intellij/ui/FinderRecursivePanel.java
platform/platform-impl/src/com/intellij/util/ui/ReloadablePanel.java
platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/AddCloudConnectionActionGroup.java
platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ui/tree/actions/DeployAction.java
platform/statistics/devkit/src/com/intellij/internal/statistic/actions/AddTestGroupToLocalWhitelistAction.java
platform/statistics/devkit/src/com/intellij/internal/statistic/actions/OpenEventLogFileAction.java
platform/statistics/devkit/src/com/intellij/internal/statistic/actions/RecordStateStatisticsEventLogAction.java
platform/structuralsearch/source/com/intellij/structuralsearch/inspection/StructuralSearchProfileActionProvider.java
platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/DirectoryComboBoxWithButtons.java
platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java
platform/tasks-platform-impl/src/com/intellij/tasks/context/BranchContextTracker.java
platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java
platform/testRunner/src/com/intellij/execution/testframework/autotest/ToggleAutoTestAction.java
platform/usageView/src/com/intellij/usages/impl/UsageFilteringRuleProviderImpl.java
platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
platform/usageView/src/com/intellij/usages/impl/rules/UsageType.java
platform/vcs-api/src/com/intellij/openapi/vcs/ui/SearchFieldAction.java
platform/vcs-impl/src/com/intellij/ide/actions/StartUseVcsAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/OpenRepositoryVersionAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffPreviewAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ignore/IgnoredFileGeneratorImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/tool/ApplyPatchViewer.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/DiffShelvedChangesWithLocalActionProvider.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ImportIntoShelfAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/RestoreShelvedChange.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleLocalChangeListsBrowser.java
platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.java
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/history/actions/CompareRevisionsAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/history/actions/CreatePatchFromDirectoryAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/history/actions/GetVersionAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/AllVcses.java
platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootProblemNotifier.java
platform/vcs-impl/src/com/intellij/openapi/vcs/update/ShowUpdatedDiffActionProvider.java
platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/FocusTextFilterAction.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/HighlightersActionGroup.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/IntelliSortChooserPopupAction.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/ShowCommitTooltipAction.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromFileHistoryActionProvider.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/DateFilterPopupComponent.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/BreakpointsDialog.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/DebuggerTreeWithHistoryContainer.java
plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java
plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/xml/XmlLanguageInjectionSupport.java
plugins/ant/src/com/intellij/lang/ant/config/actions/RunTargetAction.java
plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java
plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationsListEditor.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ui/BrowserPanel.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportTree.java
plugins/devkit/devkit-core/src/build/PrepareAllToDeployAction.java
plugins/devkit/devkit-core/src/build/PrepareToDeployAction.java
plugins/devkit/devkit-core/src/themes/ThemeColorAnnotator.java
plugins/git4idea/src/git4idea/actions/GitMergeAction.java
plugins/git4idea/src/git4idea/branch/GitDeleteTagOperation.java
plugins/git4idea/src/git4idea/merge/GitConflictResolver.java
plugins/github/src/org/jetbrains/plugins/github/util/GithubNotifications.java
plugins/gradle-maven/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyAction.java
plugins/gradle/java/src/codeInsight/actions/AddGradleDslPluginAction.java
plugins/gradle/src/org/jetbrains/plugins/gradle/action/GradleRefreshProjectDependenciesAction.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCommittedChangesProvider.java
plugins/jps-cache/src/com/intellij/jps/cache/JpsCachesDummyProjectComponent.java
plugins/jps-cache/src/com/intellij/jps/cache/loader/JpsOutputLoaderManager.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRebuildAction.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleIgnoredProjectsAction.java
plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java
plugins/properties/src/com/intellij/lang/properties/create/AddNewPropertyFileAction.java
plugins/properties/src/com/intellij/lang/properties/customizeActions/CombinePropertiesFilesAction.java
plugins/sh/src/com/intellij/sh/formatter/ShExternalFormatter.java
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/AbstractIntegrateChangesAction.java
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/IgnoreActionGroup.java
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/RemoveFromIgnoreListAction.java
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShareWholeProject.java
plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/context/LoadContextAction.java
plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalView.java
plugins/ui-designer-core/src/com/intellij/designer/DesignerToolWindow.java
plugins/ui-designer-core/src/com/intellij/designer/actions/DesignerActionPanel.java
plugins/ui-designer/src/com/intellij/uiDesigner/actions/ChooseLocaleAction.java
plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormUsageTypeProvider.java
python/src/com/jetbrains/python/console/PydevConsoleRunnerImpl.java
python/src/com/jetbrains/python/console/PythonDebugLanguageConsoleView.java
python/src/com/jetbrains/python/packaging/ui/PyInstalledPackagesPanel.java
python/src/com/jetbrains/toolWindowWithActions/PanelWithActions.java
xml/dom-impl/src/com/intellij/util/xml/DomUsageTypeProvider.java
xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java
xml/dom-impl/src/com/intellij/util/xml/tree/actions/GotoDomElementDeclarationAction.java
xml/dom-openapi/src/com/intellij/util/xml/ui/actions/AddDomElementAction.java
xml/impl/src/com/intellij/ide/browsers/OpenUrlHyperlinkInfo.java
xml/relaxng/src/org/intellij/plugins/relaxNG/convert/AdvancedDtdOptions.java

index e43fb164e8b1654fa07bfe06924ef9e738a6d17b..7850d9ab6baff05292a2cae7d3b2f67af1129183 100644 (file)
@@ -64,7 +64,7 @@ public final class FilterByTagActionGroup extends ActionGroup implements PopupAc
 
         List<MyToggleAction> tagActions =
           ContainerUtil.map(tagManager.getAllTags(), tag -> new MyToggleAction(view, new TagFilter(tag, tagManager)));
-        group.add(new AnAction(() -> IdeBundle.message("action.Anonymous.text.all")) {
+        group.add(new AnAction(IdeBundle.lazyMessage("action.Anonymous.text.all")) {
             @Override
             public void actionPerformed(@NotNull AnActionEvent e) {
                 for (MyToggleAction tagAction : tagActions) {
index 77f545d5aa60c2b7bad4c40e91dcc0cfff2c280c..18462a16a9bed3877eddedfd1f67754a6e3e5364 100644 (file)
@@ -731,7 +731,7 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable {
             }
           };
         }
-        actions[tagsNumber] = new AnAction(() -> IdeBundle.message("action.Anonymous.text.new.tag")) {
+        actions[tagsNumber] = new AnAction(IdeBundle.lazyMessage("action.Anonymous.text.new.tag")) {
           @Override
           public void actionPerformed(@NotNull AnActionEvent e) {
             ThumbnailView view = ThumbnailViewActionUtil.getVisibleThumbnailView(e);
index 3080a9a16a21ed587c08aa9588c2ea2f6e048514..f3d2d382ccbd2dd90c02944d64604ea2ea36aad2 100644 (file)
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
 */
 class CompilerPropertiesAction extends AnAction {
   CompilerPropertiesAction() {
-    super(() -> CompilerBundle.message("action.compiler.properties.text"), AllIcons.General.Settings);
+    super(CompilerBundle.lazyMessage("action.compiler.properties.text"), AllIcons.General.Settings);
   }
 
   @Override
index 6aeee7a9a64b8166029669d3f3a09cb2f6273050..fd7767f6d1255cadbecc550fa0431da0ae034d01 100644 (file)
@@ -48,7 +48,7 @@ public class PackageFileAction extends AnAction {
   }
 
   public PackageFileAction() {
-    super(() -> CompilerBundle.message("action.name.package.file"), () -> CompilerBundle.message("action.description.package.file"), null);
+    super(CompilerBundle.lazyMessage("action.name.package.file"), CompilerBundle.lazyMessage("action.description.package.file"), null);
   }
 
   @Override
index bc1c062e8a2a16f63f5d5fe292ec0d1cb88bda58..5ba331c4389349a8ccccb442b258d5bf82ad18f1 100644 (file)
@@ -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.lazyMessage("action.interrupt.thread.text"));
     presentation.setEnabledAndVisible(visible && enabled);
   }
 }
index 6efd5f03d3bdc911110811d2c0adea618a6850cc..7bcb6850ceefc4aa0ce1e415d753d30d6f31ae8a 100644 (file)
@@ -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.lazyMessage("action.add.field.watchpoint.text"));
       Project project = event.getData(CommonDataKeys.PROJECT);
       if(project != null && place != null) {
         Document document = PsiDocumentManager.getInstance(project).getDocument(place.getFile());
index 1d16cf1362783447bfc0092b8f4a40fad18e1c90..c5610c5e882abedb6adbadf03ac21176f40cb480 100644 (file)
@@ -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.lazyMessage("action.Debugger.ViewEditText.text"));
     }
   }
 
index 3ccee12bd782861d1b4b9b10211b525288c39ef8..2ab3ef0a8a32a287c7bd4755c8c73fdfded90aef 100644 (file)
@@ -138,8 +138,8 @@ public class CaptureConfigurable implements SearchableConfigurable, NoScroll {
       }
     });
 
-    decorator.addExtraAction(new DumbAwareActionButton(() -> DebuggerBundle.message("action.AnActionButton.text.duplicate"),
-                                                       () -> DebuggerBundle.message("action.AnActionButton.description.duplicate"),
+    decorator.addExtraAction(new DumbAwareActionButton(DebuggerBundle.lazyMessage("action.AnActionButton.text.duplicate"),
+                                                       DebuggerBundle.lazyMessage("action.AnActionButton.description.duplicate"),
                                                        PlatformIcons.COPY_ICON) {
       @Override
       public boolean isEnabled() {
@@ -160,8 +160,8 @@ public class CaptureConfigurable implements SearchableConfigurable, NoScroll {
       }
     });
 
-    decorator.addExtraAction(new DumbAwareActionButton(() -> DebuggerBundle.message("action.AnActionButton.text.enable.selected"),
-                                                       () -> DebuggerBundle.message("action.AnActionButton.description.enable.selected"),
+    decorator.addExtraAction(new DumbAwareActionButton(DebuggerBundle.lazyMessage("action.AnActionButton.text.enable.selected"),
+                                                       DebuggerBundle.lazyMessage("action.AnActionButton.description.enable.selected"),
                                                        PlatformIcons.SELECT_ALL_ICON) {
       @Override
       public boolean isEnabled() {
@@ -174,8 +174,8 @@ public class CaptureConfigurable implements SearchableConfigurable, NoScroll {
         table.repaint();
       }
     });
-    decorator.addExtraAction(new DumbAwareActionButton(() -> DebuggerBundle.message("action.AnActionButton.text.disable.selected"),
-                                                       () -> DebuggerBundle.message("action.AnActionButton.description.disable.selected"),
+    decorator.addExtraAction(new DumbAwareActionButton(DebuggerBundle.lazyMessage("action.AnActionButton.text.disable.selected"),
+                                                       DebuggerBundle.lazyMessage("action.AnActionButton.description.disable.selected"),
                                                        PlatformIcons.UNSELECT_ALL_ICON) {
       @Override
       public boolean isEnabled() {
@@ -202,8 +202,8 @@ public class CaptureConfigurable implements SearchableConfigurable, NoScroll {
       }
     }.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0)), table);
 
-    decorator.addExtraAction(new DumbAwareActionButton(() -> DebuggerBundle.message("action.AnActionButton.text.import"),
-                                                       () -> DebuggerBundle.message("action.AnActionButton.description.import"),
+    decorator.addExtraAction(new DumbAwareActionButton(DebuggerBundle.lazyMessage("action.AnActionButton.text.import"),
+                                                       DebuggerBundle.lazyMessage("action.AnActionButton.description.import"),
                                                        AllIcons.Actions.Install) {
       @Override
       public void actionPerformed(@NotNull final AnActionEvent e) {
@@ -241,8 +241,8 @@ public class CaptureConfigurable implements SearchableConfigurable, NoScroll {
         }
       }
     });
-    decorator.addExtraAction(new DumbAwareActionButton(() -> DebuggerBundle.message("action.AnActionButton.text.export"),
-                                                       () -> DebuggerBundle.message("action.AnActionButton.description.export"),
+    decorator.addExtraAction(new DumbAwareActionButton(DebuggerBundle.lazyMessage("action.AnActionButton.text.export"),
+                                                       DebuggerBundle.lazyMessage("action.AnActionButton.description.export"),
                                                        AllIcons.ToolbarDecorator.Export) {
       @Override
       public void actionPerformed(@NotNull final AnActionEvent e) {
index ccc997fb578e24658a8112d1906f16bb463ed66e..f545c16a3672e58a923eb2bf9f7081c0832c9f8f 100644 (file)
@@ -12,8 +12,8 @@ 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().setDescription(() -> ActionsBundle.message("action.TemplateProjectStructure.description.template", projectConceptName));
+    getTemplatePresentation().setText(ActionsBundle.lazyMessage("action.TemplateProjectStructure.text.template", projectConceptName));
+    getTemplatePresentation().setDescription(ActionsBundle.lazyMessage("action.TemplateProjectStructure.description.template", projectConceptName));
   }
 
   @Override
index a65f9c314b5c2c894d4f9c9d3652d15af9dce7b7..9771a626244625905657eb65f01691af43536a70 100644 (file)
@@ -24,8 +24,8 @@ import org.jetbrains.annotations.NotNull;
 public class AttachExternalProjectAction extends DumbAwareAction {
 
   public AttachExternalProjectAction() {
-    getTemplatePresentation().setText(() -> ExternalSystemBundle.message("action.attach.external.project.text", "External"));
-    getTemplatePresentation().setDescription(() -> ExternalSystemBundle.message("action.attach.external.project.description", "external"));
+    getTemplatePresentation().setText(ExternalSystemBundle.lazyMessage("action.attach.external.project.text", "External"));
+    getTemplatePresentation().setDescription(ExternalSystemBundle.lazyMessage("action.attach.external.project.description", "external"));
   }
 
   @Override
@@ -34,8 +34,8 @@ 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.setDescription(() -> ExternalSystemBundle.message("action.attach.external.project.description", name));
+      presentation.setText(ExternalSystemBundle.lazyMessage("action.attach.external.project.text", name));
+      presentation.setDescription(ExternalSystemBundle.lazyMessage("action.attach.external.project.description", name));
     }
 
     presentation.setIcon(AllIcons.General.Add);
index 6f60d13c091290bce51906f893223841d8cdd36b..7d34679f32bc866f0e7d64c3372d3bb6b97c418d 100644 (file)
@@ -105,7 +105,7 @@ public class JavadocEditor extends ModuleElementsEditor {
             TableUtil.selectRows(myTable, new int[]{tableModel.getRowCount() - 1});
           }
         }
-      }).addExtraAction(new DumbAwareActionButton(() -> ProjectBundle.message("module.javadoc.add.url.button"), IconUtil.getAddLinkIcon()) {
+      }).addExtraAction(new DumbAwareActionButton(ProjectBundle.lazyMessage("module.javadoc.add.url.button"), IconUtil.getAddLinkIcon()) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
           VirtualFile[] files = new VirtualFile[]{Util.showSpecifyJavadocUrlDialog(myTable)};
index ac82775d1d4d05e6e07cbe4a62d278dd2802ed90..c4710e7e9894ee1d388f01ce92eed92cdf07359c 100644 (file)
@@ -27,7 +27,7 @@ import java.util.List;
  */
 public class NewModuleAction extends AnAction implements DumbAware, NewProjectOrModuleAction {
   public NewModuleAction() {
-    super(() -> ProjectBundle.message("module.new.action", 0, 1), () -> ProjectBundle.message("module.new.action.description"), null);
+    super(ProjectBundle.lazyMessage("module.new.action", 0, 1), ProjectBundle.lazyMessage("module.new.action.description"), null);
   }
 
   @Override
index b6918583cfd0abea6152d96acbdd9e679ec8bb40..1a2f4bdcd58034be4a5d97458cde5b1389e2bbde 100644 (file)
@@ -376,7 +376,7 @@ public class ArtifactsStructureConfigurable extends BaseStructureConfigurable {
 
   private class CopyArtifactAction extends AnAction {
    private CopyArtifactAction() {
-      super(() -> CommonBundle.message("button.copy"), () -> CommonBundle.message("button.copy"), COPY_ICON);
+      super(CommonBundle.lazyMessage("button.copy"), CommonBundle.lazyMessage("button.copy"), COPY_ICON);
     }
 
     @Override
index b1aa4344774543b2d74a95490362744ecf6dd435..5ddd05d2baa3f8a949e2cf86c84e6d04a0f93575 100644 (file)
@@ -54,7 +54,7 @@ public class JavadocOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
 
     @Override
     protected void addToolbarButtons(ToolbarDecorator toolbarDecorator) {
-      AnActionButton specifyUrlButton = new DumbAwareActionButton(() -> ProjectBundle.message("sdk.paths.specify.url.button"), IconUtil.getAddLinkIcon()) {
+      AnActionButton specifyUrlButton = new DumbAwareActionButton(ProjectBundle.lazyMessage("sdk.paths.specify.url.button"), IconUtil.getAddLinkIcon()) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
           onSpecifyUrlButtonClicked();
index ee5141d07824e2f8ad935bf301d91189017dc74e..db6f31e6bd2d20060f470a7546a4c658f3ea853a 100644 (file)
@@ -180,7 +180,7 @@ public class LibraryRootsComponent implements Disposable, LibraryEditorComponent
     }
     myAddExcludedRootActionButton = new AddExcludedRootActionButton();
     toolbarDecorator.addExtraAction(myAddExcludedRootActionButton);
-    toolbarDecorator.addExtraAction(new AnActionButton(() -> IdeBundle.message("action.AnActionButton.text.remove"), IconUtil.getRemoveIcon()) {
+    toolbarDecorator.addExtraAction(new AnActionButton(IdeBundle.lazyMessage("action.AnActionButton.text.remove"), IconUtil.getRemoveIcon()) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         final List<Object> selectedElements = getSelectedElements();
index d3c34422d233c58e9e6ffae7254d0eceef61b995..33d621ef9e01eaed07f339f48ecf536ab2c6a9f4 100644 (file)
@@ -351,7 +351,7 @@ public abstract class BaseLibrariesConfigurable extends BaseStructureConfigurabl
 
   private class CopyLibraryAction extends AnAction {
    private CopyLibraryAction() {
-      super(() -> CommonBundle.message("button.copy"), () -> CommonBundle.message("button.copy"), COPY_ICON);
+      super(CommonBundle.lazyMessage("button.copy"), CommonBundle.lazyMessage("button.copy"), COPY_ICON);
     }
 
     @Override
index b764784e33a133e92e15b0e9fccd836973ffe418..58fa887084262a700e647dbea6373f36bab52c7c 100644 (file)
@@ -898,7 +898,7 @@ public class ModuleStructureConfigurable extends BaseStructureConfigurable imple
 
   private class MyCopyAction extends AnAction implements DumbAware {
     private MyCopyAction() {
-      super(() -> CommonBundle.message("button.copy"), () -> CommonBundle.message("button.copy"), COPY_ICON);
+      super(CommonBundle.lazyMessage("button.copy"), CommonBundle.lazyMessage("button.copy"), COPY_ICON);
     }
 
     @Override
index 2d4f1e5e9ed6352a3e0496e40c6692f90cd8b377..6e8b651e457dc31d84338c8c36ae92c5230d53fb 100644 (file)
@@ -99,7 +99,7 @@ public abstract class ImportLayoutPanel extends JPanel {
     add(myCbLayoutStaticImportsSeparately, BorderLayout.NORTH);
 
     JPanel importLayoutPanel = ToolbarDecorator.createDecorator(myImportLayoutTable = createTableForPackageEntries(myImportLayoutList, this))
-      .addExtraAction(new DumbAwareActionButton(() -> ApplicationBundle.message("button.add.package"), IconUtil.getAddPackageIcon()) {
+      .addExtraAction(new DumbAwareActionButton(ApplicationBundle.lazyMessage("button.add.package"), IconUtil.getAddPackageIcon()) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
           addPackageToImportLayouts();
@@ -110,7 +110,7 @@ public abstract class ImportLayoutPanel extends JPanel {
           return CommonShortcuts.getNewForDialogs();
         }
       })
-      .addExtraAction(new DumbAwareActionButton(() -> ApplicationBundle.message("button.add.blank"), IconUtil.getAddBlankLineIcon()) {
+      .addExtraAction(new DumbAwareActionButton(ApplicationBundle.lazyMessage("button.add.blank"), IconUtil.getAddBlankLineIcon()) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
           addBlankLine();
index b5f98ac5c9dad72e6ec5a58a0fdb891647acde11..60a06be3429609deab64965f8778152de26ae4af 100644 (file)
@@ -1377,7 +1377,7 @@ public class JavaDocInfoGenerator {
   }
 
   private void generateDeprecatedSection(StringBuilder buffer, PsiDocComment comment) {
-    generateSingleTagSection(buffer, comment, "deprecated", () -> CodeInsightBundle.message("javadoc.deprecated"));
+    generateSingleTagSection(buffer, comment, "deprecated", CodeInsightBundle.lazyMessage("javadoc.deprecated"));
   }
 
   private void generateSingleTagSection(StringBuilder buffer,
@@ -1393,7 +1393,7 @@ public class JavaDocInfoGenerator {
   }
 
   private void generateSinceSection(StringBuilder buffer, PsiDocComment comment) {
-    generateSingleTagSection(buffer, comment, "since", () -> CodeInsightBundle.message("javadoc.since"));
+    generateSingleTagSection(buffer, comment, "since", CodeInsightBundle.lazyMessage("javadoc.since"));
   }
 
   protected void generateSeeAlsoSection(StringBuilder buffer, PsiDocComment comment) {
index 4e0c7a4004a1bbd73721e197b67d9aa8293b63be..2f8b3c8349fe1007a58906d867a481a0d8d1da1e 100644 (file)
@@ -392,7 +392,7 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
 
   private final class CloseAction extends AnAction implements DumbAware {
     CloseAction() {
-      super(() -> CommonBundle.message("action.close"), () -> AnalysisScopeBundle.message("action.close.dependency.description"),
+      super(CommonBundle.lazyMessage("action.close"), AnalysisScopeBundle.lazyMessage("action.close.dependency.description"),
             AllIcons.Actions.Cancel);
     }
 
index fe8cad299ea49caade91f28944deb86378813f53..757a83a6f6797a50332be2ba21e98146ada9522a 100644 (file)
@@ -393,7 +393,7 @@ public class PackageChooserDialog extends PackageChooser {
 
   private class NewPackageAction extends AnAction {
     NewPackageAction() {
-      super(() -> IdeBundle.message("action.new.package"), () -> IdeBundle.message("action.description.create.new.package"),
+      super(IdeBundle.lazyMessage("action.new.package"), IdeBundle.lazyMessage("action.description.create.new.package"),
             AllIcons.Actions.NewFolder);
     }
 
index 678b94a8557db4f96f7dbedf10eeecf716e6c9e4..a73c130dd28538917577f145e45bb265257f1a50 100644 (file)
@@ -114,7 +114,7 @@ public class AnnotationsPanel {
     }
 
     final AnActionButton selectButton =
-      new AnActionButton(() -> CodeInsightBundle.message("action.AnActionButton.text.select.annotation.used.for.code.generation"),
+      new AnActionButton(CodeInsightBundle.lazyMessage("action.AnActionButton.text.select.annotation.used.for.code.generation"),
                          AllIcons.Actions.Checked) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
index b1f79e37f9c2901941b03df442c9283248c8ee44..6bec1d79467a7a4c6859a7a262f434ab2fd61ff5 100644 (file)
@@ -74,8 +74,8 @@ public class JsonSchemaMappingsConfigurable extends MasterDetailsComponent imple
   protected ArrayList<AnAction> createActions(boolean fromPopup) {
     final ArrayList<AnAction> result = new ArrayList<>();
     result.add(new DumbAwareAction(
-      () -> JsonBundle.message("action.DumbAware.JsonSchemaMappingsConfigurable.text.add"),
-      () -> JsonBundle.message("action.DumbAware.JsonSchemaMappingsConfigurable.description.add"),
+      JsonBundle.lazyMessage("action.DumbAware.JsonSchemaMappingsConfigurable.text.add"),
+      JsonBundle.lazyMessage("action.DumbAware.JsonSchemaMappingsConfigurable.description.add"),
       IconUtil.getAddIcon()) {
       {
         registerCustomShortcutSet(CommonShortcuts.INSERT, myTree);
index 70132cdf97a3cafe7eb54fda634e64950873334e..640db6ad23bbefffeba9606b8aec6815691f6285 100644 (file)
@@ -261,7 +261,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer {
       diffGroup.add(new ShowDiffWithBaseAction(ThreeSide.RIGHT));
       group.add(diffGroup);
 
-      group.add(new Separator(() -> DiffBundle.message("action.Anonymous.text.apply.non.conflicting.changes")));
+      group.add(new Separator(DiffBundle.lazyMessage("action.Anonymous.text.apply.non.conflicting.changes")));
       group.add(new ApplyNonConflictsAction(ThreeSide.LEFT, "Left"));
       group.add(new ApplyNonConflictsAction(ThreeSide.BASE, "All"));
       group.add(new ApplyNonConflictsAction(ThreeSide.RIGHT, "Right"));
index 5eb3ff074b9ecf34b11bf207ab76771ce809fa32..d287f3c12db81c9020dc7380798187cc27aab390 100644 (file)
@@ -720,7 +720,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase {
       super(focusedSide.other());
 
       copyShortcutFrom(ActionManager.getInstance().getAction(focusedSide.select("Diff.AppendLeftSide", "Diff.AppendRightSide")));
-      getTemplatePresentation().setText(() -> DiffBundle.message("action.presentation.UnifiedDiffViewer.text"));
+      getTemplatePresentation().setText(DiffBundle.lazyMessage("action.presentation.UnifiedDiffViewer.text"));
       getTemplatePresentation().setIcon(DiffUtil.getArrowDownIcon(focusedSide));
     }
 
index e9ed3226f07870d8cbbeead45e561bc6b26a67b1..4585db47285a17d4c6502156099019a51ebf3c18 100644 (file)
@@ -141,7 +141,7 @@ public class DirDiffPanel implements Disposable, DataProvider {
       }
     });
     if (model.isOperationsEnabled()) {
-      new DumbAwareAction(() -> DiffBundle.message("action.Anonymous.text.change.diff.operation")) {
+      new DumbAwareAction(DiffBundle.lazyMessage("action.Anonymous.text.change.diff.operation")) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
           changeOperationForSelection();
index 0b880b217e3e29dbbcbbc455f742af9359611852..f79824d96fb2afa9a12509f9b235fc55846157af 100644 (file)
@@ -18,7 +18,7 @@ public class RefreshDirDiffAction extends DirDiffAction {
 
   public RefreshDirDiffAction(DirDiffTableModel model) {
     super(model);
-    getTemplatePresentation().setText(() -> DiffBundle.message("action.presentation.RefreshDirDiffAction.text"));
+    getTemplatePresentation().setText(DiffBundle.lazyMessage("action.presentation.RefreshDirDiffAction.text"));
     getTemplatePresentation().setIcon(PlatformIcons.SYNCHRONIZE_ICON);
   }
 
index 2581d7a823e77c991c58b66f5168d88550b54c98..04d0be51bce1f11ccd101be25a03ee3bda17b5d8 100644 (file)
@@ -96,7 +96,7 @@ public abstract class DvcsBranchPopup<Repo extends Repository> {
   private void notifyAboutSyncedBranches() {
     Notification notification = STANDARD_NOTIFICATION.createNotification("Branch Operations Are Executed on All Roots", "", NotificationType.INFORMATION, null);
     notification
-      .addAction(NotificationAction.createSimple(() -> DvcsBundle.message("action.NotificationAction.DvcsBranchPopup.text.disable"), () -> {
+      .addAction(NotificationAction.createSimple(DvcsBundle.lazyMessage("action.NotificationAction.DvcsBranchPopup.text.disable"), () -> {
       ShowSettingsUtil.getInstance().showSettingsDialog(myProject, myVcs.getConfigurable().getDisplayName());
       if (myVcsSettings.getSyncSetting() == DvcsSyncSettings.Value.DONT_SYNC) {
         notification.expire();
index 558e900d1ddbfd1ec7c7e82232cb84f7128b3959..4c0fb43c4bb4bd03f027f02578293932b224c526 100644 (file)
@@ -89,7 +89,7 @@ public final class BranchActionGroupPopup extends FlatSpeedSearchPopup {
       }
     };
     AnAction restoreSizeButton =
-      new AnAction(() -> DvcsBundle.message("action.BranchActionGroupPopup.Anonymous.text.restore.size"), CollapseComponentHover) {
+      new AnAction(DvcsBundle.lazyMessage("action.BranchActionGroupPopup.Anonymous.text.restore.size"), CollapseComponentHover) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         WindowStateService.getInstance(myProject).putSizeFor(myProject, dimensionKey, null);
index 3e05233c6ca2e175c43037cc70394f9bac8f2ebd..255b5ae2ba173efb6be034a7afb17b6c9f10e9f8 100644 (file)
@@ -49,7 +49,7 @@ public abstract class NewBranchAction<T extends Repository> extends DumbAwareAct
   public static <T extends Repository> void checkIfAnyRepositoryIsFresh(@NotNull AnActionEvent e, @NotNull List<T> repositories) {
     if (DvcsUtil.anyRepositoryIsFresh(repositories)) {
       e.getPresentation().setEnabled(false);
-      e.getPresentation().setDescription(() -> DvcsBundle.message("action.presentation.NewBranchAction.description"));
+      e.getPresentation().setDescription(DvcsBundle.lazyMessage("action.presentation.NewBranchAction.description"));
     }
   }
 
index 7c9eead79de5301d76a6989ded248a5a69c16324..89c13381cc41f3873919d92b71a57acddc10bd98 100644 (file)
@@ -196,8 +196,8 @@ public class RunContentExecutor implements Disposable {
 
   private class StopAction extends AnAction implements DumbAware {
   StopAction() {
-    super(() -> ExecutionBundle.message("action.AnAction.text.stop"),
-          () -> ExecutionBundle.message("action.AnAction.description.stop"), AllIcons.Actions.Suspend);
+    super(ExecutionBundle.lazyMessage("action.AnAction.text.stop"),
+          ExecutionBundle.lazyMessage("action.AnAction.description.stop"), AllIcons.Actions.Suspend);
   }
 
     @Override
index 32855266f70b6b0247e44d3e5d07c8d4d684a83b..531ee8d6a0ae00424cea3318cda9435344044dc1 100644 (file)
@@ -11,8 +11,8 @@ import org.jetbrains.annotations.NotNull;
 
 public class ClearConsoleAction extends DumbAwareAction {
   public ClearConsoleAction() {
-    super(() -> ExecutionBundle.message("clear.all.from.console.action.name"),
-          () -> ExecutionBundle.message("clear.all.from.console.action.description"), AllIcons.Actions.GC);
+    super(ExecutionBundle.lazyMessage("clear.all.from.console.action.name"),
+          ExecutionBundle.lazyMessage("clear.all.from.console.action.description"), AllIcons.Actions.GC);
   }
 
   @Override
index 65bcfcba3ee473fa7be4990077d76cb6f81d9bd4..7cd141f61ceef4ee42e444fbe154a4bbdba8d450 100644 (file)
@@ -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.lazyMessage("edit.configuration.action"));
       presentation.setDescription(presentation.getText());
     }
   }
index 6f17c61fd0cba5e33f7e779598d93757dd7c7359..69208796609e0c34b38ebb8f177896afc4dae0e7 100644 (file)
@@ -16,7 +16,7 @@ import org.jetbrains.annotations.Nullable;
 
 public class PauseOutputAction extends ToggleAction implements DumbAware {
     public PauseOutputAction() {
-      super(() -> ExecutionBundle.message("run.configuration.pause.output.action.name"), AllIcons.Actions.Pause);
+      super(ExecutionBundle.lazyMessage("run.configuration.pause.output.action.name"), AllIcons.Actions.Pause);
     }
 
     @Nullable
index 95c0a76cec1235a5a4274c92c6fba1f2d8fd821a..a1d889e7bf3c5925acca4cc491d1c726323b8d1e 100644 (file)
@@ -48,7 +48,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D
     Presentation presentation = e.getPresentation();
     Project project = e.getData(CommonDataKeys.PROJECT);
     if (ActionPlaces.isMainMenuOrActionSearch(e.getPlace())) {
-      presentation.setDescription(() -> ExecutionBundle.message("choose.run.configuration.action.description"));
+      presentation.setDescription(ExecutionBundle.lazyMessage("choose.run.configuration.action.description"));
     }
     try {
       if (project == null || project.isDisposed() || !project.isOpen()) {
@@ -91,7 +91,7 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D
     }
     else {
       presentation.putClientProperty(BUTTON_MODE, Boolean.TRUE);
-      presentation.setText(() -> ExecutionBundle.message("action.presentation.RunConfigurationsComboBoxAction.text"));
+      presentation.setText(ExecutionBundle.lazyMessage("action.presentation.RunConfigurationsComboBoxAction.text"));
       presentation.setDescription(ActionsBundle.actionDescription(IdeActions.ACTION_EDIT_RUN_CONFIGURATIONS));
       if (ActionPlaces.TOUCHBAR_GENERAL.equals(actionPlace))
         presentation.setIcon(AllIcons.General.Add);
@@ -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.lazyMessage("save.temporary.run.configuration.action.name", Executor.shortenNameIfNeeded(settings.getName())));
         presentation.setDescription(presentation.getText());
         presentation.setEnabledAndVisible(true);
       }
index 4b17f011f91de10c68c64c29902d7145d6396739..92802c8d2be836db45d26d4b1e278002dd68a63c 100644 (file)
@@ -44,8 +44,8 @@ import java.util.Set;
 
 public final class ShowRunningListAction extends AnAction {
   public ShowRunningListAction() {
-    super(() -> ExecutionBundle.message("show.running.list.action.name"),
-          () -> ExecutionBundle.message("show.running.list.action.description"), null);
+    super(ExecutionBundle.lazyMessage("show.running.list.action.name"),
+          ExecutionBundle.lazyMessage("show.running.list.action.description"), null);
   }
 
   @Override
index 6fbbee83df93d0e43b5f0949300fcc8a575d3b66..88352975201878fa7c603a9890e211f70539fd01 100644 (file)
@@ -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.lazyMessage("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.lazyMessage("stop.configuration.action.name",
                                                      StringUtil.escapeMnemonics(runProfile == null
                                                                                 ? StringUtil.notNullize(contentDescriptor.getDisplayName())
                                                                                 : runProfile.getName())));
index 5c42119fc31db789320a4d7d392370012cb35394..90faac3f027dc665779250cda82e8e50b9271193 100644 (file)
@@ -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.lazyMessage("rerun.configuration.action.name",
                                                    StringUtil.escapeMnemonics(environment.getRunProfile().getName())));
       presentation.setIcon(
         ActionPlaces.TOUCHBAR_GENERAL.equals(event.getPlace()) || ExecutionManagerImpl.isProcessRunning(getDescriptor(event)) ?
index ca137b686b24c8d2948926ba2297fe130966c47f..9e5bdab8f42b4b75b960a8970c4c14ded3742bdb 100644 (file)
@@ -361,7 +361,7 @@ public final class RunnerContentUi implements ContentUI, Disposable, CellTransfo
     }
     if (myViewActions.getChildrenCount() > 0) {
       DefaultActionGroup layoutGroup = new DefaultActionGroup(myViewActions.getChildren(null));
-      layoutGroup.getTemplatePresentation().setText(() -> ExecutionBundle.message("action.presentation.RunnerContentUi.text"));
+      layoutGroup.getTemplatePresentation().setText(ExecutionBundle.lazyMessage("action.presentation.RunnerContentUi.text"));
       layoutGroup.setPopup(true);
       group.addSeparator();
       group.addAction(layoutGroup);
@@ -1974,7 +1974,7 @@ public final class RunnerContentUi implements ContentUI, Disposable, CellTransfo
     @Override
     public void update(@NotNull AnActionEvent e) {
       e.getPresentation().setEnabledAndVisible(myContentUi != null && myContentUi.getPopupContents().size() > 1);
-      e.getPresentation().setText(() -> ExecutionBundle.message("action.presentation.RunnerContentUi.text.show.list.of.tabs"));
+      e.getPresentation().setText(ExecutionBundle.lazyMessage("action.presentation.RunnerContentUi.text.show.list.of.tabs"));
     }
 
     @Override
index de7c5996079ebac49ff7c5cf25ca5dc20e2f4374..5754c13388cbd94153caac9d881d31e4bfeb84f5 100644 (file)
@@ -23,8 +23,8 @@ import java.util.List;
 
 public class UpdateRunningApplicationAction extends AnAction {
   UpdateRunningApplicationAction() {
-    super(() -> ExecutionBundle.message("action.AnAction.text.update.running.application"),
-          () -> ExecutionBundle.message("action.AnAction.description.update.running.application"), AllIcons.Javaee.UpdateRunningApplication);
+    super(ExecutionBundle.lazyMessage("action.AnAction.text.update.running.application"),
+          ExecutionBundle.lazyMessage("action.AnAction.description.update.running.application"), AllIcons.Javaee.UpdateRunningApplication);
   }
 
   @Override
@@ -54,7 +54,7 @@ public class UpdateRunningApplicationAction extends AnAction {
       presentation.setText(updaters.get(0).getDescription());
     }
     else {
-      presentation.setText(() -> ExecutionBundle.message("action.presentation.UpdateRunningApplicationAction.text"));
+      presentation.setText(ExecutionBundle.lazyMessage("action.presentation.UpdateRunningApplicationAction.text"));
     }
   }
 
index 1b9b130baa24a42ec14e74514491dbd02948b84d..7c1d2153cbe69cde6bbf47c005ba6ab9f3665b75 100644 (file)
@@ -29,8 +29,8 @@ public class DetachExternalProjectAction extends ExternalSystemNodeAction<Projec
 
   public DetachExternalProjectAction() {
     super(ProjectData.class);
-    getTemplatePresentation().setText(() -> ExternalSystemBundle.message("action.detach.external.project.text", "External"));
-    getTemplatePresentation().setDescription(() -> ExternalSystemBundle.message("action.detach.external.project.description"));
+    getTemplatePresentation().setText(ExternalSystemBundle.lazyMessage("action.detach.external.project.text", "External"));
+    getTemplatePresentation().setDescription(ExternalSystemBundle.lazyMessage("action.detach.external.project.description"));
     getTemplatePresentation().setIcon(AllIcons.General.Remove);
   }
 
@@ -42,7 +42,7 @@ public class DetachExternalProjectAction extends ExternalSystemNodeAction<Projec
     ProjectSystemId systemId = getSystemId(e);
     final String systemIdName = systemId != null ? systemId.getReadableName() : "External";
     Presentation presentation = e.getPresentation();
-    presentation.setText(() -> ExternalSystemBundle.message("action.detach.external.project.text", systemIdName));
+    presentation.setText(ExternalSystemBundle.lazyMessage("action.detach.external.project.text", systemIdName));
   }
 
   @Override
@@ -58,7 +58,7 @@ public class DetachExternalProjectAction extends ExternalSystemNodeAction<Projec
                       @NotNull AnActionEvent e) {
 
     e.getPresentation().setText(
-      () -> ExternalSystemBundle.message("action.detach.external.project.text", projectSystemId.getReadableName())
+      ExternalSystemBundle.lazyMessage("action.detach.external.project.text", projectSystemId.getReadableName())
     );
 
     final ProjectNode projectNode = e.getData(ExternalSystemDataKeys.SELECTED_PROJECT_NODE);
index a271c76e37d608a232fcecda1cbe9c657d9f575c..be4be5417930ddc3db5fcc2a2f408f841809fd6d 100644 (file)
@@ -38,9 +38,9 @@ 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.lazyMessage("action.ignore.external.projects.text", "External", 1));
     getTemplatePresentation()
-      .setDescription(() -> ExternalSystemBundle.message("action.ignore.external.projects.description", "external", 1));
+      .setDescription(ExternalSystemBundle.lazyMessage("action.ignore.external.projects.description", "external", 1));
   }
 
   @Override
index 1971389062b01dc6fe46509565d2588d7c99cc2d..6f50a9b97f96d937202da3e133cfefcfb95c07cc 100644 (file)
@@ -19,8 +19,8 @@ public class OpenExternalConfigAction extends ExternalSystemNodeAction<ExternalC
 
   public OpenExternalConfigAction() {
     super(ExternalConfigPathAware.class);
-    getTemplatePresentation().setText(() -> ExternalSystemBundle.message("action.open.config.text", "External"));
-    getTemplatePresentation().setDescription(() -> ExternalSystemBundle.message("action.open.config.description", "external"));
+    getTemplatePresentation().setText(ExternalSystemBundle.lazyMessage("action.open.config.text", "External"));
+    getTemplatePresentation().setDescription(ExternalSystemBundle.lazyMessage("action.open.config.description", "external"));
   }
 
   @Override
@@ -34,8 +34,8 @@ public class OpenExternalConfigAction extends ExternalSystemNodeAction<ExternalC
     if (config == null) return false;
 
     ProjectSystemId externalSystemId = getSystemId(e);
-    e.getPresentation().setText(() -> ExternalSystemBundle.message("action.open.config.text", externalSystemId.getReadableName()));
-    e.getPresentation().setDescription(() -> ExternalSystemBundle.message("action.open.config.description", externalSystemId.getReadableName()));
+    e.getPresentation().setText(ExternalSystemBundle.lazyMessage("action.open.config.text", externalSystemId.getReadableName()));
+    e.getPresentation().setDescription(ExternalSystemBundle.lazyMessage("action.open.config.description", externalSystemId.getReadableName()));
     final ExternalSystemUiAware uiAware = getExternalSystemUiAware(e);
     if (uiAware != null) {
       e.getPresentation().setIcon(uiAware.getProjectIcon());
index a43ce595cee8ddf4b89739680e42af743cedefad..76157db142f9416566653ca652f4ba7f6537d259 100644 (file)
@@ -25,9 +25,9 @@ public class OpenTasksActivationManagerAction extends ExternalSystemNodeAction<A
 
   public OpenTasksActivationManagerAction() {
     super(AbstractExternalEntityData.class);
-    getTemplatePresentation().setText(() -> ExternalSystemBundle.message("external.system.task.activation.title"));
+    getTemplatePresentation().setText(ExternalSystemBundle.lazyMessage("external.system.task.activation.title"));
     getTemplatePresentation().setDescription(
-      () -> ExternalSystemBundle.message("external.system.task.activation.description", "external system"));
+      ExternalSystemBundle.lazyMessage("external.system.task.activation.description", "external system"));
   }
 
   @Override
@@ -38,9 +38,9 @@ public class OpenTasksActivationManagerAction extends ExternalSystemNodeAction<A
     final Object externalData = selectedNodes.get(0).getData();
 
     ProjectSystemId projectSystemId = getSystemId(e);
-    e.getPresentation().setText(() -> ExternalSystemBundle.message("external.system.task.activation.title"));
+    e.getPresentation().setText(ExternalSystemBundle.lazyMessage("external.system.task.activation.title"));
     e.getPresentation().setDescription(
-      () -> ExternalSystemBundle.message("external.system.task.activation.description", projectSystemId.getReadableName()));
+      ExternalSystemBundle.lazyMessage("external.system.task.activation.description", projectSystemId.getReadableName()));
     final boolean isProjectNode = externalData instanceof ProjectData || externalData instanceof ModuleData;
     return isProjectNode && StringUtil.isNotEmpty(((ExternalConfigPathAware) externalData).getLinkedExternalProjectPath());
   }
index 84c64cdd23e73a4bc061fd9e7767081ea00adfcc..55e1bedf09e90ab8872896080a4d4033a686cc83 100644 (file)
@@ -30,8 +30,8 @@ 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().setDescription(() -> ExternalSystemBundle.message("action.refresh.all.projects.description", "external"));
+    getTemplatePresentation().setText(ExternalSystemBundle.lazyMessage("action.refresh.all.projects.text", "External"));
+    getTemplatePresentation().setDescription(ExternalSystemBundle.lazyMessage("action.refresh.all.projects.description", "external"));
   }
 
   @Override
@@ -49,8 +49,8 @@ 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().setDescription(() -> ExternalSystemBundle.message("action.refresh.all.projects.description", name));
+    e.getPresentation().setText(ExternalSystemBundle.lazyMessage("action.refresh.all.projects.text", name));
+    e.getPresentation().setDescription(ExternalSystemBundle.lazyMessage("action.refresh.all.projects.description", name));
 
     ExternalSystemProcessingManager processingManager = ServiceManager.getService(ExternalSystemProcessingManager.class);
     e.getPresentation().setEnabled(!processingManager.hasTaskOfTypeInProgress(ExternalSystemTaskType.RESOLVE_PROJECT, project));
index c02efd13bbe176b644c704bfe5c7146f2fa73a6e..1f3f9c80cfa85e51d802382c65b2301463ab0089 100644 (file)
@@ -32,8 +32,8 @@ import java.util.List;
 public class RefreshExternalProjectAction extends ExternalSystemNodeAction<AbstractExternalEntityData> implements DumbAware {
   public RefreshExternalProjectAction() {
     super(AbstractExternalEntityData.class);
-    getTemplatePresentation().setText(() -> ExternalSystemBundle.message("action.refresh.project.text", "External"));
-    getTemplatePresentation().setDescription(() -> ExternalSystemBundle.message("action.refresh.project.description", "External"));
+    getTemplatePresentation().setText(ExternalSystemBundle.lazyMessage("action.refresh.project.text", "External"));
+    getTemplatePresentation().setDescription(ExternalSystemBundle.lazyMessage("action.refresh.project.description", "External"));
   }
 
   @Override
@@ -45,8 +45,8 @@ public class RefreshExternalProjectAction extends ExternalSystemNodeAction<Abstr
     final String systemIdNameText = systemId != null ? systemId.getReadableName() : "External";
     final String systemIdNameDescription = systemId != null ? systemId.getReadableName() : "external";
     Presentation presentation = e.getPresentation();
-    presentation.setText(() -> ExternalSystemBundle.message("action.refresh.project.text", systemIdNameText));
-    presentation.setDescription(() -> ExternalSystemBundle.message("action.refresh.project.description", systemIdNameDescription));
+    presentation.setText(ExternalSystemBundle.lazyMessage("action.refresh.project.text", systemIdNameText));
+    presentation.setDescription(ExternalSystemBundle.lazyMessage("action.refresh.project.description", systemIdNameDescription));
   }
 
   @Override
index 2481ed534cd95fbac03717871edba7ce7688d857..5cf5bb4c43bcef3b773667ca83f3601170e5eb5d 100644 (file)
@@ -29,8 +29,8 @@ import org.jetbrains.annotations.NotNull;
 public class ShowExternalSystemSettingsAction extends ExternalSystemAction {
 
   public ShowExternalSystemSettingsAction() {
-    getTemplatePresentation().setText(() -> ExternalSystemBundle.message("action.open.settings.text", "External"));
-    getTemplatePresentation().setDescription(() -> ExternalSystemBundle.message("action.open.settings.description", "external"));
+    getTemplatePresentation().setText(ExternalSystemBundle.lazyMessage("action.open.settings.text", "External"));
+    getTemplatePresentation().setDescription(ExternalSystemBundle.lazyMessage("action.open.settings.description", "external"));
   }
 
   @Override
@@ -40,8 +40,8 @@ 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().setDescription(() -> ExternalSystemBundle.message("action.open.settings.description", systemId.getReadableName()));
+    e.getPresentation().setText(ExternalSystemBundle.lazyMessage("action.open.settings.text", systemId.getReadableName()));
+    e.getPresentation().setDescription(ExternalSystemBundle.lazyMessage("action.open.settings.description", systemId.getReadableName()));
     return true;
   }
 
index 1178c20f8eefd7d0d3d57a69bea5617603b2cb93..b3d30841eddef15d41b6ca6ec7a6636dc205304d 100644 (file)
@@ -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.lazyMessage("rerun.configuration.action.name",
                                                      StringUtil.escapeMnemonics(environment.getRunProfile().getName())));
         Icon icon = ExecutionManagerImpl.isProcessRunning(getDescriptor(event))
                     ? AllIcons.Actions.Restart
index 1fd50914e2fed4bc6a5bb81992d4f64a5e616e91..747b6c947eb3ac1a166b5dc5e116f95ec4e56cc3 100644 (file)
@@ -448,9 +448,9 @@ public final class ExternalSystemUtil {
                 }
               };
               String systemId = id.getProjectSystemId().getReadableName();
-              rerunImportAction.getTemplatePresentation().setText(() -> ExternalSystemBundle.message("action.refresh.project.text", systemId));
+              rerunImportAction.getTemplatePresentation().setText(ExternalSystemBundle.lazyMessage("action.refresh.project.text", systemId));
               rerunImportAction.getTemplatePresentation()
-                .setDescription(() -> ExternalSystemBundle.message("action.refresh.project.description", systemId));
+                .setDescription(ExternalSystemBundle.lazyMessage("action.refresh.project.description", systemId));
               rerunImportAction.getTemplatePresentation().setIcon(AllIcons.Actions.Refresh);
 
               if (isPreviewMode) return;
index c015ac3f1742d5b182e8eb11a6711e4892368631..3b8c1984eb092933b5284eae9cf971ce9370c468 100644 (file)
@@ -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.lazyMessage("close.tab.action.name"));
     templatePresentation.setDescription(Presentation.NULL_STRING);
   }
 
index e04141ee1ffb1cb7d3cafa967928015c3796bb4e..a7e246a61058563e110616aa564794b1a525776f 100644 (file)
@@ -160,7 +160,7 @@ public class ProjectCodeStyleSettingsManager extends CodeStyleSettingsManager {
 
   private static class ShowMoreInfoAction extends DumbAwareAction {
     ShowMoreInfoAction() {
-      super(() -> IdeBundle.message("action.ProjectCodeStyleSettingsManager.ShowMoreInfoAction.text.more.info"));
+      super(IdeBundle.lazyMessage("action.ProjectCodeStyleSettingsManager.ShowMoreInfoAction.text.more.info"));
     }
 
     @Override
index e91eb8d519a136752e94f3cc52d4b272388d6b31..a69568d549c15a20d6ae97273c80b5b8af0bd643 100644 (file)
@@ -31,8 +31,8 @@ import org.jetbrains.annotations.NotNull;
 public class AddArrangementRuleAction extends AbstractArrangementRuleAction implements DumbAware {
   
   public AddArrangementRuleAction() {
-    getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.rule.add.text"));
-    getTemplatePresentation().setDescription(() -> ApplicationBundle.message("arrangement.action.rule.add.description"));
+    getTemplatePresentation().setText(ApplicationBundle.lazyMessage("arrangement.action.rule.add.text"));
+    getTemplatePresentation().setDescription(ApplicationBundle.lazyMessage("arrangement.action.rule.add.description"));
     getTemplatePresentation().setIcon(IconUtil.getAddIcon());
     setEnabledInModalContext(true);
   }
index f94104bb5a5d193067eff925ec5e8314db1b24cf..089a8ea2ab7a9e363478a93b342c9ae2f4d443d1 100644 (file)
@@ -29,8 +29,8 @@ import org.jetbrains.annotations.NotNull;
 public class AddArrangementSectionRuleAction extends AddArrangementRuleAction {
 
   public AddArrangementSectionRuleAction() {
-    getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.section.rule.add.text"));
-    getTemplatePresentation().setDescription(() -> ApplicationBundle.message("arrangement.action.section.rule.add.description"));
+    getTemplatePresentation().setText(ApplicationBundle.lazyMessage("arrangement.action.section.rule.add.text"));
+    getTemplatePresentation().setDescription(ApplicationBundle.lazyMessage("arrangement.action.section.rule.add.description"));
     getTemplatePresentation().setIcon(AllIcons.CodeStyle.AddNewSectionRule);
   }
 
index d61b0fbdf461e5f3493221efefcc0761fe8cd2ce..34858d3eed9aec8e69bd0c93a742da08601679c5 100644 (file)
@@ -30,8 +30,8 @@ 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().setDescription(() -> ApplicationBundle.message("arrangement.action.rule.edit.description"));
+    getTemplatePresentation().setText(ApplicationBundle.lazyMessage("arrangement.action.rule.edit.text"));
+    getTemplatePresentation().setDescription(ApplicationBundle.lazyMessage("arrangement.action.rule.edit.description"));
     getTemplatePresentation().setIcon(IconUtil.getEditIcon());
     setEnabledInModalContext(true);
   }
index 7756d8a55a8166f85a88fb89b27cfc64f188846a..7cd0dc41ee446f5768d33a5f14f58b1b3c7af446 100644 (file)
@@ -15,8 +15,8 @@ import org.jetbrains.annotations.NotNull;
 public class EditRuleAliasesDefinitionAction extends AnAction {
 
   public EditRuleAliasesDefinitionAction() {
-    getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.alias.rule.add.edit.text"));
-    getTemplatePresentation().setDescription(() -> ApplicationBundle.message("arrangement.action.alias.rule.add.edit.description"));
+    getTemplatePresentation().setText(ApplicationBundle.lazyMessage("arrangement.action.alias.rule.add.edit.text"));
+    getTemplatePresentation().setDescription(ApplicationBundle.lazyMessage("arrangement.action.alias.rule.add.edit.description"));
     getTemplatePresentation().setIcon(AllIcons.General.GearPlain);
   }
 
index c0f4233bf7cb4987e89ed3f4c1b4d50bad20b92d..6146f4b6688c13f04e1c75ca217b0b3a998da97b 100644 (file)
@@ -17,8 +17,8 @@ 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().setDescription(() -> ApplicationBundle.message("arrangement.action.rule.move.down.description"));
+    getTemplatePresentation().setText(ApplicationBundle.lazyMessage("arrangement.action.rule.move.down.text"));
+    getTemplatePresentation().setDescription(ApplicationBundle.lazyMessage("arrangement.action.rule.move.down.description"));
     getTemplatePresentation().setIcon(IconUtil.getMoveDownIcon());
   }
 
index 407c8746e0a4201b6cf3efea18624e9593a323ee..7c1460feb0208a6079c3cf06f93d185fa789e180 100644 (file)
@@ -17,8 +17,8 @@ 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().setDescription(() -> ApplicationBundle.message("arrangement.action.rule.move.up.description"));
+    getTemplatePresentation().setText(ApplicationBundle.lazyMessage("arrangement.action.rule.move.up.text"));
+    getTemplatePresentation().setDescription(ApplicationBundle.lazyMessage("arrangement.action.rule.move.up.description"));
     getTemplatePresentation().setIcon(IconUtil.getMoveUpIcon());
   }
 
index 4273aabb77e160c00ebfa6e98d8377decc971c67..5ee8d22c56d7de773c360fec70fca8c1077f88f1 100644 (file)
@@ -29,8 +29,8 @@ import java.util.List;
 public class MoveArrangementMatchingRuleDownAction extends AbstractMoveArrangementRuleAction {
 
   public MoveArrangementMatchingRuleDownAction() {
-    getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.rule.move.down.text"));
-    getTemplatePresentation().setDescription(() -> ApplicationBundle.message("arrangement.action.rule.move.down.description"));
+    getTemplatePresentation().setText(ApplicationBundle.lazyMessage("arrangement.action.rule.move.down.text"));
+    getTemplatePresentation().setDescription(ApplicationBundle.lazyMessage("arrangement.action.rule.move.down.description"));
     getTemplatePresentation().setIcon(IconUtil.getMoveDownIcon());
     setEnabledInModalContext(true);
   }
index 7458696498013a6797718f21fa164ad4b8cbed37..9b1a1c73b376bfc837f16aad47d06fac3366ebf2 100644 (file)
@@ -29,8 +29,8 @@ import java.util.List;
 public class MoveArrangementMatchingRuleUpAction extends AbstractMoveArrangementRuleAction {
 
   public MoveArrangementMatchingRuleUpAction() {
-    getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.rule.move.up.text"));
-    getTemplatePresentation().setDescription(() -> ApplicationBundle.message("arrangement.action.rule.move.up.description"));
+    getTemplatePresentation().setText(ApplicationBundle.lazyMessage("arrangement.action.rule.move.up.text"));
+    getTemplatePresentation().setDescription(ApplicationBundle.lazyMessage("arrangement.action.rule.move.up.description"));
     getTemplatePresentation().setIcon(IconUtil.getMoveUpIcon());
     setEnabledInModalContext(true);
   }
index 56672c01f686dea93bff3d33e6ba9bff8d18fdd0..c1a17befde23f6de4590f141a1ef6013db097f31 100644 (file)
@@ -30,8 +30,8 @@ import org.jetbrains.annotations.NotNull;
 public class RemoveArrangementRuleAction extends AbstractArrangementRuleAction implements DumbAware {
 
   public RemoveArrangementRuleAction() {
-    getTemplatePresentation().setText(() -> ApplicationBundle.message("arrangement.action.rule.remove.text"));
-    getTemplatePresentation().setDescription(() -> ApplicationBundle.message("arrangement.action.rule.remove.description"));
+    getTemplatePresentation().setText(ApplicationBundle.lazyMessage("arrangement.action.rule.remove.text"));
+    getTemplatePresentation().setDescription(ApplicationBundle.lazyMessage("arrangement.action.rule.remove.description"));
     getTemplatePresentation().setIcon(IconUtil.getRemoveIcon());
     setEnabledInModalContext(true);
   }
index 4ecbac7ded5571eefe54ca46be6acd4fcef76ec3..728a726413d9db281d50e8e408160688e812080c 100644 (file)
@@ -299,8 +299,8 @@ public class BuildView extends CompositeView<ExecutionConsole>
     AnAction stopAction = null;
     StartBuildEvent startBuildEvent = myStartBuildEventRef.get();
     if (startBuildEvent != null && startBuildEvent.getProcessHandler() != null) {
-      stopAction = new StopProcessAction(() -> IdeBundle.message("action.DumbAware.BuildView.text.stop"),
-                                         () -> IdeBundle.message("action.DumbAware.CopyrightProfilesPanel.description.stop"),
+      stopAction = new StopProcessAction(IdeBundle.lazyMessage("action.DumbAware.BuildView.text.stop"),
+                                         IdeBundle.lazyMessage("action.DumbAware.CopyrightProfilesPanel.description.stop"),
         startBuildEvent.getProcessHandler());
       ActionUtil.copyFrom(stopAction, IdeActions.ACTION_STOP_PROGRAM);
       stopAction.registerCustomShortcutSet(stopAction.getShortcutSet(), this);
index 2463b28ea22ba4c77ff24710d7bf695f3b41a78f..f6f79a0fd1c71f39aa88b0285ba2325654a8205a 100644 (file)
@@ -150,7 +150,7 @@ public class CompositeView<T extends ComponentContainer> extends JPanel implemen
 
   private final class SwitchViewAction extends ToggleAction implements DumbAware {
     SwitchViewAction() {
-      super(() -> IdeBundle.message("action.ToggleAction.text.toggle.view"), Presentation.NULL_STRING, AllIcons.Actions.ChangeView);
+      super(IdeBundle.lazyMessage("action.ToggleAction.text.toggle.view"), Presentation.NULL_STRING, AllIcons.Actions.ChangeView);
     }
 
     @Override
index 21a58cdd3cb68dfd2f31b596534ff66a2d76c1a3..5eb9280638b72c69baf58dd88ac34417bd8885ca 100644 (file)
@@ -75,7 +75,7 @@ public class DaemonEditorPopup extends PopupHandler {
     );
     actionGroup.add(gotoGroup);
     actionGroup.addSeparator();
-    actionGroup.add(new AnAction(() -> EditorBundle.message("customize.highlighting.level.menu.item")) {
+    actionGroup.add(new AnAction(EditorBundle.lazyMessage("customize.highlighting.level.menu.item")) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         final HectorComponent component = ServiceManager.getService(myProject, HectorComponentFactory.class).create(file);
index 24ebf497fb99214ff028d0bc15f35516795a2d83..bdd02041b889f2caf3b574444c8cbcc88a5b3b7f 100644 (file)
@@ -149,7 +149,7 @@ public abstract class DockablePopupManager<T extends JComponent & Disposable> {
 
   @NotNull
   protected AnAction createRestorePopupAction() {
-    return new DumbAwareAction(() -> CodeInsightBundle.message("action.AnActionButton.text.open.as.popup"), () -> getRestorePopupDescription(), null) {
+    return new DumbAwareAction(CodeInsightBundle.lazyMessage("action.AnActionButton.text.open.as.popup"), () -> getRestorePopupDescription(), null) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         restorePopupBehavior();
index 0c32db789ae506eae70b8c91abb781a93c679a0f..97ebc62c3f7555183e14cf3d932c2432cf64d492 100644 (file)
@@ -1240,7 +1240,7 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr
 
   private class BackAction extends AnAction implements HintManagerImpl.ActionToIgnore {
     BackAction() {
-      super(() -> CodeInsightBundle.message("javadoc.action.back"), AllIcons.Actions.Back);
+      super(CodeInsightBundle.lazyMessage("javadoc.action.back"), AllIcons.Actions.Back);
     }
 
     @Override
@@ -1260,7 +1260,7 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr
 
   private class ForwardAction extends AnAction implements HintManagerImpl.ActionToIgnore {
     ForwardAction() {
-      super(() -> CodeInsightBundle.message("javadoc.action.forward"), AllIcons.Actions.Forward);
+      super(CodeInsightBundle.lazyMessage("javadoc.action.forward"), AllIcons.Actions.Forward);
     }
 
     @Override
@@ -1283,7 +1283,7 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr
     private EditDocumentationSourceAction() {
       super(true);
       getTemplatePresentation().setIcon(AllIcons.Actions.EditSource);
-      getTemplatePresentation().setText(() -> CodeInsightBundle.message("action.presentation.DocumentationComponent.text"));
+      getTemplatePresentation().setText(CodeInsightBundle.lazyMessage("action.presentation.DocumentationComponent.text"));
     }
 
     @Override
index 221059a1d22d9563c78effd1f2884c48c632d9b9..e68dfeaf12b56a89b89c518170b878f2eef90df1 100644 (file)
@@ -225,7 +225,7 @@ public class SurroundWithHandler implements CodeInsightActionHandler {
 
     List<AnAction> templateGroup = SurroundWithTemplateHandler.createActionGroup(editor, file, usedMnemonicsSet);
     if (!templateGroup.isEmpty()) {
-      applicable.add(new Separator(() -> IdeBundle.message("action.Anonymous.text.live.templates")));
+      applicable.add(new Separator(IdeBundle.lazyMessage("action.Anonymous.text.live.templates")));
       applicable.addAll(templateGroup);
       applicable.add(Separator.getInstance());
       applicable.add(new ConfigureTemplatesAction());
@@ -264,7 +264,7 @@ public class SurroundWithHandler implements CodeInsightActionHandler {
 
   private static class ConfigureTemplatesAction extends AnAction {
     private ConfigureTemplatesAction() {
-      super(() -> ActionsBundle.message("action.ConfigureTemplatesAction.text"));
+      super(ActionsBundle.lazyMessage("action.ConfigureTemplatesAction.text"));
     }
 
     @Override
index fc5179f3ff69402f68e90b052484ae3afed6326b..62f04a2aa197818c1a785bb25275d142c294707f 100644 (file)
@@ -484,7 +484,7 @@ public class ImplementationViewComponent extends JPanel {
 
   private class BackAction extends AnAction implements HintManagerImpl.ActionToIgnore {
     BackAction() {
-      super(() -> CodeInsightBundle.message("quick.definition.back"), AllIcons.Actions.Back);
+      super(CodeInsightBundle.lazyMessage("quick.definition.back"), AllIcons.Actions.Back);
     }
 
     @Override
@@ -502,7 +502,7 @@ public class ImplementationViewComponent extends JPanel {
 
   private class ForwardAction extends AnAction implements HintManagerImpl.ActionToIgnore {
     ForwardAction() {
-      super(() -> CodeInsightBundle.message("quick.definition.forward"), AllIcons.Actions.Forward);
+      super(CodeInsightBundle.lazyMessage("quick.definition.forward"), AllIcons.Actions.Forward);
     }
 
     @Override
index 47045b24dab85edf0a507c644a9c3f8cfc38fb50..66caeae06e86c36d63bb41b4387775610fc14dab 100644 (file)
@@ -313,7 +313,7 @@ class LookupUi {
       AnAction showIntentionAction = ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS);
       if (showIntentionAction != null) {
         copyShortcutFrom(showIntentionAction);
-        getTemplatePresentation().setText(() -> CodeInsightBundle.message("action.presentation.LookupUi.text"));
+        getTemplatePresentation().setText(CodeInsightBundle.lazyMessage("action.presentation.LookupUi.text"));
       }
     }
 
@@ -332,7 +332,7 @@ class LookupUi {
   private class ChangeSortingAction extends DumbAwareAction implements HintManagerImpl.ActionToIgnore {
     private boolean sortByName = UISettings.getInstance().getSortLookupElementsLexicographically();
     private ChangeSortingAction() {
-      super(() -> ActionsBundle.message("action.ChangeSortingAction.text"));
+      super(ActionsBundle.lazyMessage("action.ChangeSortingAction.text"));
     }
 
     @Override
index 57c7ea74e0ca55c5e14296fd4356396bf9b41615..7a9ca892178edfed178e142c86f518b906d98739 100644 (file)
@@ -588,7 +588,7 @@ public class TemplateListPanel extends JPanel implements Disposable {
       })
       .disableDownAction()
       .disableUpAction()
-      .addExtraAction(new AnActionButton(() -> CodeInsightBundle.message("action.AnActionButton.Template.list.text.duplicate"), AllIcons.Actions.Copy) {
+      .addExtraAction(new AnActionButton(CodeInsightBundle.lazyMessage("action.AnActionButton.Template.list.text.duplicate"), AllIcons.Actions.Copy) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
           copyRow();
@@ -598,7 +598,7 @@ public class TemplateListPanel extends JPanel implements Disposable {
         public void updateButton(@NotNull AnActionEvent e) {
           e.getPresentation().setEnabled(getTemplate(getSingleSelectedIndex()) != null);
         }
-      }).addExtraAction(new AnActionButton(() -> CodeInsightBundle.message("action.AnActionButton.text.restore.deleted.defaults"), AllIcons.Actions.Rollback) {
+      }).addExtraAction(new AnActionButton(CodeInsightBundle.lazyMessage("action.AnActionButton.text.restore.deleted.defaults"), AllIcons.Actions.Rollback) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
           TemplateSettings.getInstance().reset();
@@ -615,13 +615,13 @@ public class TemplateListPanel extends JPanel implements Disposable {
 
   private void addTemplateOrGroup(AnActionButton button) {
     DefaultActionGroup group = new DefaultActionGroup();
-    group.add(new DumbAwareAction(() -> IdeBundle.message("action.Anonymous.text.live.template")) {
+    group.add(new DumbAwareAction(IdeBundle.lazyMessage("action.Anonymous.text.live.template")) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         addTemplate();
       }
     });
-    group.add(new DumbAwareAction(() -> IdeBundle.message("action.Anonymous.text.template.group")) {
+    group.add(new DumbAwareAction(IdeBundle.lazyMessage("action.Anonymous.text.template.group")) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         String newName = Messages
@@ -645,7 +645,7 @@ public class TemplateListPanel extends JPanel implements Disposable {
   }
 
   private void installPopup() {
-    final DumbAwareAction rename = new DumbAwareAction(() -> IdeBundle.message("action.Anonymous.text.rename")) {
+    final DumbAwareAction rename = new DumbAwareAction(IdeBundle.lazyMessage("action.Anonymous.text.rename")) {
 
       @Override
       public void update(@NotNull AnActionEvent e) {
@@ -685,7 +685,7 @@ public class TemplateListPanel extends JPanel implements Disposable {
             }
           }
           addSeparator();
-          add(new DumbAwareAction(() -> IdeBundle.message("action.Anonymous.text.new.group")) {
+          add(new DumbAwareAction(IdeBundle.lazyMessage("action.Anonymous.text.new.group")) {
             @Override
             public void actionPerformed(@NotNull AnActionEvent e) {
               String newName = Messages.showInputDialog(myTree, "Enter the new group name:", "Move to a New Group", null, "", new TemplateGroupInputValidator(null));
@@ -698,7 +698,7 @@ public class TemplateListPanel extends JPanel implements Disposable {
       }
     };
 
-    final DumbAwareAction changeContext = new DumbAwareAction(() -> IdeBundle.message("action.Anonymous.text.change.context")) {
+    final DumbAwareAction changeContext = new DumbAwareAction(IdeBundle.lazyMessage("action.Anonymous.text.change.context")) {
 
       @Override
       public void update(@NotNull AnActionEvent e) {
@@ -727,8 +727,8 @@ public class TemplateListPanel extends JPanel implements Disposable {
       }
     };
     final DumbAwareAction revert =
-      new DumbAwareAction(() -> CodeInsightBundle.message("action.DumbAware.TemplateListPanel.text.restore.defaults"),
-                          () -> CodeInsightBundle.message("action.DumbAware.TemplateListPanel.description.restore.default.setting"),
+      new DumbAwareAction(CodeInsightBundle.lazyMessage("action.DumbAware.TemplateListPanel.text.restore.defaults"),
+                          CodeInsightBundle.lazyMessage("action.DumbAware.TemplateListPanel.description.restore.default.setting"),
                           null) {
 
       @Override
index e20d9923a6f24fd018ed1844f004d9b75522e7f5..5ff3189f689216bb78f225fc583b256d72b7cf96 100644 (file)
@@ -114,7 +114,7 @@ public class PostfixTemplatesConfigurable implements SearchableConfigurable, Edi
   }
 
   private AnActionButton duplicateAction() {
-    AnActionButton button = new AnActionButton(() -> CodeInsightBundle.message("action.AnActionButton.text.duplicate"), PlatformIcons.COPY_ICON) {
+    AnActionButton button = new AnActionButton(CodeInsightBundle.lazyMessage("action.AnActionButton.text.duplicate"), PlatformIcons.COPY_ICON) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         if (myCheckboxTree != null) {
index f451e1f5b67738906dbfc00fdb4da9c1a0b57538..3458b3221ea9f08911cfa939012ebe8df5f26962 100644 (file)
@@ -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.lazyMessage("goto.inspection.action.text"));
   }
 
   @Override
index df558dce334c25136314a171cff7125f61385b01..8e9d6c24ceef10412928a17b75475dc8b0980716 100644 (file)
@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class SeverityEditorDialogAction extends AnAction implements DumbAware {
   public SeverityEditorDialogAction() {
-    super(() -> ActionsBundle.message("action.SeverityEditorDialogAction.text"));
+    super(ActionsBundle.lazyMessage("action.SeverityEditorDialogAction.text"));
   }
 
   @Override
index 8b70c2d783d0ad402cb5bc454eccf71e29c51d83..a3d457e84a38082150be34bb4e84b1c20e290b15 100644 (file)
@@ -124,7 +124,7 @@ public class QuickFixPreviewPanelFactory {
 
       return new ComboBoxAction() {
         {
-          getTemplatePresentation().setText(() -> CodeInsightBundle.message("action.presentation.QuickFixPreviewPanelFactory.text"));
+          getTemplatePresentation().setText(CodeInsightBundle.lazyMessage("action.presentation.QuickFixPreviewPanelFactory.text"));
           setSmallVariant(false);
         }
 
@@ -151,7 +151,7 @@ public class QuickFixPreviewPanelFactory {
       }
       final ComboBoxAction action = new ComboBoxAction() {
         {
-          getTemplatePresentation().setText(() -> CodeInsightBundle.message("action.presentation.QuickFixPreviewPanelFactory.text.suppress"));
+          getTemplatePresentation().setText(CodeInsightBundle.lazyMessage("action.presentation.QuickFixPreviewPanelFactory.text.suppress"));
         }
 
         @NotNull
index dadffe8544a8f9a38d6755314ab8a4b12d4505ef..f02d02b25d7f464c77689e27060d7b0a0f296c3e 100644 (file)
@@ -303,7 +303,7 @@ public class DuplexConsoleView<S extends ConsoleView, T extends ConsoleView> ext
   private class SwitchDuplexConsoleViewAction extends ToggleAction implements DumbAware {
 
     SwitchDuplexConsoleViewAction() {
-      super(() -> ExecutionBundle.message("run.configuration.show.command.line.action.name"), AllIcons.Debugger.Console);
+      super(ExecutionBundle.lazyMessage("run.configuration.show.command.line.action.name"), AllIcons.Debugger.Console);
     }
 
     @Override
index 535e948108d06cf3ae60b7765957bcbd9a77a039..81450237ce4c951809bb23ae4a0b6c6f990dc04c 100644 (file)
@@ -37,13 +37,13 @@ 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.setDescription(() -> ExecutionBundle.message("run.dashboard.restart.debugger.action.description"));
+      presentation.setText(ExecutionBundle.lazyMessage("run.dashboard.restart.debugger.action.name"));
+      presentation.setDescription(ExecutionBundle.lazyMessage("run.dashboard.restart.debugger.action.description"));
       presentation.setIcon(AllIcons.Actions.RestartDebugger);
     }
     else {
-      presentation.setText(() -> ExecutionBundle.message("run.dashboard.debug.action.name"));
-      presentation.setDescription(() -> ExecutionBundle.message("run.dashboard.debug.action.description"));
+      presentation.setText(ExecutionBundle.lazyMessage("run.dashboard.debug.action.name"));
+      presentation.setDescription(ExecutionBundle.lazyMessage("run.dashboard.debug.action.description"));
       presentation.setIcon(AllIcons.Actions.StartDebugger);
     }
   }
index 322c184e9567c71690825cc4bbabed62117026e4..1fd62b32f3cdf6e0d4ec8dba820b395544ea2208 100644 (file)
@@ -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.lazyMessage("run.dashboard.remove.run.configuration.type.action.name",
                                                  "Configuration " + StringUtil.pluralize("Type", types.size())));
   }
 
index 087975250c74d963d708738df9462ff718281dee..9a7a283ebc602a6700f81a30431663229f2030b1 100644 (file)
@@ -36,13 +36,13 @@ 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.setDescription(() -> ExecutionBundle.message("run.dashboard.rerun.action.description"));
+      presentation.setText(ExecutionBundle.lazyMessage("run.dashboard.rerun.action.name"));
+      presentation.setDescription(ExecutionBundle.lazyMessage("run.dashboard.rerun.action.description"));
       presentation.setIcon(AllIcons.Actions.Restart);
     }
     else {
-      presentation.setText(() -> ExecutionBundle.message("run.dashboard.run.action.name"));
-      presentation.setDescription(() -> ExecutionBundle.message("run.dashboard.run.action.description"));
+      presentation.setText(ExecutionBundle.lazyMessage("run.dashboard.run.action.name"));
+      presentation.setDescription(ExecutionBundle.lazyMessage("run.dashboard.run.action.description"));
       presentation.setIcon(AllIcons.Actions.Execute);
     }
   }
index ad255a26ab8570001a51becaba2e84c4c45f98cd..25a5c17ce58f36a87388dfe0ab8137941020c0ae 100644 (file)
@@ -19,7 +19,7 @@ import javax.swing.*;
 
 public class FindAllAction extends AnAction implements ShortcutProvider, DumbAware {
   public FindAllAction() {
-    super(() -> IdeBundle.message("show.in.find.window.button.name"), () -> IdeBundle.message("show.in.find.window.button.description"),
+    super(IdeBundle.lazyMessage("show.in.find.window.button.name"), IdeBundle.lazyMessage("show.in.find.window.button.description"),
           null);
   }
 
index 395cb88090f3aaace19a31bdbcae14d9d560001a..54020e747e0a79082843f9b02c105a6126c5ba2a 100644 (file)
@@ -9,8 +9,8 @@ import org.jetbrains.annotations.NotNull;
 
 public class ShowSearchHistoryAction extends AnAction {
   ShowSearchHistoryAction() {
-    super(() -> IdeBundle.message("action.AnAction.text.search.history"),
-          () -> IdeBundle.message("action.AnAction.description.search.history"), AllIcons.Actions.SearchWithHistory);
+    super(IdeBundle.lazyMessage("action.AnAction.text.search.history"),
+          IdeBundle.lazyMessage("action.AnAction.description.search.history"), AllIcons.Actions.SearchWithHistory);
   }
 
   @Override
index a546e2fd8c01f4a05e83c8583f2d67e5220daa40..859226754daf6024881574ea1e985b2d538d9d47 100644 (file)
@@ -625,8 +625,8 @@ public class ShowUsagesAction extends AnAction implements PopupAction, HintManag
                                                  @NotNull Runnable findUsagesRunnable) {
     Icon icon = ToolWindowManagerEx.getInstanceEx(project).getLocationIcon(ToolWindowId.FIND, AllIcons.General.Pin_tab);
     AnAction pinAction =
-      new AnAction(() -> IdeBundle.message("show.in.find.window.button.name"),
-                   () -> IdeBundle.message("show.in.find.window.button.pin.description"), icon) {
+      new AnAction(IdeBundle.lazyMessage("show.in.find.window.button.name"),
+                   IdeBundle.lazyMessage("show.in.find.window.button.pin.description"), icon) {
         {
           AnAction action = ActionManager.getInstance().getAction(IdeActions.ACTION_FIND_USAGES);
           setShortcutSet(action.getShortcutSet());
index 1ad8f03dfbf5442084d5381db852873a6312a246..ef418d2fd1d0d42ff4df2c781ecbbba9be7a707a 100644 (file)
@@ -521,7 +521,7 @@ public class FindPopupPanel extends JBPanel<FindPopupPanel> implements FindUI {
 
     DefaultActionGroup tabOptionsGroup = new DefaultActionGroup() {{
       Presentation presentation = getTemplatePresentation();
-      presentation.setText(() -> FindBundle.message("find.popup.show.tab.options"));
+      presentation.setText(FindBundle.lazyMessage("find.popup.show.tab.options"));
       presentation.setIcon(AllIcons.General.GearPlain);
       setPopup(true);
       setShortcutSet(CustomShortcutSet.fromString("alt ctrl DOWN"));
@@ -1757,8 +1757,8 @@ public class FindPopupPanel extends JBPanel<FindPopupPanel> implements FindUI {
   }
 
   private class MyPinAction extends ToggleAction {
-    private MyPinAction() {super(() -> IdeBundle.message("action.ToggleAction.text.pin.window"),
-                                 () -> IdeBundle.message("action.ToggleAction.description.pin.window"), AllIcons.General.Pin_tab);}
+    private MyPinAction() {super(IdeBundle.lazyMessage("action.ToggleAction.text.pin.window"),
+                                 IdeBundle.lazyMessage("action.ToggleAction.description.pin.window"), AllIcons.General.Pin_tab);}
 
     @Override
     public boolean isDumbAware() {
index 5bf67702a1c8eb0a6bfed68c4844f2c36c1ee14a..fd058cb4dc34e7aa77541b0814aec399af2d025d 100644 (file)
@@ -36,10 +36,10 @@ import java.awt.event.ActionListener;
 import java.util.Arrays;
 
 class FindPopupScopeUIImpl implements FindPopupScopeUI {
-  static final ScopeType PROJECT = new ScopeType("Project", () -> FindBundle.message("find.popup.scope.project"), EmptyIcon.ICON_0);
-  static final ScopeType MODULE = new ScopeType("Module", () -> FindBundle.message("find.popup.scope.module"), EmptyIcon.ICON_0);
-  static final ScopeType DIRECTORY = new ScopeType("Directory", () -> FindBundle.message("find.popup.scope.directory"), EmptyIcon.ICON_0);
-  static final ScopeType SCOPE = new ScopeType("Scope", () -> FindBundle.message("find.popup.scope.scope"), EmptyIcon.ICON_0);
+  static final ScopeType PROJECT = new ScopeType("Project", FindBundle.lazyMessage("find.popup.scope.project"), EmptyIcon.ICON_0);
+  static final ScopeType MODULE = new ScopeType("Module", FindBundle.lazyMessage("find.popup.scope.module"), EmptyIcon.ICON_0);
+  static final ScopeType DIRECTORY = new ScopeType("Directory", FindBundle.lazyMessage("find.popup.scope.directory"), EmptyIcon.ICON_0);
+  static final ScopeType SCOPE = new ScopeType("Scope", FindBundle.lazyMessage("find.popup.scope.scope"), EmptyIcon.ICON_0);
 
   @NotNull private final FindUIHelper myHelper;
   @NotNull private final Project myProject;
index 8b68fe6e826646bf90b3b48c08e41b86c8e3b6ea..3d9be80c8d141e4883e558569020eb227cd79414 100644 (file)
@@ -177,7 +177,7 @@ public final class FrameworkDetectionManager implements FrameworkDetectionIndexL
         final String text = ProjectBundle.message("framework.detected.info.text", names, frameworkNames.size());
         FRAMEWORK_DETECTION_NOTIFICATION
           .createNotification("Frameworks Detected", text, NotificationType.INFORMATION, null)
-          .addAction(new NotificationAction(() -> IdeBundle.message("action.Anonymous.text.configure")) {
+          .addAction(new NotificationAction(IdeBundle.lazyMessage("action.Anonymous.text.configure")) {
             @Override
             public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification notification) {
               showSetupFrameworksDialog(notification);
index 6a2b6eab7c16d877b3a7d7935742abd762568410..821c0c7f78e01999997f7a19444eb76a7827898e 100644 (file)
@@ -68,8 +68,8 @@ public class CreateDirectoryOrPackageAction extends AnAction implements DumbAwar
   public static final DataKey<String> TEST_DIRECTORY_NAME_KEY = DataKey.create("CreateDirectoryOrPackageAction.testName");
 
   public CreateDirectoryOrPackageAction() {
-    super(() -> IdeBundle.message("action.create.new.directory.or.package"),
-          () -> IdeBundle.message("action.create.new.directory.or.package"), null);
+    super(IdeBundle.lazyMessage("action.create.new.directory.or.package"),
+          IdeBundle.lazyMessage("action.create.new.directory.or.package"), null);
   }
 
   @Override
@@ -156,11 +156,11 @@ public class CreateDirectoryOrPackageAction extends AnAction implements DumbAwar
     }
 
     if (isPackage) {
-      presentation.setText(() -> IdeBundle.message("action.package"));
+      presentation.setText(IdeBundle.lazyMessage("action.package"));
       presentation.setIcon(PlatformIcons.PACKAGE_ICON);
     }
     else {
-      presentation.setText(() -> IdeBundle.message("action.directory"));
+      presentation.setText(IdeBundle.lazyMessage("action.directory"));
       presentation.setIcon(PlatformIcons.FOLDER_ICON);
     }
   }
index 2b8773bfdf4747c2daf9de2ecf151ec8e3ceacf8..6577ed1f5202c2a01fbf52e1b2c6113967c67641 100644 (file)
@@ -49,7 +49,7 @@ public class GotoClassAction extends GotoActionBase implements DumbAware {
     //we need to change the template presentation to show the proper text for the action in Settings | Keymap
     Presentation presentation = getTemplatePresentation();
     presentation.setText(GotoClassPresentationUpdater.getActionTitle() + "...");
-    presentation.setDescription(() -> IdeBundle.message("go.to.class.action.description",
+    presentation.setDescription(IdeBundle.lazyMessage("go.to.class.action.description",
                                                   StringUtil.join(GotoClassPresentationUpdater.getElementKinds(), "/")));
   }
 
index 4fc6070e6449a02ee00ae31172d8faa658d46848..8523539ee7dac878b7339bb4ff47fca4d0ee37df 100644 (file)
@@ -38,14 +38,14 @@ public final class PowerSaveModeNotifier implements StartupActivity.DumbAware {
     Notification notification = POWER_SAVE_MODE
       .createNotification("Power save mode is on", "Code insight and background tasks are disabled.", NotificationType.WARNING, null);
 
-    notification.addAction(new NotificationAction(() -> IdeBundle.message("action.Anonymous.text.do.not.show.again")) {
+    notification.addAction(new NotificationAction(IdeBundle.lazyMessage("action.Anonymous.text.do.not.show.again")) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification notification) {
         PropertiesComponent.getInstance().setValue(IGNORE_POWER_SAVE_MODE, true);
         notification.expire();
       }
     });
-    notification.addAction(new NotificationAction(() -> IdeBundle.message("action.Anonymous.text.disable.power.save.mode")) {
+    notification.addAction(new NotificationAction(IdeBundle.lazyMessage("action.Anonymous.text.disable.power.save.mode")) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification notification) {
         PowerSaveMode.setEnabled(false);
index f586ae05ce8310008c14827da4a65b61169c4a80..e7a2973e24f79a594e8157b312bbbe84d2db1c13 100644 (file)
@@ -20,7 +20,7 @@ public class QuickChangeCodeStyleSchemeAction extends QuickSwitchSchemeAction {
   protected void fillActions(Project project, @NotNull DefaultActionGroup group, @NotNull DataContext dataContext) {
     final CodeStyleSettingsManager manager = CodeStyleSettingsManager.getInstance(project);
     if (manager.getMainProjectCodeStyle() != null) {
-      group.add(new AnAction(() -> IdeBundle.message("action.QuickChangeCodeStyleSchemeAction.Anonymous.text.project"), () -> "",
+      group.add(new AnAction(IdeBundle.lazyMessage("action.QuickChangeCodeStyleSchemeAction.Anonymous.text.project"), () -> "",
                              manager.USE_PER_PROJECT_SETTINGS ? AllIcons.Actions.Forward : ourNotCurrentAction) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
index 8074ccf898cf6427c3923eac8ee73c9b5a4f05ed..427adc77a56620e3abdad57340bbe1cf34254da1 100644 (file)
@@ -87,7 +87,7 @@ abstract class WeighingActionGroup extends ActionGroup {
 
     ActionGroup other = new ExcludingActionGroup(delegate, heaviest);
     other.setPopup(true);
-    other.getTemplatePresentation().setText(() -> IdeBundle.message("action.presentation.WeighingActionGroup.text"));
+    other.getTemplatePresentation().setText(IdeBundle.lazyMessage("action.presentation.WeighingActionGroup.text"));
     return new AnAction[]{chosen, new Separator(), other};
   }
 
index c145732390c537d3ad0cadd679d20156d892572e..24922c277cacce7eaf92a839c45695657bad1441 100644 (file)
@@ -28,8 +28,8 @@ public abstract class ShowFilterAction extends ToggleAction implements DumbAware
   private JBPopup myFilterPopup;
 
   public ShowFilterAction() {
-    super(() -> IdeBundle.message("action.ToggleAction.show.filter.text.filter"),
-          () -> IdeBundle.message("action.ToggleAction.show.filter.description.show.filters.popup"), AllIcons.General.Filter);
+    super(IdeBundle.lazyMessage("action.ToggleAction.show.filter.text.filter"),
+          IdeBundle.lazyMessage("action.ToggleAction.show.filter.description.show.filters.popup"), AllIcons.General.Filter);
   }
 
   @Override
index 52de12049c0f96b9a48e54484e0f8b5366d356c8..2bc07545cb78613a5fd68abc0f26ffc43595d3f6 100644 (file)
@@ -1332,8 +1332,8 @@ public class SearchEverywhereUI extends BigPopupUI implements DataProvider, Quic
   private class ShowInFindToolWindowAction extends DumbAwareAction {
 
     ShowInFindToolWindowAction() {
-      super(() -> IdeBundle.message("show.in.find.window.button.name"),
-            () -> IdeBundle.message("show.in.find.window.button.description"), AllIcons.General.Pin_tab);
+      super(IdeBundle.lazyMessage("show.in.find.window.button.name"),
+            IdeBundle.lazyMessage("show.in.find.window.button.description"), AllIcons.General.Pin_tab);
     }
 
     @Override
index b426302be1f6fd894688373c3010c77062ff4fdf..0363a70bf72beccab2fb88e6859c5f2759ab0eb0 100644 (file)
@@ -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.lazyMessage("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.lazyMessage("action.bookmark.toggle"));
       Toggleable.setSelected(event.getPresentation(), selected);
     }
   }
index 317440340c1ce05dc46905aa6a60acbfd5480f86..2e163152740b44ef42e3f83f6e3ce68a5cc9ab70 100644 (file)
@@ -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.lazyMessage("action.bookmark.toggle.mnemonic"));
   }
 
   @Override
@@ -38,11 +38,11 @@ public class ToggleBookmarkWithMnemonicAction extends ToggleBookmarkAction {
         e.getPresentation().setVisible(false);
       }
       else {
-        e.getPresentation().setText(() -> IdeBundle.message("action.presentation.ToggleBookmarkWithMnemonicAction.text"));
+        e.getPresentation().setText(IdeBundle.lazyMessage("action.presentation.ToggleBookmarkWithMnemonicAction.text"));
       }
     }
     else {
-      e.getPresentation().setText(() -> IdeBundle.message("action.bookmark.toggle.mnemonic"));
+      e.getPresentation().setText(IdeBundle.lazyMessage("action.bookmark.toggle.mnemonic"));
     }
   }
 
index ebbc304ccc68a4e5834cfa6687c2e49e970762b1..a8221963d9d672bbd93179f3c6b97918524c7d69 100644 (file)
@@ -26,8 +26,8 @@ import org.jetbrains.annotations.NotNull;
 
 class AddAllOpenFilesToNewFavoritesListAction extends AnAction implements DumbAware {
   AddAllOpenFilesToNewFavoritesListAction() {
-    super(() -> IdeBundle.message("action.add.all.open.tabs.to.new.favorites.list"),
-          () -> IdeBundle.message("action.add.to.new.favorites.list"), AllIcons.General.Add);
+    super(IdeBundle.lazyMessage("action.add.all.open.tabs.to.new.favorites.list"),
+          IdeBundle.lazyMessage("action.add.to.new.favorites.list"), AllIcons.General.Add);
   }
 
   @Override
index cb66ac1aca77f8c834bc1ff03cdb01ef01d7590e..9080fa36c46f19e575fe15009f7f39ccbc53e93a 100644 (file)
@@ -16,8 +16,8 @@ import java.util.Collection;
 
 class AddToNewFavoritesListAction extends AnAction implements DumbAware {
   AddToNewFavoritesListAction() {
-    super(() -> IdeBundle.message("action.add.to.new.favorites.list"),
-          () -> IdeBundle.message("action.add.to.new.favorites.list.description"), AllIcons.General.Add);
+    super(IdeBundle.lazyMessage("action.add.to.new.favorites.list"),
+          IdeBundle.lazyMessage("action.add.to.new.favorites.list.description"), AllIcons.General.Add);
   }
 
   @Override
index 41b04c6e8bc6bccfaad12d0e4fb511210258702f..b078156f769b45286617d2d65e43061706fa36b6 100644 (file)
@@ -25,12 +25,12 @@ 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.setDescription(() -> IdeBundle.message("action.show.hide.empty.middle.packages"));
+      presentation.setText(IdeBundle.lazyMessage("action.hide.empty.middle.packages"));
+      presentation.setDescription(IdeBundle.lazyMessage("action.show.hide.empty.middle.packages"));
     }
     else {
-      presentation.setText(() -> IdeBundle.message("action.compact.empty.middle.packages"));
-      presentation.setDescription(() -> IdeBundle.message("action.show.compact.empty.middle.packages"));
+      presentation.setText(IdeBundle.lazyMessage("action.compact.empty.middle.packages"));
+      presentation.setDescription(IdeBundle.lazyMessage("action.show.compact.empty.middle.packages"));
     }
 
   }
index 72d0843d57a6ab682f693b8409a00eba85660766..8cf64dd04c9a987848478a48f38afb78332160a6 100644 (file)
@@ -604,7 +604,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem
 
   protected class AlphaSortAction extends ToggleAction {
     public AlphaSortAction() {
-      super(() -> IdeBundle.message("action.sort.alphabetically"), () -> IdeBundle.message("action.sort.alphabetically"),
+      super(IdeBundle.lazyMessage("action.sort.alphabetically"), IdeBundle.lazyMessage("action.sort.alphabetically"),
             AllIcons.ObjectBrowser.Sorted);
     }
 
@@ -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.lazyMessage("action.base.on.this.0", StringUtil.capitalize(typeName)));
         }
         presentation.setEnabled(isEnabled(browser, selectedElement));
       }
@@ -794,7 +794,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem
 
     private final class ConfigureScopesAction extends AnAction {
       private ConfigureScopesAction() {
-        super(() -> ActionsBundle.message("action.ConfigureScopesAction.text"));
+        super(ActionsBundle.lazyMessage("action.ConfigureScopesAction.text"));
       }
 
       @Override
index 2a534fbb0155b3d3f5a8fb36de723171d0ae2597..2c1f622ccab07a57a77211295233c2ea0998a129 100644 (file)
@@ -107,7 +107,7 @@ public abstract class MethodHierarchyBrowserBase extends HierarchyBrowserBaseEx
 
   private final class ShowImplementationsOnlyAction extends ToggleAction {
     private ShowImplementationsOnlyAction() {
-      super(() -> IdeBundle.message("action.hide.non.implementations"), AllIcons.General.Filter);
+      super(IdeBundle.lazyMessage("action.hide.non.implementations"), AllIcons.General.Filter);
     }
 
     @Override
index f824b7dcab1bd7064e78f075b4c369932cd90645..634643e6ac48e88acc18018adec99b62c543ee01 100644 (file)
@@ -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.lazyMessage("action.browse.call.hierarchy"));
     }
 
     super.update(event);
index f4b73b637b62ce00d10e3d57afff2743ada78bad..268721c116149fba02bc38fb744ff2d8fb981c35 100644 (file)
@@ -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.lazyMessage("action.browse.method.hierarchy"));
     }
     super.update(event);
   }
index da2124b98f684d3593c417b574b2ec4ef51caf76..5263f8ac6eaf56c6e33465fd7b3061a55346bdea 100644 (file)
@@ -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.lazyMessage("action.browse.type.hierarchy"));
     }
     super.update(event);
   }
index 345813b22baceb47c5d0b5d15752b1f94358013c..cda71dbc08047bb1c51746b1f0b0fbd84a3bf494 100644 (file)
@@ -27,10 +27,10 @@ public abstract class CallHierarchyBrowserBase extends HierarchyBrowserBaseEx {
   public static final String CALLER_TYPE = "Callers of {0}";
 
   @SuppressWarnings("UnresolvedPropertyKey") private static final HierarchyScopeType CALLEE =
-    new HierarchyScopeType(() -> IdeBundle.message("title.hierarchy.callees.of"));
+    new HierarchyScopeType(IdeBundle.lazyMessage("title.hierarchy.callees.of"));
 
   @SuppressWarnings("UnresolvedPropertyKey") private static final HierarchyScopeType CALLER =
-    new HierarchyScopeType(() -> IdeBundle.message("title.hierarchy.callers.of"));
+    new HierarchyScopeType(IdeBundle.lazyMessage("title.hierarchy.callers.of"));
 
   private static final String CALL_HIERARCHY_BROWSER_DATA_KEY = "com.intellij.ide.hierarchy.newAPI.CallHierarchyBrowserBase";
 
index bcaa17d86b8a452272c99b85334ebefe94d84132..9d0f4888c84ef07915bb655bae2423f9818fc952 100644 (file)
@@ -603,7 +603,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem
 
   protected class AlphaSortAction extends ToggleAction {
     public AlphaSortAction() {
-      super(() -> IdeBundle.message("action.sort.alphabetically"), () -> IdeBundle.message("action.sort.alphabetically"),
+      super(IdeBundle.lazyMessage("action.sort.alphabetically"), IdeBundle.lazyMessage("action.sort.alphabetically"),
             AllIcons.ObjectBrowser.Sorted);
     }
 
@@ -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.lazyMessage("action.base.on.this.0", StringUtil.capitalize(typeName)));
         }
         presentation.setEnabled(isEnabled(browser, selectedElement));
       }
@@ -793,7 +793,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem
 
     private final class ConfigureScopesAction extends AnAction {
       private ConfigureScopesAction() {
-        super(() -> ActionsBundle.message("action.ConfigureScopesAction.text"));
+        super(ActionsBundle.lazyMessage("action.ConfigureScopesAction.text"));
       }
 
       @Override
index 37acfdfdd093bd54b761fc3010ecd008c8c6f3ad..e27e14980619592f11a97a01b8960ff5355d481c 100644 (file)
@@ -24,7 +24,7 @@ public abstract class MethodHierarchyBrowserBase extends HierarchyBrowserBaseEx
   public static final String METHOD_TYPE = "Method {0}";
 
   @SuppressWarnings("UnresolvedPropertyKey") private static final HierarchyScopeType METHOD =
-    new HierarchyScopeType(() -> IdeBundle.message("title.hierarchy.method"));
+    new HierarchyScopeType(IdeBundle.lazyMessage("title.hierarchy.method"));
 
   public static final DataKey<MethodHierarchyBrowserBase> DATA_KEY = DataKey.create("com.intellij.ide.hierarchy.newAPI.MethodHierarchyBrowserBase");
 
@@ -93,7 +93,7 @@ public abstract class MethodHierarchyBrowserBase extends HierarchyBrowserBaseEx
 
   private final class ShowImplementationsOnlyAction extends ToggleAction {
     private ShowImplementationsOnlyAction() {
-      super(() -> IdeBundle.message("action.hide.non.implementations"), AllIcons.General.Filter);
+      super(IdeBundle.lazyMessage("action.hide.non.implementations"), AllIcons.General.Filter);
     }
 
     @Override
index d329f526c78a3c7f548ab7904ab7fd8edf5801a2..b1b58a64d180dc82159c6ee517c25a0a04a443b2 100644 (file)
@@ -37,11 +37,11 @@ public abstract class TypeHierarchyBrowserBase extends HierarchyBrowserBaseEx {
   public static final String SUPERTYPES_HIERARCHY_TYPE = "Supertypes of {0}";
 
   @SuppressWarnings("UnresolvedPropertyKey") private static final HierarchyScopeType TYPE =
-    new HierarchyScopeType(() -> IdeBundle.message("title.hierarchy.class"));
+    new HierarchyScopeType(IdeBundle.lazyMessage("title.hierarchy.class"));
   @SuppressWarnings("UnresolvedPropertyKey") private static final HierarchyScopeType SUBTYPES =
-    new HierarchyScopeType(() -> IdeBundle.message("title.hierarchy.subtypes"));
+    new HierarchyScopeType(IdeBundle.lazyMessage("title.hierarchy.subtypes"));
   @SuppressWarnings("UnresolvedPropertyKey") private static final HierarchyScopeType SUPERTYPES =
-    new HierarchyScopeType(() -> IdeBundle.message("title.hierarchy.supertypes"));
+    new HierarchyScopeType(IdeBundle.lazyMessage("title.hierarchy.supertypes"));
 
   private boolean myIsInterface;
 
index b00571ddea76c77093e89c371caa0f2e886b9ed6..acdd759e7e08e72988312c36ae00cb32a042f293 100644 (file)
@@ -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.lazyMessage("action.browse.call.hierarchy"));
     }
 
     super.update(event);
index 3bc84035e57cf15f813b9ad2e9c1009390de0082..8c4e8c145cda41f3c717c1a5a033eea1c05a1571 100644 (file)
@@ -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.lazyMessage("action.browse.method.hierarchy"));
     }
     super.update(event);
   }
index 45d429e1d7f7217e7e7e2997957cae09d9297109..558b9470b004feb13c89146f65e53c34eab4939b 100644 (file)
@@ -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.lazyMessage("action.browse.type.hierarchy"));
     }
     super.update(event);
   }
index a524a91af52665bc0aa342527c05e7a6b9f0062b..663e9ea1ece8113c4a83a25ce3c69716dc17a8b9 100644 (file)
@@ -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.lazyMessage("action.ShowNavBar.ShortText"));
     }
   }
 }
index ee209efbd7b42010757938265900f695ca9d4999..331dd0d049c4429da7ed0eb1ec1cd7b5b38d013e 100644 (file)
@@ -26,7 +26,7 @@ public class MarkSourceRootAction extends MarkRootActionBase {
     LOG.assertTrue(editHandler != null);
     presentation.setIcon(editHandler.getRootIcon());
     presentation.setText(editHandler.getFullRootTypeName());
-    presentation.setDescription(() -> ProjectBundle.message("module.toggle.sources.action.description",
+    presentation.setDescription(ProjectBundle.lazyMessage("module.toggle.sources.action.description",
                                                       editHandler.getFullRootTypeName().toLowerCase(Locale.getDefault())));
   }
 
index bad1cdac9258557b9b65a6e954115d4ab5729c37..10640d3c4faa2f432cd379029f80424a66b9890d 100644 (file)
@@ -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.lazyMessage("mark.as.unmark.excluded"));
       return;
     }
 
index 7c4367b6b188b285cbd853977bb12716bf3a74cf..303bb189f026bc3c854792be8dc41017a744f8b8 100644 (file)
@@ -1959,8 +1959,8 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
 
   private class ScrollFromSourceAction extends AnAction implements DumbAware {
   ScrollFromSourceAction() {
-    super(() -> IdeBundle.message("action.AnAction.text.select.opened.file"),
-          () -> IdeBundle.message("action.AnAction.description.select.opened.file"), AllIcons.General.Locate);
+    super(IdeBundle.lazyMessage("action.AnAction.text.select.opened.file"),
+          IdeBundle.lazyMessage("action.AnAction.description.select.opened.file"), AllIcons.General.Locate);
   }
 
     @Override
index 1db5de56d5d7775d284d7422b89c68d95f31aa8d..3bed1e0e9f1b2930e52d4205e344891a925e6c67 100644 (file)
@@ -59,8 +59,8 @@ public class SetTodoFilterAction extends AnAction implements CustomComponentActi
     }
     group.addSeparator();
     group.add(
-      new AnAction(() -> IdeBundle.message("action.todo.edit.filters"),
-                   () -> IdeBundle.message("action.todo.edit.filters"), AllIcons.General.Settings) {
+      new AnAction(IdeBundle.lazyMessage("action.todo.edit.filters"),
+                   IdeBundle.lazyMessage("action.todo.edit.filters"), AllIcons.General.Settings) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
           final ShowSettingsUtil util = ShowSettingsUtil.getInstance();
index f3f7f993b8b62575d67f897cfcbc12c5adb5ff10..d74ba6d4e298b79675010704023239ad9106913b 100644 (file)
@@ -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.lazyMessage("group.group.by"));
       setPopup(true);
     }
 
@@ -652,7 +652,7 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig
 
   public static final class MyShowPackagesAction extends ToggleAction {
     public MyShowPackagesAction() {
-      super(() -> IdeBundle.message("action.group.by.packages"), PlatformIcons.GROUP_BY_PACKAGES);
+      super(IdeBundle.lazyMessage("action.group.by.packages"), PlatformIcons.GROUP_BY_PACKAGES);
     }
 
     @Override
@@ -679,7 +679,7 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig
 
   public static final class MyShowModulesAction extends ToggleAction {
     public MyShowModulesAction() {
-      super(() -> IdeBundle.message("action.group.by.modules"), AllIcons.Actions.GroupByModule);
+      super(IdeBundle.lazyMessage("action.group.by.modules"), AllIcons.Actions.GroupByModule);
     }
 
     @Override
@@ -707,7 +707,7 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig
 
   public static final class MyFlattenPackagesAction extends ToggleAction {
     public MyFlattenPackagesAction() {
-      super(() -> IdeBundle.message("action.flatten.view"), PlatformIcons.FLATTEN_PACKAGES_ICON);
+      super(IdeBundle.lazyMessage("action.flatten.view"), PlatformIcons.FLATTEN_PACKAGES_ICON);
     }
 
     @Override
@@ -747,7 +747,7 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig
   private final class MyPreviewAction extends ToggleAction {
 
     MyPreviewAction() {
-      super(() -> VcsBundle.message("action.ToggleAction.text.preview.source"), Presentation.NULL_STRING, AllIcons.Actions.PreviewDetails);
+      super(VcsBundle.lazyMessage("action.ToggleAction.text.preview.source"), Presentation.NULL_STRING, AllIcons.Actions.PreviewDetails);
     }
 
     @Override
index b6cfca30956f4d1a6869d89a43d1e3cbcf8114ac..86cf97650765fa13af94a2dd05c8d2396518711f 100644 (file)
@@ -159,7 +159,7 @@ public class TodoView implements PersistentStateComponent<TodoView.State>, Dispo
     if (toolWindow instanceof ToolWindowEx) {
       DefaultActionGroup group = new DefaultActionGroup() {
         {
-          getTemplatePresentation().setText(() -> IdeBundle.message("group.view.options"));
+          getTemplatePresentation().setText(IdeBundle.lazyMessage("group.view.options"));
           setPopup(true);
           add(myAllTodos.createAutoScrollToSourceAction());
           addSeparator();
index 690e894e54b48c90b54cd9d19b41cf7bdff9386b..22f63e37263071da626faaf9fd65b876047a9953 100644 (file)
@@ -531,7 +531,7 @@ public class DirectoryChooser extends DialogWrapper {
 
   private class FilterExistentAction extends ToggleAction {
     FilterExistentAction() {
-      super(() -> RefactoringBundle.message("directory.chooser.hide.non.existent.checkBox.text"),
+      super(RefactoringBundle.lazyMessage("directory.chooser.hide.non.existent.checkBox.text"),
             () -> UIUtil.removeMnemonic(RefactoringBundle.message("directory.chooser.hide.non.existent.checkBox.text")),
             AllIcons.General.Filter);
     }
index ebd8649da7f6b2ed559adba93ee5cd1d8b7d28ca..59dd8494b95e419bff28c779bc2101db60e6f978 100644 (file)
@@ -795,7 +795,7 @@ public class MemberChooser<T extends ClassMember> extends DialogWrapper implemen
 
   private class SortEmAction extends ToggleAction {
     SortEmAction() {
-      super(() -> IdeBundle.message("action.sort.alphabetically"), () -> IdeBundle.message("action.sort.alphabetically"),
+      super(IdeBundle.lazyMessage("action.sort.alphabetically"), IdeBundle.lazyMessage("action.sort.alphabetically"),
             AllIcons.ObjectBrowser.Sorted);
     }
 
@@ -843,7 +843,7 @@ public class MemberChooser<T extends ClassMember> extends DialogWrapper implemen
 
   private class ExpandAllAction extends AnAction {
     ExpandAllAction() {
-      super(() -> IdeBundle.message("action.expand.all"), () -> IdeBundle.message("action.expand.all"), AllIcons.Actions.Expandall);
+      super(IdeBundle.lazyMessage("action.expand.all"), IdeBundle.lazyMessage("action.expand.all"), AllIcons.Actions.Expandall);
     }
 
     @Override
@@ -854,7 +854,7 @@ public class MemberChooser<T extends ClassMember> extends DialogWrapper implemen
 
   private class CollapseAllAction extends AnAction {
     CollapseAllAction() {
-      super(() -> IdeBundle.message("action.collapse.all"), () -> IdeBundle.message("action.collapse.all"), AllIcons.Actions.Collapseall);
+      super(IdeBundle.lazyMessage("action.collapse.all"), IdeBundle.lazyMessage("action.collapse.all"), AllIcons.Actions.Collapseall);
     }
 
     @Override
index 0ed94e5046c8ef02123f717dc4bb286773e1d85d..ed29499c5136bbbeb4594d52eabba1243f784df5 100644 (file)
@@ -451,7 +451,7 @@ public abstract class ChooseByNameBase implements ChooseByNameViewModel {
 
     if (checkBoxName != null) {
       if (myCheckBoxShortcut != null) {
-        new DumbAwareAction(() -> IdeBundle.message("action.AnActionButton.text.change.goto.check.box")) {
+        new DumbAwareAction(IdeBundle.lazyMessage("action.AnActionButton.text.change.goto.check.box")) {
           @Override
           public void actionPerformed(@NotNull AnActionEvent e) {
             myCheckBox.setSelected(!myCheckBox.isSelected());
index 54bc01e043f740970974459122600a8aa3be9561..ef69610b4447f71cf314d5137d9f8d3dae0b74ec 100644 (file)
@@ -193,8 +193,8 @@ public abstract class ChooseByNameFilter<T> {
 
   private class FilterAction extends ToggleAction implements DumbAware {
     FilterAction() {
-      super(() -> IdeBundle.message("action.ToggleAction.text.filter"),
-            () -> IdeBundle.message("action.ToggleAction.text.filter.files.by.type"), AllIcons.General.Filter);
+      super(IdeBundle.lazyMessage("action.ToggleAction.text.filter"),
+            IdeBundle.lazyMessage("action.ToggleAction.text.filter.files.by.type"), AllIcons.General.Filter);
     }
 
     @Override
index f4b461cd2f86ce1efe104faa0ad6d8fda872dcc6..78b54baf45968249dc79b77c1e61247117f71619 100644 (file)
@@ -462,8 +462,8 @@ public class ScopeChooserConfigurable extends MasterDetailsComponent implements
 
   private class MySaveAsAction extends AnAction {
     MySaveAsAction() {
-      super(() -> ExecutionBundle.message("action.name.save.as.configuration"),
-            () -> ExecutionBundle.message("action.name.save.as.configuration"), AllIcons.Actions.Menu_saveall);
+      super(ExecutionBundle.lazyMessage("action.name.save.as.configuration"),
+            ExecutionBundle.lazyMessage("action.name.save.as.configuration"), AllIcons.Actions.Menu_saveall);
     }
 
     @Override
index 17ce56ff785f9f437e397dfc04e79a545df8094a..7981b9327cdcb6016f4061effd5d0e3afe77b33f 100644 (file)
@@ -46,8 +46,8 @@ public class AddInlayInternalAction extends AnAction implements DumbAware {
     for (int offset : offsets) {
       AtomicReference<Inlay<?>> ref = new AtomicReference<>();
       MenuOnClickPresentation presentation = new MenuOnClickPresentation(new PresentationFactory(editor).text(inlayText), project, () -> {
-        return Collections.singletonList(new AnAction(() -> IdeBundle.message("action.AddInlayInternalAction.Anonymous.text.remove"),
-                                                      () -> IdeBundle.message("action.AddInlayInternalAction.Anonymous.description.remove.this.inlay"),
+        return Collections.singletonList(new AnAction(IdeBundle.lazyMessage("action.AddInlayInternalAction.Anonymous.text.remove"),
+                                                      IdeBundle.lazyMessage("action.AddInlayInternalAction.Anonymous.description.remove.this.inlay"),
                                                       AllIcons.Actions.Cancel) {
           @Override
           public void actionPerformed(@NotNull AnActionEvent e1) {
index 12264b26b278142b9000d8aa221e651b0ea3088b..7ebda790231038bd18a2ded56f512de2ebcb95b4 100644 (file)
@@ -37,7 +37,7 @@ import java.util.List;
 
 public class ComputeVirtualFileNameStatAction extends AnAction implements DumbAware {
   public ComputeVirtualFileNameStatAction() {
-    super(() -> ActionsBundle.message("action.ComputeVirtualFileNameStatAction.text"));
+    super(ActionsBundle.lazyMessage("action.ComputeVirtualFileNameStatAction.text"));
   }
 
   @Override
index 8ffa8f2c15b5d5b65a4f26cce78227148f20af48..38cf2887433a50aba72e9cb70672d279f33a2f4a 100644 (file)
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
 
 public class DumpConfigurationTypesAction extends AnAction implements DumbAware {
   public DumpConfigurationTypesAction() {
-    super(() -> ActionsBundle.message("action.DumpConfigurationTypesAction.text"));
+    super(ActionsBundle.lazyMessage("action.DumpConfigurationTypesAction.text"));
   }
 
   @Override
index 410ed5c746a569f18e72b3b4538ae7f4e6cb5470..268985dfa79fcbd88022ac1abfe2d7f20b6f7f11 100644 (file)
@@ -32,7 +32,7 @@ public class DumpDirectoryInfoAction extends AnAction {
   public static final Logger LOG = Logger.getInstance(DumpDirectoryInfoAction.class);
 
   public DumpDirectoryInfoAction() {
-    super(() -> ActionsBundle.message("action.DumpDirectoryInfoAction.text"));
+    super(ActionsBundle.lazyMessage("action.DumpDirectoryInfoAction.text"));
   }
 
   @Override
index e65045a63cbb18dade08ee24318db5fdc8e9a630..575c48ac153f63a0462da38e48aba6872e0b9061 100644 (file)
@@ -34,7 +34,7 @@ public class DumpInspectionDescriptionsAction extends AnAction implements DumbAw
   private static final Logger LOG = Logger.getInstance(DumpInspectionDescriptionsAction.class);
 
   public DumpInspectionDescriptionsAction() {
-    super(() -> ActionsBundle.message("action.DumpInspectionDescriptionsAction.text"));
+    super(ActionsBundle.lazyMessage("action.DumpInspectionDescriptionsAction.text"));
   }
 
   @Override
index c2247b907e675d93419a6c8a908d04bffce02d09..7c1d489b9c5011b6959a472d71fbb6634db9e4ac 100644 (file)
@@ -40,7 +40,7 @@ import java.util.Map;
 
 public class DumpIntentionsAction extends AnAction implements DumbAware {
   public DumpIntentionsAction() {
-    super(() -> ActionsBundle.message("action.DumpIntentionsAction.text"));
+    super(ActionsBundle.lazyMessage("action.DumpIntentionsAction.text"));
   }
 
   @Override
index 401402aaaff4de1f9638a43369d5cfe71bb9cc2c..0bce2aad4a4e00aa42445cded0b3609c87f796a0 100644 (file)
@@ -35,7 +35,7 @@ import java.util.*;
 @SuppressWarnings("UseOfSystemOutOrSystemErr")
 public class DumpVfsInfoForExcludedFilesAction extends DumbAwareAction {
   public DumpVfsInfoForExcludedFilesAction() {
-    super(() -> ActionsBundle.message("action.DumpVfsInfoForExcludedFilesAction.text"));
+    super(ActionsBundle.lazyMessage("action.DumpVfsInfoForExcludedFilesAction.text"));
   }
 
   @Override
index d6d2ceb7564959edca4bb2d58aebca56aa3fc4e5..108dca6bb6e0e3b4a9be719192f07700819c10ee 100644 (file)
@@ -39,8 +39,8 @@ import java.util.concurrent.atomic.AtomicLong;
 @SuppressWarnings("UseOfSystemOutOrSystemErr")
 public class LoadAllContentsAction extends AnAction implements DumbAware {
   LoadAllContentsAction() {
-    super(() -> IdeBundle.message("action.AnAction.text.load.all.files.content"),
-          () -> IdeBundle.message("action.AnAction.description.load.all.files.content"), null);
+    super(IdeBundle.lazyMessage("action.AnAction.text.load.all.files.content"),
+          IdeBundle.lazyMessage("action.AnAction.description.load.all.files.content"), null);
   }
   private static final Logger LOG = Logger.getInstance(LoadAllContentsAction.class);
 
index 3c63fea3bf45a5514ec0b8a2a9bab35cd8f41a15..b100ec409cdcd8fb7f9d383b341353ca03a65932 100644 (file)
@@ -30,8 +30,8 @@ import java.util.concurrent.atomic.AtomicLong;
 @SuppressWarnings("UseOfSystemOutOrSystemErr")
 public class LoadAllVfsStoredContentsAction extends AnAction implements DumbAware {
   LoadAllVfsStoredContentsAction() {
-    super(() -> IdeBundle.message("action.AnAction.text.load.all.virtual.files.content"),
-          () -> IdeBundle.message("action.AnAction.description.load.all.virtual.files.content"), null);
+    super(IdeBundle.lazyMessage("action.AnAction.text.load.all.virtual.files.content"),
+          IdeBundle.lazyMessage("action.AnAction.description.load.all.virtual.files.content"), null);
   }
   private static final Logger LOG = Logger.getInstance(LoadAllVfsStoredContentsAction.class);
 
index 936bc9eec4a2b98c0dca2b0605a66424138cf1a3..8f2656fe606936e10a06850b62cd30fd2f5f7315 100644 (file)
@@ -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.lazyMessage("goto.custom.region.menu.item"));
     final Editor editor = e.getData(CommonDataKeys.EDITOR);
     final Project project = e.getProject();
     boolean isAvailable = editor != null && project != null;
index ef80abd26e70170bc1a214c956c8242e150d302a..28f2f1d447521aa79e1c3e1ab4d955ddcefe00f1 100644 (file)
@@ -20,7 +20,7 @@ public class FindAllAction extends AnAction implements DumbAware {
 
     getTemplatePresentation().setDescription("Search the whole file from the beginning " +
                                              "and show matching strings in the tool window");
-    getTemplatePresentation().setText(() -> IdeBundle.message("action.presentation.FindAllAction.text"));
+    getTemplatePresentation().setText(IdeBundle.lazyMessage("action.presentation.FindAllAction.text"));
     getTemplatePresentation().setIcon(AllIcons.Actions.FindEntireFile);
   }
 
index 3879aabba9dfecc0a57548a6973f1076007c5232..596c2c5e95b313789743556e7d52b81582870c6c 100644 (file)
@@ -238,7 +238,7 @@ public class ModulesDependenciesPanel extends JPanel implements Disposable {
   private JComponent createNorthPanel() {
     DefaultActionGroup group = new DefaultActionGroup();
 
-    group.add(new AnAction(() -> CommonBundle.message("action.close"), AllIcons.Actions.Cancel) {
+    group.add(new AnAction(CommonBundle.lazyMessage("action.close"), AllIcons.Actions.Cancel) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         DependenciesAnalyzeManager.getInstance(myProject).closeContent(myContent);
index 27125098b88e78e0152d0ff4846c1cbb90a8b9f2..713006c988fbcdd3e3aa5ee03d0ff5dc86d8db73 100644 (file)
@@ -37,8 +37,8 @@ public class ToggleExcludedStateAction extends ContentEntryEditingAction {
     super(tree);
     myEntryTreeEditor = entryEditor;
     final Presentation templatePresentation = getTemplatePresentation();
-    templatePresentation.setText(() -> ProjectBundle.message("module.toggle.excluded.action"));
-    templatePresentation.setDescription(() -> ProjectBundle.message("module.toggle.excluded.action.description"));
+    templatePresentation.setText(ProjectBundle.lazyMessage("module.toggle.excluded.action"));
+    templatePresentation.setDescription(ProjectBundle.lazyMessage("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.lazyMessage("module.toggle.excluded.action"));
   }
 }
index 4c49ed8fdb68d53ae25aec5fcd88086afdc62280..eec413b5ebea3013fa483bd797c5263c84b512af 100644 (file)
@@ -43,7 +43,7 @@ public class ToggleSourcesStateAction<P extends JpsElement> extends ContentEntry
     myEditHandler = editHandler;
     final Presentation templatePresentation = getTemplatePresentation();
     templatePresentation.setText(editHandler.getMarkRootButtonText());
-    templatePresentation.setDescription(() -> ProjectBundle.message("module.toggle.sources.action.description",
+    templatePresentation.setDescription(ProjectBundle.lazyMessage("module.toggle.sources.action.description",
                                                               editHandler.getFullRootTypeName().toLowerCase(Locale.getDefault())));
     templatePresentation.setIcon(editHandler.getRootIcon());
   }
index 29e6f2bef8d8d40bb6ce3b534febf130fb744e04..9094890251bded9b0863aa344cbcabcc4372ac08 100644 (file)
@@ -162,7 +162,7 @@ public class RegistryUi implements Disposable {
     @Override
     public void update(@NotNull AnActionEvent e) {
       e.getPresentation().setEnabled(!myTable.isEditing() && myTable.getSelectedRow() >= 0);
-      e.getPresentation().setText(() -> IdeBundle.message("action.presentation.RegistryUi.text"));
+      e.getPresentation().setText(IdeBundle.lazyMessage("action.presentation.RegistryUi.text"));
       e.getPresentation().setIcon(AllIcons.General.Reset);
 
       if (e.getPresentation().isEnabled()) {
@@ -190,7 +190,7 @@ public class RegistryUi implements Disposable {
     @Override
     public void update(@NotNull AnActionEvent e) {
       e.getPresentation().setEnabled(!myTable.isEditing() && myTable.getSelectedRow() >= 0);
-      e.getPresentation().setText(() -> IdeBundle.message("action.presentation.RegistryUi.text.edit"));
+      e.getPresentation().setText(IdeBundle.lazyMessage("action.presentation.RegistryUi.text.edit"));
       e.getPresentation().setIcon(AllIcons.Actions.EditSource);
     }
 
index 0a44347ebfaaa118aa65225e6a8f06f37381ac7c..9e770467fbead58e2798b15b9108e135fe999a46 100644 (file)
@@ -26,7 +26,7 @@ public class AnalyzeDependenciesOnSpecifiedTargetAction extends AnAction {
   public static final DataKey<GlobalSearchScope> TARGET_SCOPE_KEY = DataKey.create("MODULE_DEPENDENCIES_TARGET_SCOPE");
 
   public AnalyzeDependenciesOnSpecifiedTargetAction() {
-    super(() -> ActionsBundle.message("action.AnalyzeDependenciesOnSpecifiedTargetAction.text"));
+    super(ActionsBundle.lazyMessage("action.AnalyzeDependenciesOnSpecifiedTargetAction.text"));
   }
 
   @Override
index 1c0400992d990b0a9a166959dd5fd24ad17b9613..9e6ea70641e4512769858d263ace5ab195ae4fb8 100644 (file)
@@ -486,7 +486,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
 
   private final class CloseAction extends AnAction implements DumbAware {
     CloseAction() {
-      super(() -> CommonBundle.message("action.close"), () -> AnalysisScopeBundle.message("action.close.dependency.description"),
+      super(CommonBundle.lazyMessage("action.close"), AnalysisScopeBundle.lazyMessage("action.close.dependency.description"),
             AllIcons.Actions.Cancel);
     }
 
@@ -500,7 +500,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
 
   private final class FlattenPackagesAction extends ToggleAction {
     FlattenPackagesAction() {
-      super(() -> AnalysisScopeBundle.message("action.flatten.packages"), () -> AnalysisScopeBundle.message("action.flatten.packages"),
+      super(AnalysisScopeBundle.lazyMessage("action.flatten.packages"), AnalysisScopeBundle.lazyMessage("action.flatten.packages"),
             PlatformIcons.FLATTEN_PACKAGES_ICON);
     }
 
@@ -519,7 +519,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
 
   private final class ShowFilesAction extends ToggleAction {
     ShowFilesAction() {
-      super(() -> AnalysisScopeBundle.message("action.show.files"), () -> AnalysisScopeBundle.message("action.show.files.description"),
+      super(AnalysisScopeBundle.lazyMessage("action.show.files"), AnalysisScopeBundle.lazyMessage("action.show.files.description"),
             AllIcons.FileTypes.Unknown);
     }
 
@@ -541,7 +541,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
 
   private final class ShowModulesAction extends ToggleAction {
     ShowModulesAction() {
-      super(() -> AnalysisScopeBundle.message("action.show.modules"), () -> AnalysisScopeBundle.message("action.show.modules.description"),
+      super(AnalysisScopeBundle.lazyMessage("action.show.modules"), AnalysisScopeBundle.lazyMessage("action.show.modules.description"),
             AllIcons.Actions.GroupByModule);
     }
 
@@ -585,8 +585,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
 
   private final class GroupByScopeTypeAction extends ToggleAction {
     GroupByScopeTypeAction() {
-      super(() -> AnalysisScopeBundle.message("action.group.by.scope.type"),
-            () -> AnalysisScopeBundle.message("action.group.by.scope.type.description"), AllIcons.Actions.GroupByTestProduction);
+      super(AnalysisScopeBundle.lazyMessage("action.group.by.scope.type"),
+            AnalysisScopeBundle.lazyMessage("action.group.by.scope.type.description"), AllIcons.Actions.GroupByTestProduction);
     }
 
     @Override
@@ -605,8 +605,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
 
   private final class FilterLegalsAction extends ToggleAction {
     FilterLegalsAction() {
-      super(() -> AnalysisScopeBundle.message("action.show.illegals.only"),
-            () -> AnalysisScopeBundle.message("action.show.illegals.only.description"), AllIcons.General.Filter);
+      super(AnalysisScopeBundle.lazyMessage("action.show.illegals.only"),
+            AnalysisScopeBundle.lazyMessage("action.show.illegals.only.description"), AllIcons.General.Filter);
     }
 
     @Override
@@ -631,7 +631,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
 
   private final class EditDependencyRulesAction extends AnAction {
     EditDependencyRulesAction() {
-      super(() -> AnalysisScopeBundle.message("action.edit.rules"), () -> AnalysisScopeBundle.message("action.edit.rules.description"),
+      super(AnalysisScopeBundle.lazyMessage("action.edit.rules"), AnalysisScopeBundle.lazyMessage("action.edit.rules.description"),
             AllIcons.General.Settings);
     }
 
@@ -752,7 +752,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
 
   private class ShowDetailedInformationAction extends AnAction {
     private ShowDetailedInformationAction() {
-      super(() -> ActionsBundle.message("action.ShowDetailedInformationAction.text"));
+      super(ActionsBundle.lazyMessage("action.ShowDetailedInformationAction.text"));
     }
 
     @Override
@@ -789,7 +789,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
 
   private class RemoveFromScopeAction extends AnAction {
     private RemoveFromScopeAction() {
-      super(() -> ActionsBundle.message("action.RemoveFromScopeAction.text"));
+      super(ActionsBundle.lazyMessage("action.RemoveFromScopeAction.text"));
     }
 
     @Override
@@ -812,7 +812,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
 
   private class AddToScopeAction extends AnAction {
     private AddToScopeAction() {
-      super(() -> ActionsBundle.message("action.AddToScopeAction.text"));
+      super(ActionsBundle.lazyMessage("action.AddToScopeAction.text"));
     }
 
     @Override
@@ -865,8 +865,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
 
   private class SelectInLeftTreeAction extends AnAction {
     SelectInLeftTreeAction() {
-      super(() -> AnalysisScopeBundle.message("action.select.in.left.tree"),
-            () -> AnalysisScopeBundle.message("action.select.in.left.tree.description"), null);
+      super(AnalysisScopeBundle.lazyMessage("action.select.in.left.tree"),
+            AnalysisScopeBundle.lazyMessage("action.select.in.left.tree.description"), null);
     }
 
     @Override
@@ -906,8 +906,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
 
   private class MarkAsIllegalAction extends AnAction {
     MarkAsIllegalAction() {
-      super(() -> AnalysisScopeBundle.message("mark.dependency.illegal.text"),
-            () -> AnalysisScopeBundle.message("mark.dependency.illegal.text"), AllIcons.Actions.Lightning);
+      super(AnalysisScopeBundle.lazyMessage("mark.dependency.illegal.text"),
+            AnalysisScopeBundle.lazyMessage("mark.dependency.illegal.text"), AllIcons.Actions.Lightning);
     }
 
     @Override
index e3cc6b75e4535216aa93c4379cb2c6ea029aedc2..b498c2de3889008fe9d3d372c9d22cc712f72e6b 100644 (file)
@@ -20,8 +20,8 @@ import org.jetbrains.annotations.NotNull;
 public class RenameProjectAction extends DumbAwareAction {
 
   public RenameProjectAction() {
-    super(() -> RefactoringBundle.message("rename.project.action.title"),
-          () -> RefactoringBundle.message("renames.project"), null);
+    super(RefactoringBundle.lazyMessage("rename.project.action.title"),
+          RefactoringBundle.lazyMessage("renames.project"), null);
   }
 
   private static final Logger LOG = Logger.getInstance(RenameProjectAction.class);
index b2945c55c3fb952cd329924c1dbb5098dfddbd54..a6c8483a2f93d9715b881d8c87047cd8c1acbf00 100644 (file)
@@ -46,7 +46,7 @@ public abstract class ScopesChooser extends ComboBoxAction implements DumbAware
     myProject = project;
     myExcludedScopeNames = excludedScopeNames == null ? Collections.emptySet() : ContainerUtil.newHashSet(excludedScopeNames);
     setPopupTitle(TITLE);
-    getTemplatePresentation().setText(() -> InspectionsBundle.message("action.presentation.ScopesChooser.text"));
+    getTemplatePresentation().setText(InspectionsBundle.lazyMessage("action.presentation.ScopesChooser.text"));
   }
 
   @NotNull
@@ -73,7 +73,7 @@ public abstract class ScopesChooser extends ComboBoxAction implements DumbAware
     fillActionGroup(group, customScopes, myDefaultDescriptors, myInspectionProfile, myExcludedScopeNames);
 
     group.addSeparator();
-    group.add(new DumbAwareAction(() -> IdeBundle.message("action.Anonymous.text.edit.scopes.order")) {
+    group.add(new DumbAwareAction(IdeBundle.lazyMessage("action.Anonymous.text.edit.scopes.order")) {
       @Override
       public void actionPerformed(@NotNull final AnActionEvent e) {
         final ScopesOrderDialog dlg = new ScopesOrderDialog(component, myInspectionProfile, myProject);
index 5f860a6ed5dd7925888dc465b8bb3ef66e3e4ff5..c0724b05394a42860e689934adc257618a35463d 100644 (file)
@@ -56,7 +56,7 @@ public class ScopesOrderDialog extends DialogWrapper {
       public void run(AnActionButton anActionButton) {
         ListUtil.moveSelectedItemsUp(myOptionsList);
       }
-    }).addExtraAction(new AnActionButton(() -> CodeInsightBundle.message("action.AnActionButton.text.edit.scopes"), AllIcons.Actions.Edit) {
+    }).addExtraAction(new AnActionButton(CodeInsightBundle.lazyMessage("action.AnActionButton.text.edit.scopes"), AllIcons.Actions.Edit) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         ShowSettingsUtil.getInstance().editConfigurable(project, new ScopeChooserConfigurable(project));
index 7c755e48cdb755eeeeee87b56086cc9933058326..1e32787e757ed40ad9639ec55909a1360b87596b 100644 (file)
@@ -446,8 +446,8 @@ public class SingleInspectionProfilePanel extends JPanel {
     actions.add(actionManager.createExpandAllAction(myTreeExpander, myTreeTable));
     actions.add(actionManager.createCollapseAllAction(myTreeExpander, myTreeTable));
     actions.add(new DumbAwareAction(
-      () -> InspectionsBundle.message("action.DumbAware.SingleInspectionProfilePanel.text.reset.to.empty"),
-      () -> InspectionsBundle.message("action.DumbAware.SingleInspectionProfilePanel.description.reset.to.empty"),
+      InspectionsBundle.lazyMessage("action.DumbAware.SingleInspectionProfilePanel.text.reset.to.empty"),
+      InspectionsBundle.lazyMessage("action.DumbAware.SingleInspectionProfilePanel.description.reset.to.empty"),
       AllIcons.Actions.Unselectall) {
       @Override
       public void update(@NotNull AnActionEvent e) {
index 41936d991d7c212856df59385de6eadbd2cd924a..061d6e04a1f704e6deae6f5b9d61d17f70d07d9f 100644 (file)
@@ -111,7 +111,7 @@ public class InspectionFilterAction extends DefaultActionGroup implements Toggle
 
   private class ResetFilterAction extends DumbAwareAction {
     ResetFilterAction() {
-      super(() -> ActionsBundle.message("action.ResetFilterAction.text"));
+      super(ActionsBundle.lazyMessage("action.ResetFilterAction.text"));
     }
 
     @Override
index 77f4ce29f043f8c79ddda6dea9536fddac8360ca..f13d2ac9a52f6fcac597e78b9ed45cf4af148903 100644 (file)
@@ -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.lazyMessage("quickfix.change.template.data.language.text", viewProvider.getTemplateDataLanguage().getDisplayName()));
       e.getPresentation().setEnabledAndVisible(true);
     }
 
index 34251accb2b606f55970fefd4558ac6eaef3cfed..bd8ab4cb6ab43b6fadc87c22f9f62cc8eef3483b 100644 (file)
@@ -39,7 +39,7 @@ public class ExtractIncludeAction extends BasePlatformRefactoringAction {
       e.getPresentation().setText(((TitledHandler) handler).getActionTitle());
     }
     else {
-      e.getPresentation().setText(() -> IdeBundle.message("action.presentation.ExtractIncludeAction.text"));
+      e.getPresentation().setText(IdeBundle.lazyMessage("action.presentation.ExtractIncludeAction.text"));
     }
   }
 
index bfd97e5f7a533d068449f8f18eb2ed8171ff31d4..823592bc547eac0dc29f9cae269e9e1695206b70 100644 (file)
@@ -43,11 +43,11 @@ public class GotoTestOrCodeAction extends BaseCodeInsightAction {
 
     presentation.setEnabledAndVisible(true);
     if (TestFinderHelper.isTest(element)) {
-      presentation.setText(() -> ActionsBundle.message("action.GotoTestSubject.text"));
-      presentation.setDescription(() -> ActionsBundle.message("action.GotoTestSubject.description"));
+      presentation.setText(ActionsBundle.lazyMessage("action.GotoTestSubject.text"));
+      presentation.setDescription(ActionsBundle.lazyMessage("action.GotoTestSubject.description"));
     } else {
-      presentation.setText(() -> ActionsBundle.message("action.GotoTest.text"));
-      presentation.setDescription(() -> ActionsBundle.message("action.GotoTest.description"));
+      presentation.setText(ActionsBundle.lazyMessage("action.GotoTest.text"));
+      presentation.setDescription(ActionsBundle.lazyMessage("action.GotoTest.description"));
     }
   }
 }
index f4f5cd0c33990432b3844ceeec764ca294e6ae77..3989076354b6df2f251b1e0136d8eb94ffb68618 100644 (file)
@@ -27,7 +27,7 @@ public class ShowUiDebuggerAction extends DumbAwareAction {
 
   @Override
   public void update(@NotNull AnActionEvent e) {
-    e.getPresentation().setText(() -> IdeBundle.message("action.presentation.ShowUiDebuggerAction.text"));
+    e.getPresentation().setText(IdeBundle.lazyMessage("action.presentation.ShowUiDebuggerAction.text"));
   }
 
   @Override
index 3328c95399ad01758d86bfb021d1fe51c8a66acc..2c37b0bcf02c67fd2c1ccfbabaf3a20c3450ce89 100644 (file)
@@ -32,8 +32,8 @@ public class ActionTracer implements UiDebuggerExtension, AnActionListener {
     if (myComponent == null) {
       myText = new JTextArea();
       final JBScrollPane log = new JBScrollPane(myText);
-      final AnAction clear = new AnAction(() -> IdeBundle.message("action.ActionTracer.Anonymous.text.Clear"),
-                                          () -> IdeBundle.message("action.ActionTracer.Anonymous.description.clear.log"),
+      final AnAction clear = new AnAction(IdeBundle.lazyMessage("action.ActionTracer.Anonymous.text.Clear"),
+                                          IdeBundle.lazyMessage("action.ActionTracer.Anonymous.description.clear.log"),
                                           AllIcons.General.Reset) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
index b80467d6bc4f119c9aed3b7a00c397702aea9429..a679897e1aaa656dddb7a1febafc355d490d4e26 100644 (file)
@@ -98,8 +98,8 @@ public class FocusDebugger implements UiDebuggerExtension, PropertyChangeListene
 
   class ClearAction extends AnAction {
   ClearAction() {
-    super(() -> IdeBundle.message("action.AnAction.text.clear"),
-          () -> IdeBundle.message("action.AnAction.description.clear"), AllIcons.Actions.Close);
+    super(IdeBundle.lazyMessage("action.AnAction.text.clear"),
+          IdeBundle.lazyMessage("action.AnAction.description.clear"), AllIcons.Actions.Close);
   }
 
     @Override
index 9ac56cb9782416fea268c25268eb8b7bad6a8987..5eeec89eb98bdf2efdf09bfb6b94847e983913cd 100644 (file)
@@ -157,8 +157,8 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta
 
   private class SaveAction extends AnAction {
   SaveAction() {
-    super(() -> IdeBundle.message("action.AnAction.text.save"),
-          () -> IdeBundle.message("action.AnAction.description.save"), AllIcons.Actions.Menu_saveall);
+    super(IdeBundle.lazyMessage("action.AnAction.text.save"),
+          IdeBundle.lazyMessage("action.AnAction.description.save"), AllIcons.Actions.Menu_saveall);
   }
 
     @Override
@@ -200,8 +200,8 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta
 
   private class SetScriptFileAction extends AnAction {
   SetScriptFileAction() {
-    super(() -> IdeBundle.message("action.AnAction.text.set.script.file"),
-          () -> IdeBundle.message("action.AnAction.description.set.script.file"), AllIcons.Actions.Menu_open);
+    super(IdeBundle.lazyMessage("action.AnAction.text.set.script.file"),
+          IdeBundle.lazyMessage("action.AnAction.description.set.script.file"), AllIcons.Actions.Menu_open);
   }
 
     @Override
@@ -217,8 +217,8 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta
 
   private class NewScriptAction extends AnAction {
   NewScriptAction() {
-    super(() -> IdeBundle.message("action.AnAction.text.new.script"),
-          () -> IdeBundle.message("action.AnAction.description.new.script"), AllIcons.Actions.New);
+    super(IdeBundle.lazyMessage("action.AnAction.text.new.script"),
+          IdeBundle.lazyMessage("action.AnAction.description.new.script"), AllIcons.Actions.New);
   }
 
     @Override
@@ -270,8 +270,8 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta
 
   private class StopAction extends AnAction {
   StopAction() {
-    super(() -> IdeBundle.message("action.AnAction.text.stop"),
-          () -> IdeBundle.message("action.AnAction.description.stop"), AllIcons.Actions.Suspend);
+    super(IdeBundle.lazyMessage("action.AnAction.text.stop"),
+          IdeBundle.lazyMessage("action.AnAction.description.stop"), AllIcons.Actions.Suspend);
   }
 
     @Override
@@ -290,8 +290,8 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta
 
   private class ActivateFrameAndRun extends AnAction {
   ActivateFrameAndRun() {
-    super(() -> IdeBundle.message("action.AnAction.text.activate.frame.and.run"),
-          () -> IdeBundle.message("action.AnAction.description.activate.frame.and.run"), AllIcons.Nodes.Deploy);
+    super(IdeBundle.lazyMessage("action.AnAction.text.activate.frame.and.run"),
+          IdeBundle.lazyMessage("action.AnAction.description.activate.frame.and.run"), AllIcons.Nodes.Deploy);
   }
 
     @Override
@@ -307,8 +307,8 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta
 
   private class RunOnFameActivationAction extends AnAction {
   RunOnFameActivationAction() {
-    super(() -> IdeBundle.message("action.AnAction.text.run.on.frame.activation"),
-          () -> IdeBundle.message("action.AnAction.description.run.on.frame.activation"), AllIcons.RunConfigurations.TestState.Run);
+    super(IdeBundle.lazyMessage("action.AnAction.text.run.on.frame.activation"),
+          IdeBundle.lazyMessage("action.AnAction.description.run.on.frame.activation"), AllIcons.RunConfigurations.TestState.Run);
   }
 
     @Override
index 25ddd9b8fd0c438c5646a4b2827a69a1836a6119..de1f6143914afd944f40fc228b40e25a1f60b8e1 100644 (file)
@@ -277,7 +277,7 @@ public class MasterDetailPopupBuilder implements MasterController {
     });
 
     if (myDoneRunnable != null) {
-      new AnAction(() -> IdeBundle.message("action.Anonymous.text.done")) {
+      new AnAction(IdeBundle.lazyMessage("action.Anonymous.text.done")) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
           myDoneRunnable.run();
index c06a048fb0439558482da801bb933e2d144cfb6d..1c05e535cb32c95d2702a7e35ccff27f2fdb08d1 100644 (file)
@@ -81,7 +81,7 @@ public class FileColorsConfigurablePanel extends JPanel implements Disposable {
     };
 
     final JPanel panel = ToolbarDecorator.createDecorator(myLocalTable)
-      .addExtraAction(new AnActionButton(() -> IdeBundle.message("action.AnActionButton.text.share"), AllIcons.Actions.Share) {
+      .addExtraAction(new AnActionButton(IdeBundle.lazyMessage("action.AnActionButton.text.share"), AllIcons.Actions.Share) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
           share();
@@ -117,7 +117,7 @@ public class FileColorsConfigurablePanel extends JPanel implements Disposable {
     final JPanel sharedPanel = new JPanel(new BorderLayout());
     sharedPanel.setBorder(IdeBorderFactory.createTitledBorder(CodeEditorBundle.message("file.colors.shared.colors"), false, JBUI.insetsTop(8)).setShowLine(false));
     final JPanel shared = ToolbarDecorator.createDecorator(mySharedTable)
-      .addExtraAction(new AnActionButton(() -> IdeBundle.message("action.AnActionButton.text.unshare"), AllIcons.Actions.Unshare) {
+      .addExtraAction(new AnActionButton(IdeBundle.lazyMessage("action.AnActionButton.text.unshare"), AllIcons.Actions.Unshare) {
         @Override
         public void actionPerformed(@NotNull AnActionEvent e) {
           unshare();
index 0aba0abd9479e2cbb73f54b961be6f2a89355e11..9a781578790403623d2cfbb3ef903ea1a532d817 100644 (file)
@@ -84,14 +84,14 @@ public class InstalledPackagesPanel extends JPanel {
     myPackagesTable.getTableHeader().setReorderingAllowed(false);
     new TableSpeedSearch(myPackagesTable);
 
-    myUpgradeButton = new DumbAwareActionButton(() -> IdeBundle.message("action.AnActionButton.text.upgrade"), IconUtil.getMoveUpIcon()) {
+    myUpgradeButton = new DumbAwareActionButton(IdeBundle.lazyMessage("action.AnActionButton.text.upgrade"), IconUtil.getMoveUpIcon()) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         PackageManagementUsageCollector.triggerUpgradePerformed(myProject, myPackageManagementService);
         upgradeAction();
       }
     };
-    myInstallButton = new DumbAwareActionButton(() -> IdeBundle.message("action.AnActionButton.text.install"), IconUtil.getAddIcon()) {
+    myInstallButton = new DumbAwareActionButton(IdeBundle.lazyMessage("action.AnActionButton.text.install"), IconUtil.getAddIcon()) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         PackageManagementUsageCollector.triggerBrowseAvailablePackagesPerformed(myProject, myPackageManagementService);
@@ -102,7 +102,7 @@ public class InstalledPackagesPanel extends JPanel {
       }
     };
     myInstallButton.setShortcut(CommonShortcuts.getNew());
-    myUninstallButton = new DumbAwareActionButton(() -> IdeBundle.message("action.AnActionButton.text.uninstall"), IconUtil.getRemoveIcon()) {
+    myUninstallButton = new DumbAwareActionButton(IdeBundle.lazyMessage("action.AnActionButton.text.uninstall"), IconUtil.getRemoveIcon()) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         PackageManagementUsageCollector.triggerUninstallPerformed(myProject, myPackageManagementService);
index 2deb3c113d35fcdf28c930d5874e067d36eff2d2..b55a39fcfcc5b420a081902a5f69463dd5a2565d 100644 (file)
@@ -87,7 +87,7 @@ public class ManagePackagesDialog extends DialogWrapper {
     myNotificationsAreaPlaceholder.add(myNotificationArea.getComponent(), BorderLayout.CENTER);
 
     final AnActionButton reloadButton =
-      new AnActionButton(() -> IdeBundle.message("action.AnActionButton.text.reload.list.of.packages"), AllIcons.Actions.Refresh) {
+      new AnActionButton(IdeBundle.lazyMessage("action.AnActionButton.text.reload.list.of.packages"), AllIcons.Actions.Refresh) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         myPackages.setPaintBusy(true);
index ac1ed0e3f1cf56b37958f89aab8b1543910531e0..f4773cb7875c7488ae1cfcf2df6e54b1736265c8 100644 (file)
@@ -768,7 +768,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom
     }
 
     public MyDeleteAction(Condition<Object[]> availableCondition) {
-      super(() -> CommonBundle.message("button.delete"), () -> CommonBundle.message("button.delete"), PlatformIcons.DELETE_ICON);
+      super(CommonBundle.lazyMessage("button.delete"), CommonBundle.lazyMessage("button.delete"), PlatformIcons.DELETE_ICON);
       registerCustomShortcutSet(CommonActionsPanel.getCommonShortcut(CommonActionsPanel.Buttons.REMOVE), myTree);
       myCondition = availableCondition;
     }
index 918f0f9a00cad8da63896a218c697e4e17317852..3511c1c29a70301937f1bef8c525a5e1728f48c6 100644 (file)
@@ -270,8 +270,8 @@ public abstract class NamedItemsListEditor<T> extends MasterDetailsComponent {
 
   private class CopyAction extends DumbAwareAction {
     CopyAction() {
-      super(() -> IdeBundle.message("action.NamedItemsListEditor.CopyAction.text.copy"),
-            () -> IdeBundle.message("action.NamedItemsListEditor.CopyAction.description.copy"), MasterDetailsComponent.COPY_ICON);
+      super(IdeBundle.lazyMessage("action.NamedItemsListEditor.CopyAction.text.copy"),
+            IdeBundle.lazyMessage("action.NamedItemsListEditor.CopyAction.description.copy"), MasterDetailsComponent.COPY_ICON);
       registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK)), myTree);
     }
 
@@ -300,8 +300,8 @@ public abstract class NamedItemsListEditor<T> extends MasterDetailsComponent {
 
   private class AddAction extends DumbAwareAction {
     AddAction() {
-      super(() -> IdeBundle.message("action.NamedItemsListEditor.AddAction.text.add"),
-            () -> IdeBundle.message("action.NamedItemsListEditor.AddAction.description.add"), IconUtil.getAddIcon());
+      super(IdeBundle.lazyMessage("action.NamedItemsListEditor.AddAction.text.add"),
+            IdeBundle.lazyMessage("action.NamedItemsListEditor.AddAction.description.add"), IconUtil.getAddIcon());
       registerCustomShortcutSet(CommonShortcuts.INSERT, myTree);
     }
 
index a9d526aae11462eb0a79dc06533538ab422e834e..c239a6ff53f2b5f6358b893eb247d2c79e5541d9 100644 (file)
@@ -179,7 +179,7 @@ public class CommonActionsPanel extends JPanel {
   }
 
   private static void registerDeleteHook(final MyActionButton removeButton) {
-    new AnAction(() -> IdeBundle.message("action.Anonymous.text.delete.hook")) {
+    new AnAction(IdeBundle.lazyMessage("action.Anonymous.text.delete.hook")) {
       @Override
       public void actionPerformed(@NotNull AnActionEvent e) {
         removeButton.actionPerformed(e);
index 830acd32809680538336b6cc591bd21175d331ca..a5b7941e95f7673b4fc5c521a60e8c3be4f1fe1e 100644 (file)
@@ -45,7 +45,7 @@ public class InsertPathAction extends AnAction {
   protected static final Key INSERT_PATH_ACTION= Key.create("insertPathAction");
 
   private InsertPathAction(JTextComponent textField, FileChooserDescriptor descriptor, boolean insertSystemDependentPaths) {
-    super(() -> UIBundle.message("insert.file.path.to.text.action.name"));
+    super(UIBundle.lazyMessage("insert.file.path.to.text.action.name"));
     myTextField = textField;
     myInsertSystemDependentPaths = insertSystemDependentPaths;
     registerCustomShortcutSet(CTRL_F, myTextField);
index dac6a4e09659972193d3ffea89afde2ead5c7fd6..705b82d16ebf2ec57e2c2d8110a264e30a7270fd 100644 (file)
@@ -46,7 +46,7 @@ public abstract class ReorderableListController <T> {
   }
 
   public void addMoveUpAction() {
-    addAction(new AnAction(() -> UIBundle.message("move.up.action.name"), Presentation.NULL_STRING, IconUtil.getMoveUpIcon()) {
+    addAction(new AnAction(UIBundle.lazyMessage("move.up.action.name"), Presentation.NULL_STRING, IconUtil.getMoveUpIcon()) {
       @Override
       public void actionPerformed(@NotNull final AnActionEvent e) {
         ListUtil.moveSelectedItemsUp(myList);
@@ -60,7 +60,7 @@ public abstract class ReorderableListController <T> {
   }
 
   public void addMoveDownAction() {
-    addAction(new AnAction(() -> UIBundle.message("move.down.action.name"), Presentation.NULL_STRING, AllIcons.Actions.MoveDown) {
+    addAction(new AnAction(UIBundle.lazyMessage("move.down.action.name"), Presentation.NULL_STRING, AllIcons.Actions.MoveDown) {
       @Override
       public void actionPerformed(@NotNull final AnActionEvent e) {
         ListUtil.moveSelectedItemsDown(myList);
index 875fb964de8a8d1476ffbfd5f31cf804f030bd2b..34b1091ea1edc5678ee4bad5e32ee513781122da 100644 (file)
@@ -30,7 +30,7 @@ public class CollapseAllAction extends AnAction implements DumbAware {
   protected JTree myTree;
 
   public CollapseAllAction(JTree tree) {
-    super(() -> IdeBundle.message("action.CollapseAllAction.text.collapse.all"), () -> "", AllIcons.Actions.Collapseall);
+    super(IdeBundle.lazyMessage("action.CollapseAllAction.text.collapse.all"), () -> "", AllIcons.Actions.Collapseall);
     myTree = tree;
   }
 
index 83a819c4adc1e32bd18996a00dd015f0c4e2fc8f..e1665a263a50f585a3df8c419e13fb333e4c9582 100644 (file)
@@ -30,7 +30,7 @@ public class ExpandAllAction extends AnAction implements DumbAware {
   protected JTree myTree;
 
   public ExpandAllAction(JTree tree) {
-    super(() -> IdeBundle.message("action.ExpandAllAction.text.expand.all"), () -> "", AllIcons.Actions.Expandall);
+    super(IdeBundle.lazyMessage("action.ExpandAllAction.text.expand.all"), () -> "", AllIcons.Actions.Expandall);
     myTree = tree;
   }
 
index 415cf77d83d128c7ba486e79d4d6405ff2a21300..3d676526b4c56feecf61c9b94247d474e8623f38 100644 (file)
@@ -219,7 +219,7 @@ public abstract class AbstractSchemeActions<T extends Scheme> {
   
   private class RenameAction extends DumbAwareAction {
     RenameAction() {
-      super(() -> ActionsBundle.message("action.RenameAction.text"));
+      super(ActionsBundle.lazyMessage("action.RenameAction.text"));
     }
 
     @Override
index d4faf884d4b130d5363b13e8482648d29051870d..47687a6eb7dd5db111c717f524d1369a0742880d 100644 (file)
@@ -294,8 +294,8 @@ public abstract class AbstractSchemesPanel<T extends Scheme, InfoComponent exten
     ShowSchemesActionsListAction(@NotNull Collection<? extends AnAction> actions) {
       setPopup(true);
       getTemplatePresentation().setIcon(AllIcons.General.GearPlain);
-      getTemplatePresentation().setText(() -> IdeBundle.message("action.presentation.AbstractSchemesPanel.text"));
-      getTemplatePresentation().setDescription(() -> IdeBundle.message("action.presentation.AbstractSchemesPanel.description"));
+      getTemplatePresentation().setText(IdeBundle.lazyMessage("action.presentation.AbstractSchemesPanel.text"));
+      getTemplatePresentation().setDescription(IdeBundle.lazyMessage("action.presentation.AbstractSchemesPanel.description"));
       addAll(actions);
     }
 
index df1aca99476e4cc8e916e84904e58e889c9950e8..bcab3e2dd31b8ad819a6704cc943fc62322ba828 100644 (file)
@@ -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.lazyMessage("tool.window.hide.action.name"));
       presentation.setIcon(AllIcons.General.HideToolWindow);
     }
 
index fd856b4de68bdfaad90e04d6683cf1675bca6173..3d3b6f90f2e8076b77381361e143bd7cbea318c2 100644 (file)
@@ -74,7 +74,7 @@ final class SystemHealthMonitor extends PreloadingActivity {
           (bundledJdk = JdkBundle.createBundled()) != null &&
           bundledJdk.isOperational();
 
-        NotificationAction switchAction = new NotificationAction(() -> IdeBundle.message("action.Anonymous.text.switch")) {
+        NotificationAction switchAction = new NotificationAction(IdeBundle.lazyMessage("action.Anonymous.text.switch")) {
           @Override
           public void actionPerformed(@NotNull AnActionEvent e, @NotNull Notification notification) {
             notification.expire();
index cc93330334b737884ac663fbab59d13598be25a0..1c25e3d480cb06ddfb9202898016ecc289fdf861 100644 (file)
@@ -86,7 +86,7 @@ public class ActivateToolWindowAction extends DumbAwareAction {
   private void updatePresentation(@NotNull Presentation presentation, @NotNull ToolWindow toolWindow) {
     String title = toolWindow.getStripeTitle();
     presentation.setText(title);
-    presentation.setDescription(() -> IdeBundle.message("action.activate.tool.window", title));
+    presentation.setDescription(IdeBundle.lazyMessage("action.activate.tool.window", title));
     Icon icon = toolWindow.getIcon();
     if (EventLog.LOG_TOOL_WINDOW_ID.equals(myToolWindowId)) {
       icon = AllIcons.Ide.Notification.InfoEvents;
index 69f6f333e6589b82b6d97a24939026f1a60d290b..ee9162822cc7452325aae170fa6711f1e582bf01 100644 (file)
@@ -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.lazyMessage("action.close.all.editors.in.tab.group"));
     }
     else {
-      presentation.setText(() -> IdeBundle.message("action.close.all.editors"));
+      presentation.setText(IdeBundle.lazyMessage("action.close.all.editors"));
     }
     Project project = event.getData(CommonDataKeys.PROJECT);
     if (project == null) {
index c9a2cedfb7a5935ada328bd3d1286e36522efcfa..e4a010b9a98dd99886418a5bb865cae6f2940d07 100644 (file)
@@ -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.lazyMessage(getAlternativeTextKey()));
     }
   }
 
index 063596e3051c42de958d7fe384de8430c7c1b795..2391c2816b98586500ac577852796851b1ab253e 100644 (file)
@@ -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.lazyMessage("action.close.projects.in.current.window"));
     }
     else {
       presentation.setText(IdeUICustomization.getInstance().getCloseProjectActionText());
index e2ff2205075812089075f29decb36f2390ebc499..8843daa7f826fc5f299a82f94fbcff42dbc91a05 100644 (file)
@@ -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.lazyMessage(num == 1 ? "action.copy.path" : "action.copy.paths"));
   }
 
   public static boolean isCopyReferencePopupAvailable() {
index b9e39418c0ba8252bdb82accc451e5cbc536cf51..90384730ca1be40e94f7e8bbdddb2e74b30f9b94 100644 (file)
@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class CustomizeUIAction extends AnAction {
   public CustomizeUIAction() {
-    super(() -> ActionsBundle.message("action.CustomizeUIAction.text"));
+    super(ActionsBundle.lazyMessage("action.CustomizeUIAction.text"));
   }
 
   @Override
index b33c7fd5f3825d40f83f4a34aa87cc222d3f9bfc..1c616ab519f1c890076af7fa3de0a3a280b0095f 100644 (file)
@@ -12,8 +12,8 @@ import org.jetbrains.annotations.NotNull;
 
 public class DataSharingOptionsAction extends DumbAwareAction {
   public DataSharingOptionsAction() {
-    super(() -> IdeBundle.message("action.DataSharingOptionsAction.text"),
-          () -> IdeBundle.message("action.DataSharingOptionsAction.description"), null);
+    super(IdeBundle.lazyMessage("action.DataSharingOptionsAction.text"),
+          IdeBundle.lazyMessage("action.DataSharingOptionsAction.description"), null);
   }
 
   @Override
index b9286a59f112d41c9e4007c988a1405aa3006c4a..57a0b8bd0505b4342e09c596d0cd41b41bd950e4 100644 (file)
@@ -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.lazyMessage("action.delete.ellipsis"));
     }
     else {
-      presentation.setText(() -> IdeBundle.message("action.delete"));
+      presentation.setText(IdeBundle.lazyMessage("action.delete"));
     }
     if (e.isFromActionToolbar() && e.getPresentation().getIcon() == null) {
       e.getPresentation().setIcon(IconUtil.getRemoveIcon());