From 9c1286d2d201b904fcf00d2dafa13697036b4dcb Mon Sep 17 00:00:00 2001 From: "Dmitry.Krasilschikov" Date: Sun, 22 Mar 2020 20:18:38 +0200 Subject: [PATCH] IDEA-235533 more @DialogTitle annotations GitOrigin-RevId: 8b0df8105ea7efc46b9d7768a2fcdff6b51b3754 --- .../newProjectWizard/AbstractProjectWizard.java | 8 +++----- .../src/ChooseComponentsToExportDialog.kt | 7 ++++++- .../openapi/diff/impl/dir/DirDiffWindow.java | 6 ++++-- .../com/intellij/execution/impl/RunDialog.java | 9 +++++++-- .../ui/SelectExternalSystemNodeDialog.java | 4 +++- .../src/com/intellij/find/FindManager.java | 8 ++++++-- .../actions/LayoutProjectCodeDialog.java | 7 +++++-- .../com/intellij/find/impl/FindManagerImpl.java | 4 +++- .../ide/actions/CreateFileFromTemplateDialog.java | 3 ++- .../ide/util/AbstractTreeClassChooserDialog.java | 10 ++++++---- .../intellij/ide/util/TreeFileChooserDialog.java | 4 +++- .../openapi/fileTypes/impl/TypeEditor.java | 4 +++- .../module/impl/RemoveInvalidElementsDialog.java | 6 ++++-- .../changeSignature/CallerChooserBase.java | 3 ++- .../memberPullUp/PullUpDialogBase.java | 8 +++++++- .../src/com/intellij/ui/ReplacePromptDialog.java | 6 ++++-- .../com/intellij/ide/wizard/AbstractWizard.java | 6 ++++-- .../com/intellij/openapi/ui/DialogBuilder.java | 6 ++++-- .../com/intellij/openapi/ui/DialogWrapper.java | 1 + .../intellij/openapi/ui/SelectFromListDialog.java | 4 +++- .../openapi/ui/popup/ComponentPopupBuilder.java | 4 +++- .../src/com/intellij/ui/AbstractFieldPanel.java | 4 +++- .../intellij/util/net/AuthenticationDialog.java | 9 ++++++++- .../com/intellij/util/net/IOExceptionDialog.java | 5 ++++- .../util/net/ssl/CertificateWarningDialog.java | 7 ++++++- .../intellij/util/ui/OptionsMessageDialog.java | 7 +++++-- .../intellij/ide/util/ChooseElementsDialog.java | 13 ++++++++----- .../openapi/editor/actions/ContentChooser.java | 6 ++++-- .../src/com/intellij/ui/ColorPicker.java | 10 ++++++++-- .../src/com/intellij/ui/components/components.kt | 3 ++- .../plugin/ui/StructuralSearchDialog.java | 4 ++++ .../intellij/openapi/vcs/AbstractVcsHelper.java | 15 ++++++++------- .../openapi/vcs/merge/MergeDialogCustomizer.kt | 4 ++-- .../vcs/FilesProcessorWithNotificationImpl.kt | 9 ++++++--- .../vcs/changes/SpecificFilesViewDialog.java | 4 +++- .../vcs/changes/VcsConfirmationDialog.java | 13 ++++++++----- ...rAdditionWithIgnoredFilesConfirmationAction.kt | 5 ++++- .../openapi/vcs/changes/patch/ApplyPatchMode.java | 4 +++- .../openapi/vcs/changes/ui/ChangeListChooser.java | 4 +++- .../VcsMappingConfigurationDialog.java | 6 +++--- .../openapi/vcs/impl/AbstractVcsHelperImpl.java | 3 ++- .../vcs/update/UpdateOrStatusOptionsDialog.java | 4 +++- .../src/com/intellij/vcsUtil/AuthDialog.java | 9 ++++++++- .../vcs/log/ui/filter/VcsStructureChooser.java | 3 ++- .../src/actions/service/NewServiceActionBase.java | 4 ++++ .../src/git4idea/branch/GitNewBranchDialog.kt | 3 ++- .../xslt/refactoring/BaseIntroduceDialog.java | 4 +++- 47 files changed, 199 insertions(+), 81 deletions(-) diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AbstractProjectWizard.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AbstractProjectWizard.java index 1c993548665f..cdfed5b7e605 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AbstractProjectWizard.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AbstractProjectWizard.java @@ -21,11 +21,9 @@ import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.JBUI; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.TestOnly; +import org.jetbrains.annotations.*; import javax.swing.*; import java.awt.*; @@ -45,7 +43,7 @@ public abstract class AbstractProjectWizard extends AbstractWizard>, private val isShowFilePath: Boolean, title: String, private val description: String) : DialogWrapper(false) { +internal class ChooseComponentsToExportDialog(fileToComponents: Map>, + private val isShowFilePath: Boolean, + title: @Nls @NlsContexts.DialogTitle String, + private val description: String) : DialogWrapper(false) { private val chooser: ElementsChooser private val pathPanel = FieldPanel(ConfigurationStoreBundle.message("editbox.export.settings.to"), null, { browse() }, null) diff --git a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffWindow.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffWindow.java index 1ff61f7fdad8..a0d2e46ff911 100644 --- a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffWindow.java +++ b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffWindow.java @@ -16,6 +16,8 @@ package com.intellij.openapi.diff.impl.dir; import com.intellij.openapi.Disposable; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -24,7 +26,7 @@ public interface DirDiffWindow { @NotNull Disposable getDisposable(); - void setTitle(@NotNull String title); + void setTitle(@NotNull @Nls @NlsContexts.DialogTitle String title); class Dialog implements DirDiffWindow { @@ -41,7 +43,7 @@ public interface DirDiffWindow { } @Override - public void setTitle(@NotNull String title) { + public void setTitle(@NotNull @Nls @NlsContexts.DialogTitle String title) { myDialog.setTitle(title); } } diff --git a/platform/execution-impl/src/com/intellij/execution/impl/RunDialog.java b/platform/execution-impl/src/com/intellij/execution/impl/RunDialog.java index 33ec4d19acad..83ba2e8e70ab 100644 --- a/platform/execution-impl/src/com/intellij/execution/impl/RunDialog.java +++ b/platform/execution-impl/src/com/intellij/execution/impl/RunDialog.java @@ -15,7 +15,9 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.LabeledComponent; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -98,7 +100,10 @@ public class RunDialog extends DialogWrapper implements RunDialogBase { return editConfiguration(environment.getProject(), environment.getRunnerAndConfigurationSettings(), title, environment.getExecutor()); } - public static boolean editConfiguration(final Project project, @NotNull RunnerAndConfigurationSettings configuration, final String title, @Nullable final Executor executor) { + public static boolean editConfiguration(final Project project, + @NotNull RunnerAndConfigurationSettings configuration, + @Nls @NlsContexts.DialogTitle String title, + @Nullable final Executor executor) { SingleConfigurationConfigurable configurable = SingleConfigurationConfigurable.editSettings(configuration, executor); final SingleConfigurableEditor dialog = new SingleConfigurableEditor(project, configurable, IdeModalityType.IDE) { { @@ -113,7 +118,7 @@ public class RunDialog extends DialogWrapper implements RunDialogBase { return dialog.showAndGet(); } - public static SingleConfigurableEditor editShortenClasspathSetting(final RunnerAndConfigurationSettings settings, final String title) { + public static SingleConfigurableEditor editShortenClasspathSetting(final RunnerAndConfigurationSettings settings, @Nls @NlsContexts.DialogTitle String title) { SingleConfigurationConfigurable configurable = SingleConfigurationConfigurable.editSettings(settings, null); final SingleConfigurableEditor dialog = new SingleConfigurableEditor(settings.getConfiguration().getProject(), configurable, IdeModalityType.IDE) { @Override diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/SelectExternalSystemNodeDialog.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/SelectExternalSystemNodeDialog.java index 279b10193aa8..4952ffcaa9b9 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/SelectExternalSystemNodeDialog.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/SelectExternalSystemNodeDialog.java @@ -18,8 +18,10 @@ import com.intellij.ui.tree.TreeVisitor; import com.intellij.ui.treeStructure.SimpleNode; import com.intellij.ui.treeStructure.SimpleTree; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.tree.TreeUtil; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -55,7 +57,7 @@ public class SelectExternalSystemNodeDialog extends DialogWrapper { public SelectExternalSystemNodeDialog(@NotNull ProjectSystemId systemId, @NotNull Project project, - @NotNull String title, + @NotNull @Nls @NlsContexts.DialogTitle String title, final Class[] nodeClasses, @Nullable Predicate selector) { super(project, false); diff --git a/platform/lang-api/src/com/intellij/find/FindManager.java b/platform/lang-api/src/com/intellij/find/FindManager.java index 47902e6478f9..06d07117d8ef 100644 --- a/platform/lang-api/src/com/intellij/find/FindManager.java +++ b/platform/lang-api/src/com/intellij/find/FindManager.java @@ -10,8 +10,10 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.search.SearchScope; import com.intellij.util.messages.Topic; +import com.intellij.util.nls.NlsContexts; import org.intellij.lang.annotations.MagicConstant; import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,7 +61,7 @@ public abstract class FindManager { * interface. */ @PromptResultValue - public abstract int showPromptDialog(@NotNull FindModel model, String title); + public abstract int showPromptDialog(@NotNull FindModel model, @Nls @NlsContexts.DialogTitle String title); /** * Returns the settings of the last performed Find in File operation, or the @@ -118,7 +120,9 @@ public abstract class FindManager { * interface. May be only {@link PromptResult#CANCEL} or {@link PromptResult#SKIP} for bad replace operation */ @PromptResultValue - public abstract int showMalformedReplacementPrompt(@NotNull FindModel model, String title, MalformedReplacementStringException exception); + public abstract int showMalformedReplacementPrompt(@NotNull FindModel model, + @Nls @NlsContexts.DialogTitle String title, + MalformedReplacementStringException exception); public static class MalformedReplacementStringException extends Exception { public MalformedReplacementStringException(String s, Throwable throwable) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java index a6054ed371d0..90b71dc5d88b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java @@ -11,8 +11,11 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.ComboBox; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.NlsUI; import com.intellij.psi.search.SearchScope; import com.intellij.ui.IdeBorderFactory; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -52,8 +55,8 @@ public class LayoutProjectCodeDialog extends DialogWrapper implements ReformatFi private JCheckBox myCbCleanupCode; public LayoutProjectCodeDialog(@NotNull Project project, - @NotNull String title, - @NotNull String text, + @NotNull @Nls @NlsContexts.DialogTitle String title, + @NotNull @Nls @NlsUI.Label String text, boolean enableOnlyVCSChangedTextCb) { super(project, false); diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java index f634d02b9e7f..6f823101fdd3 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java @@ -58,10 +58,12 @@ import com.intellij.usages.impl.SyntaxHighlighterOverEditorHighlighter; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.IntObjectMap; import com.intellij.util.containers.Predicate; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.text.CharArrayUtil; import com.intellij.util.text.ImmutableCharSequence; import com.intellij.util.text.StringSearcher; import gnu.trove.THashSet; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -128,7 +130,7 @@ public final class FindManagerImpl extends FindManager { @PromptResultValue private int showPromptDialogImpl(@NotNull final FindModel model, - String title, + @Nls @NlsContexts.DialogTitle String title, @Nullable final MalformedReplacementStringException exception) { ReplacePromptDialog replacePromptDialog = new ReplacePromptDialog(model.isMultipleFiles(), title, myProject, exception) { @Override diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CreateFileFromTemplateDialog.java b/platform/lang-impl/src/com/intellij/ide/actions/CreateFileFromTemplateDialog.java index de8ee3a9dd0c..210c573ca5e0 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/CreateFileFromTemplateDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/CreateFileFromTemplateDialog.java @@ -22,6 +22,7 @@ import com.intellij.psi.SmartPointerManager; import com.intellij.psi.SmartPsiElementPointer; import com.intellij.util.Consumer; import com.intellij.util.PlatformIcons; +import com.intellij.util.nls.NlsContexts; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -147,7 +148,7 @@ public class CreateFileFromTemplateDialog extends DialogWrapper { } @Override - public Builder setTitle(@Nls String title) { + public Builder setTitle(@Nls @NlsContexts.DialogTitle String title) { myDialog.setTitle(title); return this; } diff --git a/platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java b/platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java index 8705c6bae873..b6a679d62a40 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java @@ -31,8 +31,10 @@ import com.intellij.util.ArrayUtilRt; import com.intellij.util.Processor; import com.intellij.util.Query; import com.intellij.util.indexing.FindSymbolParameters; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -63,15 +65,15 @@ public abstract class AbstractTreeClassChooserDialog private ChooseByNamePanel myGotoByNamePanel; private T myInitialClass; - public AbstractTreeClassChooserDialog(String title, Project project, final Class elementClass) { + public AbstractTreeClassChooserDialog(@Nls @NlsContexts.DialogTitle String title, Project project, final Class elementClass) { this(title, project, elementClass, null); } - public AbstractTreeClassChooserDialog(String title, Project project, final Class elementClass, @Nullable T initialClass) { + public AbstractTreeClassChooserDialog(@Nls @NlsContexts.DialogTitle String title, Project project, final Class elementClass, @Nullable T initialClass) { this(title, project, GlobalSearchScope.projectScope(project), elementClass, null, initialClass); } - public AbstractTreeClassChooserDialog(String title, + public AbstractTreeClassChooserDialog(@Nls @NlsContexts.DialogTitle String title, @NotNull Project project, GlobalSearchScope scope, @NotNull Class elementClass, @@ -80,7 +82,7 @@ public abstract class AbstractTreeClassChooserDialog this(title, project, scope, elementClass, classFilter, null, initialClass, false, true); } - public AbstractTreeClassChooserDialog(String title, + public AbstractTreeClassChooserDialog(@Nls @NlsContexts.DialogTitle String title, @NotNull Project project, GlobalSearchScope scope, @NotNull Class elementClass, diff --git a/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java b/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java index bad8f01e3cf3..7554e11c6d74 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java @@ -40,8 +40,10 @@ import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ArrayUtil; import com.intellij.util.ArrayUtilRt; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.JBUI; import gnu.trove.THashSet; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -81,7 +83,7 @@ public final class TreeFileChooserDialog extends DialogWrapper implements TreeFi private boolean mySelectSearchByNameTab = false; public TreeFileChooserDialog(@NotNull Project project, - String title, + @Nls @NlsContexts.DialogTitle String title, @Nullable final PsiFile initialFile, @Nullable FileType fileType, @Nullable PsiFileFilter filter, diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/TypeEditor.java b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/TypeEditor.java index cb564a756527..e5cf9cdc3d36 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/TypeEditor.java +++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/TypeEditor.java @@ -7,6 +7,8 @@ import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Disposer; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -16,7 +18,7 @@ class TypeEditor> extends DialogWrapper { private final T myFileType; private final SettingsEditor myEditor; - TypeEditor(@NotNull Component parent, @NotNull T fileType, @NotNull String title) { + TypeEditor(@NotNull Component parent, @NotNull T fileType, @NotNull @Nls @NlsContexts.DialogTitle String title) { super(parent, false); myFileType = fileType; myEditor = fileType.getEditor(); diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/RemoveInvalidElementsDialog.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/RemoveInvalidElementsDialog.java index a5746e1392d4..9dac5c9febee 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/impl/RemoveInvalidElementsDialog.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/RemoveInvalidElementsDialog.java @@ -24,7 +24,9 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.VerticalFlowLayout; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.util.nls.NlsContexts; import com.intellij.xml.util.XmlStringUtil; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -40,7 +42,7 @@ public class RemoveInvalidElementsDialog extends DialogWrapper { private JLabel myDescriptionLabel; private final Map myCheckboxes = new HashMap<>(); - private RemoveInvalidElementsDialog(final String title, + private RemoveInvalidElementsDialog(@Nls @NlsContexts.DialogTitle String title, ConfigurationErrorType type, String invalidElements, final Project project, @@ -74,7 +76,7 @@ public class RemoveInvalidElementsDialog extends DialogWrapper { /** * @return {@code true} if the problems are resolved */ - public static boolean showDialog(@NotNull Project project, @NotNull String title, ConfigurationErrorType type, + public static boolean showDialog(@NotNull Project project, @NotNull @Nls @NlsContexts.DialogTitle String title, ConfigurationErrorType type, @NotNull String invalidElements, @NotNull List errors) { if (errors.isEmpty()) { return true; diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/CallerChooserBase.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/CallerChooserBase.java index 160bdded9e1c..1f1ed0897d66 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/CallerChooserBase.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/CallerChooserBase.java @@ -44,6 +44,7 @@ import com.intellij.util.Alarm; import com.intellij.util.Consumer; import com.intellij.util.Query; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.nls.NlsContexts; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -83,7 +84,7 @@ public abstract class CallerChooserBase extends DialogWrap return ""; } - public CallerChooserBase(M method, Project project, @Nls(capitalization = Nls.Capitalization.Title) String title, Tree previousTree, String fileName, Consumer> callback) { + public CallerChooserBase(M method, Project project, @Nls @NlsContexts.DialogTitle String title, Tree previousTree, String fileName, Consumer> callback) { super(true); myMethod = method; myProject = project; diff --git a/platform/lang-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialogBase.java b/platform/lang-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialogBase.java index 832420d94a43..ce0027fbb287 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialogBase.java +++ b/platform/lang-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialogBase.java @@ -12,6 +12,8 @@ import com.intellij.refactoring.ui.AbstractMemberSelectionTable; import com.intellij.refactoring.ui.MemberSelectionPanelBase; import com.intellij.refactoring.ui.RefactoringDialog; import com.intellij.usageView.UsageViewUtil; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -36,7 +38,11 @@ public abstract class PullUpDialogBase myMemberInfos; private JComboBox myClassCombo; - public PullUpDialogBase(Project project, Class aClass, List superClasses, Storage memberInfoStorage, String title) { + public PullUpDialogBase(Project project, + Class aClass, + List superClasses, + Storage memberInfoStorage, + @Nls @NlsContexts.DialogTitle String title) { super(project, true); myClass = aClass; mySuperClasses = superClasses; diff --git a/platform/lang-impl/src/com/intellij/ui/ReplacePromptDialog.java b/platform/lang-impl/src/com/intellij/ui/ReplacePromptDialog.java index a5f3f91e5d7d..137c567ebe1a 100644 --- a/platform/lang-impl/src/com/intellij/ui/ReplacePromptDialog.java +++ b/platform/lang-impl/src/com/intellij/ui/ReplacePromptDialog.java @@ -20,6 +20,8 @@ import com.intellij.find.FindManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,11 +33,11 @@ public class ReplacePromptDialog extends DialogWrapper { private final boolean myIsMultiple; @Nullable private final FindManager.MalformedReplacementStringException myException; - public ReplacePromptDialog(boolean isMultipleFiles, String title, Project project) { + public ReplacePromptDialog(boolean isMultipleFiles, @Nls @NlsContexts.DialogTitle String title, Project project) { this(isMultipleFiles, title, project, null); } - public ReplacePromptDialog(boolean isMultipleFiles, String title, Project project, @Nullable FindManager.MalformedReplacementStringException exception) { + public ReplacePromptDialog(boolean isMultipleFiles, @Nls @NlsContexts.DialogTitle String title, Project project, @Nullable FindManager.MalformedReplacementStringException exception) { super(project, true); myIsMultiple = isMultipleFiles; myException = exception; diff --git a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java index 4139d0499550..b05006e1b0c3 100644 --- a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java +++ b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java @@ -15,10 +15,12 @@ import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.ui.JBCardLayout; import com.intellij.ui.components.panels.OpaquePanel; import com.intellij.ui.mac.TouchbarDataKeys; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.ImageUtil; import com.intellij.util.ui.StartupUiUtil; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.update.UiNotifyConnector; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -55,13 +57,13 @@ public abstract class AbstractWizard extends DialogWrapper { } }; - public AbstractWizard(final String title, final Component dialogParent) { + public AbstractWizard(@Nls @NlsContexts.DialogTitle String title, final Component dialogParent) { super(dialogParent, true); mySteps = new ArrayList<>(); initWizard(title); } - public AbstractWizard(final String title, @Nullable final Project project) { + public AbstractWizard(@Nls @NlsContexts.DialogTitle String title, @Nullable final Project project) { super(project, true); mySteps = new ArrayList<>(); initWizard(title); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java index 9a75098960a5..22baf4279171 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java @@ -7,7 +7,9 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.nls.NlsContexts; import org.intellij.lang.annotations.MagicConstant; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -93,12 +95,12 @@ public class DialogBuilder implements Disposable { return this; } - public void setTitle(String title) { + public void setTitle(@Nls @NlsContexts.DialogTitle String title) { myTitle = title; } @NotNull - public DialogBuilder title(@NotNull String title) { + public DialogBuilder title(@NotNull @Nls @NlsContexts.DialogTitle String title) { myTitle = title; return this; } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java index 8565ac08ed94..8bd10a3f60d2 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java @@ -309,6 +309,7 @@ public abstract class DialogWrapper { } @NotNull + @NlsUI.Checkbox protected String getDoNotShowMessage() { return UIBundle.message("dialog.options.do.not.show"); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/SelectFromListDialog.java b/platform/platform-api/src/com/intellij/openapi/ui/SelectFromListDialog.java index 118d961f824b..b2fbd9a3fe63 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/SelectFromListDialog.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/SelectFromListDialog.java @@ -20,7 +20,9 @@ import com.intellij.openapi.project.Project; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleListCellRenderer; import com.intellij.ui.components.JBList; +import com.intellij.util.nls.NlsContexts; import org.intellij.lang.annotations.JdkConstants; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -41,7 +43,7 @@ public class SelectFromListDialog extends DialogWrapper { public SelectFromListDialog(Project project, Object[] objects, ToStringAspect toStringAspect, - String title, + @Nls @NlsContexts.DialogTitle String title, @JdkConstants.ListSelectionMode int selectionMode) { super(project, true); myToStringAspect = toStringAspect; diff --git a/platform/platform-api/src/com/intellij/openapi/ui/popup/ComponentPopupBuilder.java b/platform/platform-api/src/com/intellij/openapi/ui/popup/ComponentPopupBuilder.java index 1924f38bc69d..9b62b412dcb5 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/popup/ComponentPopupBuilder.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/popup/ComponentPopupBuilder.java @@ -8,6 +8,8 @@ import com.intellij.openapi.util.Pair; import com.intellij.ui.ActiveComponent; import com.intellij.util.BooleanFunction; import com.intellij.util.Processor; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -21,7 +23,7 @@ import java.util.List; public interface ComponentPopupBuilder { @NotNull - ComponentPopupBuilder setTitle(String title); + ComponentPopupBuilder setTitle(@Nls @NlsContexts.DialogTitle String title); @NotNull ComponentPopupBuilder setResizable(boolean forceResizable); diff --git a/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java b/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java index 29e090ffa399..18df293c442d 100644 --- a/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java +++ b/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java @@ -13,7 +13,9 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.FixedSizeButton; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.ui.components.fields.ExtendableTextComponent; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.JBUI; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -42,7 +44,7 @@ public abstract class AbstractFieldPanel extends JPanel { public AbstractFieldPanel(JComponent component, String labelText, - final String viewerDialogTitle, + @Nls @NlsContexts.DialogTitle String viewerDialogTitle, ActionListener browseButtonActionListener, Runnable changeListener) { myComponent = component; diff --git a/platform/platform-api/src/com/intellij/util/net/AuthenticationDialog.java b/platform/platform-api/src/com/intellij/util/net/AuthenticationDialog.java index 1000283a0333..0fff57edd68e 100644 --- a/platform/platform-api/src/com/intellij/util/net/AuthenticationDialog.java +++ b/platform/platform-api/src/com/intellij/util/net/AuthenticationDialog.java @@ -17,6 +17,8 @@ package com.intellij.util.net; import com.intellij.openapi.MnemonicHelper; import com.intellij.openapi.ui.DialogWrapper; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -26,7 +28,12 @@ import java.awt.*; public class AuthenticationDialog extends DialogWrapper { private final AuthenticationPanel panel; - public AuthenticationDialog(@NotNull Component component, String title, String description, final String login, final String password, final boolean rememberPassword) { + public AuthenticationDialog(@NotNull Component component, + @Nls @NlsContexts.DialogTitle String title, + String description, + final String login, + final String password, + final boolean rememberPassword) { super(component, true); setTitle(title); diff --git a/platform/platform-api/src/com/intellij/util/net/IOExceptionDialog.java b/platform/platform-api/src/com/intellij/util/net/IOExceptionDialog.java index decb7b739529..c9383b45cd02 100644 --- a/platform/platform-api/src/com/intellij/util/net/IOExceptionDialog.java +++ b/platform/platform-api/src/com/intellij/util/net/IOExceptionDialog.java @@ -5,10 +5,13 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; +import com.intellij.openapi.util.NlsUI; import com.intellij.openapi.util.Ref; import com.intellij.ui.GuiUtils; import com.intellij.ui.UIBundle; import com.intellij.util.ObjectUtils; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,7 +62,7 @@ public class IOExceptionDialog extends DialogWrapper { * Show the dialog * @return {@code true} if "Try Again" button pressed and {@code false} if "Cancel" button pressed */ - public static boolean showErrorDialog(final String title, final String text) { + public static boolean showErrorDialog(@Nls @NlsContexts.DialogTitle String title, @NlsUI.TextPane String text) { if (ApplicationManager.getApplication().isUnitTestMode()) { throw new RuntimeException(title + ": " + text); } diff --git a/platform/platform-api/src/com/intellij/util/net/ssl/CertificateWarningDialog.java b/platform/platform-api/src/com/intellij/util/net/ssl/CertificateWarningDialog.java index 95548a033449..54ff2d574f7b 100644 --- a/platform/platform-api/src/com/intellij/util/net/ssl/CertificateWarningDialog.java +++ b/platform/platform-api/src/com/intellij/util/net/ssl/CertificateWarningDialog.java @@ -7,9 +7,12 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.util.NlsUI; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.JBDimension; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -40,7 +43,9 @@ public class CertificateWarningDialog extends DialogWrapper { private JTextPane myMessagePane; private final X509Certificate myCertificate; - public CertificateWarningDialog(@NotNull X509Certificate certificate, @NotNull String title, @NotNull String message) { + public CertificateWarningDialog(@NotNull X509Certificate certificate, + @NotNull @Nls @NlsContexts.DialogTitle String title, + @NotNull @NlsUI.TextPane String message) { super((Project)null, false); myRootPanel.setPreferredSize(new JBDimension(550, 650)); diff --git a/platform/platform-api/src/com/intellij/util/ui/OptionsMessageDialog.java b/platform/platform-api/src/com/intellij/util/ui/OptionsMessageDialog.java index c0000f26f871..635dddfcfe49 100644 --- a/platform/platform-api/src/com/intellij/util/ui/OptionsMessageDialog.java +++ b/platform/platform-api/src/com/intellij/util/ui/OptionsMessageDialog.java @@ -17,6 +17,9 @@ package com.intellij.util.ui; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.MultiLineLabelUI; +import com.intellij.openapi.util.NlsUI; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -27,8 +30,8 @@ public abstract class OptionsMessageDialog extends OptionsDialog{ private final Icon myIcon; protected OptionsMessageDialog(Project project, - final String message, - String title, + @Nls @NlsUI.Label String message, + @Nls @NlsContexts.DialogTitle String title, final Icon icon) { super(project); myMessage = message; diff --git a/platform/platform-impl/src/com/intellij/ide/util/ChooseElementsDialog.java b/platform/platform-impl/src/com/intellij/ide/util/ChooseElementsDialog.java index 08096b37fcb7..67b24d61c4bd 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/ChooseElementsDialog.java +++ b/platform/platform-impl/src/com/intellij/ide/util/ChooseElementsDialog.java @@ -3,9 +3,12 @@ package com.intellij.ide.util; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; +import com.intellij.openapi.util.NlsUI; import com.intellij.ui.DoubleClickListener; import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -22,21 +25,21 @@ public abstract class ChooseElementsDialog extends DialogWrapper { protected ElementsChooser myChooser; private final String myDescription; - public ChooseElementsDialog(Project project, List items, String title, final String description) { + public ChooseElementsDialog(Project project, List items, @Nls @NlsContexts.DialogTitle String title, @Nls @NlsUI.Label String description) { this(project, items, title, description, false); } - public ChooseElementsDialog(Project project, List items, String title, final String description, boolean sort) { + public ChooseElementsDialog(Project project, List items, @Nls @NlsContexts.DialogTitle String title, @Nls @NlsUI.Label String description, boolean sort) { super(project, true); myDescription = description; initializeDialog(items, title, sort); } - public ChooseElementsDialog(Component parent, List items, String title) { + public ChooseElementsDialog(Component parent, List items, @Nls @NlsContexts.DialogTitle String title) { this(parent, items, title, null, false); } - public ChooseElementsDialog(Component parent, List items, String title, @Nullable String description, final boolean sort) { + public ChooseElementsDialog(Component parent, List items, @Nls @NlsContexts.DialogTitle String title, @Nullable @Nls @NlsUI.Label String description, final boolean sort) { super(parent, true); myDescription = description; initializeDialog(items, title, sort); @@ -51,7 +54,7 @@ public abstract class ChooseElementsDialog extends DialogWrapper { return false; } - private void initializeDialog(final List items, final String title, boolean sort) { + private void initializeDialog(final List items, @Nls @NlsContexts.DialogTitle String title, boolean sort) { setTitle(title); myChooser = new ElementsChooser(canElementsBeMarked()) { @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ContentChooser.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ContentChooser.java index cf83538b026d..8c58290face2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ContentChooser.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ContentChooser.java @@ -25,8 +25,10 @@ import com.intellij.ui.speedSearch.SpeedSearchUtil; import com.intellij.util.Alarm; import com.intellij.util.ObjectUtils; import com.intellij.util.containers.JBIterable; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -58,11 +60,11 @@ public abstract class ContentChooser extends DialogWrapper { private Icon myListEntryIcon = AllIcons.FileTypes.Text; private boolean myUseNumbering = true; - public ContentChooser(Project project, String title, boolean useIdeaEditor) { + public ContentChooser(Project project, @Nls @NlsContexts.DialogTitle String title, boolean useIdeaEditor) { this(project, title, useIdeaEditor, false); } - public ContentChooser(Project project, String title, boolean useIdeaEditor, boolean allowMultipleSelections) { + public ContentChooser(Project project, @Nls @NlsContexts.DialogTitle String title, boolean useIdeaEditor, boolean allowMultipleSelections) { super(project, true); myProject = project; myUseIdeaEditor = useIdeaEditor; diff --git a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java index f09bb3f6db4d..23e40bc1847b 100644 --- a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java +++ b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java @@ -30,9 +30,11 @@ import com.intellij.ui.picker.MacColorPipette; import com.intellij.util.Alarm; import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.TimerUtil; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -1025,8 +1027,12 @@ public class ColorPicker extends JPanel implements ColorListener, DocumentListen private final boolean myEnableOpacity; private final boolean myOpacityInPercent; - ColorPickerDialog(@NotNull Component parent, String caption, @Nullable Color preselectedColor, boolean enableOpacity, - List listeners, boolean opacityInPercent) { + ColorPickerDialog(@NotNull Component parent, + @Nls @NlsContexts.DialogTitle String caption, + @Nullable Color preselectedColor, + boolean enableOpacity, + List listeners, + boolean opacityInPercent) { super(parent, true); myListeners = listeners; myPreselectedColor = preselectedColor; diff --git a/platform/platform-impl/src/com/intellij/ui/components/components.kt b/platform/platform-impl/src/com/intellij/ui/components/components.kt index 83bb4534ac4c..eb88775554e3 100644 --- a/platform/platform-impl/src/com/intellij/ui/components/components.kt +++ b/platform/platform-impl/src/com/intellij/ui/components/components.kt @@ -18,6 +18,7 @@ import com.intellij.ui.components.labels.LinkLabel import com.intellij.util.FontUtil import com.intellij.util.SmartList import com.intellij.util.io.URLUtil +import com.intellij.util.nls.NlsContexts import com.intellij.util.ui.JBUI import com.intellij.util.ui.SwingHelper import com.intellij.util.ui.SwingHelper.addHistoryOnExpansion @@ -147,7 +148,7 @@ private fun setTitledBorder(@Nls(capitalization = Nls.Capitalization.Title) titl * Consider using [UI DSL](http://www.jetbrains.org/intellij/sdk/docs/user_interface_components/kotlin_ui_dsl.html). */ @JvmOverloads -fun dialog(@Nls(capitalization = Nls.Capitalization.Title) title: String, +fun dialog(title: @Nls @NlsContexts.DialogTitle String, panel: JComponent, resizable: Boolean = false, focusedComponent: JComponent? = null, diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java index 7ffb88693ba8..b385cb16a100 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java @@ -81,9 +81,11 @@ import com.intellij.ui.awt.RelativePoint; import com.intellij.util.Alarm; import com.intellij.util.SmartList; import com.intellij.util.concurrency.AppExecutorUtil; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.textCompletion.TextCompletionUtil; import com.intellij.util.ui.TextTransferable; import org.jdom.JDOMException; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -374,6 +376,8 @@ public class StructuralSearchDialog extends DialogWrapper implements ProjectMana } @NotNull + @Nls + @NlsContexts.DialogTitle String getDefaultTitle() { return myReplace ? SSRBundle.message("structural.replace.title") : SSRBundle.message("structural.search.title"); } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java index 91b642b1ccd5..27db9438464b 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java @@ -16,6 +16,7 @@ import com.intellij.openapi.vcs.merge.MergeProvider; import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.nls.NlsContexts; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -60,20 +61,20 @@ public abstract class AbstractVcsHelper { public abstract void showAnnotation(FileAnnotation annotation, VirtualFile file, AbstractVcs vcs, int line); - public abstract void showChangesListBrowser(@NotNull CommittedChangeList changelist, @Nullable @Nls String title); + public abstract void showChangesListBrowser(@NotNull CommittedChangeList changelist, @Nullable @Nls @NlsContexts.DialogTitle String title); - public abstract void showWhatDiffersBrowser(@NotNull Collection changes, @Nullable @Nls String title); + public abstract void showWhatDiffersBrowser(@NotNull Collection changes, @Nullable @Nls @NlsContexts.DialogTitle String title); public abstract void showCommittedChangesBrowser(@NotNull CommittedChangesProvider provider, @NotNull RepositoryLocation location, - @Nullable @Nls String title, + @Nullable @Nls @NlsContexts.DialogTitle String title, @Nullable Component parent); public abstract void openCommittedChangesTab(@NotNull CommittedChangesProvider provider, @NotNull RepositoryLocation location, @NotNull ChangeBrowserSettings settings, int maxCount, - @Nullable String title); + @Nullable @Nls @NlsContexts.DialogTitle String title); /** * Shows the multiple file merge dialog for resolving conflicts in the specified set of virtual files. @@ -122,7 +123,7 @@ public abstract class AbstractVcsHelper { @Nullable public abstract Collection selectFilesToProcess(List files, - String title, + @Nls @NlsContexts.DialogTitle String title, @Nullable String prompt, @Nullable String singleFileTitle, @Nullable String singleFilePromptTemplate, @@ -130,7 +131,7 @@ public abstract class AbstractVcsHelper { @Nullable public abstract Collection selectFilePathsToProcess(@NotNull List files, - String title, + @Nls @NlsContexts.DialogTitle String title, @Nullable String prompt, @Nullable String singleFileTitle, @Nullable String singleFilePromptTemplate, @@ -138,7 +139,7 @@ public abstract class AbstractVcsHelper { @Nullable public abstract Collection selectFilePathsToProcess(@NotNull List files, - String title, + @Nls @NlsContexts.DialogTitle String title, @Nullable String prompt, @Nullable String singleFileTitle, @Nullable String singleFilePromptTemplate, diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeDialogCustomizer.kt b/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeDialogCustomizer.kt index 0ba2a1fc3675..b8787f17755c 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeDialogCustomizer.kt +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeDialogCustomizer.kt @@ -9,6 +9,7 @@ import com.intellij.openapi.vcs.FilePath import com.intellij.openapi.vcs.VcsBundle import com.intellij.openapi.vcs.history.VcsRevisionNumber import com.intellij.openapi.vfs.VirtualFile +import com.intellij.util.nls.NlsContexts import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.Nls @@ -74,8 +75,7 @@ open class MergeDialogCustomizer { * * Don't mix with [getMergeWindowTitle] which is the title of the 3-way merge dialog displayed for a single file. */ - @Nls(capitalization = Nls.Capitalization.Title) - open fun getMultipleFileDialogTitle(): String = VcsBundle.message("multiple.file.merge.title") + open fun getMultipleFileDialogTitle(): @Nls @NlsContexts.DialogTitle String = VcsBundle.message("multiple.file.merge.title") /** * Allows to override the names of the columns of the multiple files merge dialog, defined in [MergeSession.getMergeInfoColumns]. diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/FilesProcessorWithNotificationImpl.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/FilesProcessorWithNotificationImpl.kt index 20658778dbf5..5d13e9d6fa04 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/FilesProcessorWithNotificationImpl.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/FilesProcessorWithNotificationImpl.kt @@ -8,8 +8,11 @@ import com.intellij.notification.NotificationAction import com.intellij.openapi.Disposable import com.intellij.openapi.project.Project import com.intellij.openapi.util.Disposer +import com.intellij.openapi.util.NlsUI import com.intellij.openapi.vcs.changes.ui.SelectFilesDialog import com.intellij.openapi.vfs.VirtualFile +import com.intellij.util.nls.NlsContexts +import org.jetbrains.annotations.Nls abstract class FilesProcessorWithNotificationImpl(protected val project: Project, parentDisposable: Disposable) : FilesProcessor { private val files = mutableSetOf() @@ -36,9 +39,9 @@ abstract class FilesProcessorWithNotificationImpl(protected val project: Project abstract fun rememberForAllProjects() - protected open val viewFilesDialogTitle: String? = null - protected open val viewFilesDialogOkActionName: String = CommonBundle.getAddButtonText() - protected open val viewFilesDialogCancelActionName: String = CommonBundle.getCancelButtonText() + protected open val viewFilesDialogTitle: @Nls @NlsContexts.DialogTitle String? = null + protected open val viewFilesDialogOkActionName: @Nls @NlsUI.Button String = CommonBundle.getAddButtonText() + protected open val viewFilesDialogCancelActionName: @Nls @NlsUI.Button String = CommonBundle.getCancelButtonText() protected open fun rememberForCurrentProject() { setForCurrentProject(true) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SpecificFilesViewDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SpecificFilesViewDialog.java index 4edaaebc02cf..3d8fb283cdaa 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SpecificFilesViewDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SpecificFilesViewDialog.java @@ -20,8 +20,10 @@ import com.intellij.ui.GuiUtils; import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.EditSourceOnDoubleClickHandler; import com.intellij.util.EditSourceOnEnterKeyHandler; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.JBDimension; import com.intellij.util.ui.tree.TreeUtil; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -43,7 +45,7 @@ abstract class SpecificFilesViewDialog extends DialogWrapper { protected final Project myProject; protected SpecificFilesViewDialog(@NotNull Project project, - @NotNull String title, + @NotNull @Nls @NlsContexts.DialogTitle String title, @NotNull DataKey> shownDataKey, @NotNull List initDataFiles) { super(project, true); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsConfirmationDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsConfirmationDialog.java index 942635b3b80d..95c2f911628c 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsConfirmationDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsConfirmationDialog.java @@ -3,9 +3,12 @@ package com.intellij.openapi.vcs.changes; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.util.NlsUI; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.vcs.VcsShowConfirmationOption; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.OptionsDialog; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -23,12 +26,12 @@ class VcsConfirmationDialog extends OptionsDialog { private final String myDoNotShowMessage; VcsConfirmationDialog(@NotNull Project project, - @NotNull String title, - @NotNull String okText, - @NotNull String cancelText, + @NotNull @Nls @NlsContexts.DialogTitle String title, + @NotNull @Nls @NlsUI.Button String okText, + @NotNull @Nls @NlsUI.Button String cancelText, @NotNull VcsShowConfirmationOption option, - @NotNull String message, - @NotNull String doNotShowMessage) { + @NotNull @Nls @NlsUI.Label String message, + @NotNull @NlsUI.Checkbox String doNotShowMessage) { super(project); myOkText = okText; myCancelText = cancelText; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ScheduleForAdditionWithIgnoredFilesConfirmationAction.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ScheduleForAdditionWithIgnoredFilesConfirmationAction.kt index 1be6be2598a4..f3a14a421af3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ScheduleForAdditionWithIgnoredFilesConfirmationAction.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ScheduleForAdditionWithIgnoredFilesConfirmationAction.kt @@ -9,6 +9,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.ui.Messages import com.intellij.openapi.ui.Messages.YES import com.intellij.openapi.ui.Messages.getQuestionIcon +import com.intellij.openapi.util.NlsUI import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.vcs.* import com.intellij.openapi.vcs.VcsBundle.getString @@ -25,8 +26,10 @@ import com.intellij.util.containers.ContainerUtil import com.intellij.util.containers.isEmpty import com.intellij.util.containers.notNullize import com.intellij.util.containers.stream +import com.intellij.util.nls.NlsContexts import com.intellij.vcsUtil.VcsFileUtil import com.intellij.vcsUtil.VcsUtil +import org.jetbrains.annotations.Nls import java.util.* import java.util.stream.Stream import kotlin.streams.toList @@ -132,7 +135,7 @@ class ScheduleForAdditionWithIgnoredFilesConfirmationAction : ScheduleForAdditio fun confirmAddFilePaths(project: Project, paths: List, singlePathDialogTitle: (FilePath) -> String, singlePathDialogMessage: (FilePath) -> String, - multiplePathsDialogTitle: String): List { + multiplePathsDialogTitle: @Nls @NlsContexts.DialogTitle String): List { if (paths.isEmpty()) return paths if (paths.size == 1) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchMode.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchMode.java index a5eee91f9590..060cd552e69f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchMode.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchMode.java @@ -16,6 +16,8 @@ package com.intellij.openapi.vcs.changes.patch; import com.intellij.openapi.vcs.VcsBundle; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; /** * @author irengrig @@ -28,7 +30,7 @@ public enum ApplyPatchMode { private final String myTitle; private final boolean myCanChangePatchFile; - ApplyPatchMode(String title, boolean canChangePatchFile) { + ApplyPatchMode(@Nls @NlsContexts.DialogTitle String title, boolean canChangePatchFile) { myTitle = title; myCanChangePatchFile = canChangePatchFile; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooser.java index 5b5ead3fdf75..f984c7f7288a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooser.java @@ -6,6 +6,8 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.vcs.changes.ChangeList; import com.intellij.openapi.vcs.changes.LocalChangeList; import com.intellij.util.NullableConsumer; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -20,7 +22,7 @@ public class ChangeListChooser extends DialogWrapper { public ChangeListChooser(@NotNull Project project, @NotNull Collection changelists, @Nullable ChangeList defaultSelection, - final String title, + @Nls @NlsContexts.DialogTitle String title, @Nullable final String suggestedName) { super(project, false); myProject = project; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java index 15b1d9601082..35d31775a509 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java @@ -17,8 +17,9 @@ import com.intellij.openapi.vcs.impl.DefaultVcsRootPolicy; import com.intellij.openapi.vcs.impl.VcsDescriptor; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.components.JBLabel; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -32,7 +33,6 @@ import static com.intellij.openapi.fileChooser.FileChooserDescriptorFactory.crea import static com.intellij.openapi.util.io.FileUtil.toSystemDependentName; import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName; import static com.intellij.openapi.vcs.configurable.VcsDirectoryConfigurationPanel.buildVcsWrappersModel; -import static com.intellij.util.ObjectUtils.notNull; import static com.intellij.util.containers.UtilKt.getIfSingle; import static com.intellij.xml.util.XmlStringUtil.wrapInHtml; @@ -51,7 +51,7 @@ public class VcsMappingConfigurationDialog extends DialogWrapper { private final ProjectLevelVcsManager myVcsManager; @NotNull private final Map myVcses; - public VcsMappingConfigurationDialog(@NotNull Project project, String title) { + public VcsMappingConfigurationDialog(@NotNull Project project, @Nls @NlsContexts.DialogTitle String title) { super(project, false); myProject = project; myVcsManager = ProjectLevelVcsManager.getInstance(myProject); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java index 7bd9f64bb0b3..70653b33ead6 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java @@ -63,6 +63,7 @@ import com.intellij.ui.content.ContentManagerUtil; import com.intellij.ui.content.MessageView; import com.intellij.util.*; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.MessageCategory; import com.intellij.util.ui.UIUtil; import com.intellij.vcs.history.VcsHistoryProviderEx; @@ -135,7 +136,7 @@ public class AbstractVcsHelperImpl extends AbstractVcsHelper { @Override @Nullable public Collection selectFilesToProcess(List files, - String title, + @Nls @NlsContexts.DialogTitle String title, @Nullable String prompt, @Nullable String singleFileTitle, @Nullable String singleFilePromptTemplate, diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateOrStatusOptionsDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateOrStatusOptionsDialog.java index 652c0c4007af..04b9bd80a892 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateOrStatusOptionsDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateOrStatusOptionsDialog.java @@ -11,7 +11,9 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.ui.components.JBTabbedPane; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.ui.OptionsDialog; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -27,7 +29,7 @@ public abstract class UpdateOrStatusOptionsDialog extends OptionsDialog { private final List myConfigurables = new ArrayList<>(); private final Action myHelpAction = new MyHelpAction(); - public UpdateOrStatusOptionsDialog(Project project, String title, Map envToConfMap) { + public UpdateOrStatusOptionsDialog(Project project, @Nls @NlsContexts.DialogTitle String title, Map envToConfMap) { super(project); setTitle(title); myProject = project; diff --git a/platform/vcs-impl/src/com/intellij/vcsUtil/AuthDialog.java b/platform/vcs-impl/src/com/intellij/vcsUtil/AuthDialog.java index 31c34f8ea1f4..edb9f4869995 100644 --- a/platform/vcs-impl/src/com/intellij/vcsUtil/AuthDialog.java +++ b/platform/vcs-impl/src/com/intellij/vcsUtil/AuthDialog.java @@ -17,6 +17,8 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.net.AuthenticationPanel; +import com.intellij.util.nls.NlsContexts; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,7 +32,12 @@ public class AuthDialog extends DialogWrapper { * On the other hand, if password saving is disabled, the checkbox is not shown. * In other cases, {@code rememberByDefault} is used. */ - public AuthDialog(@NotNull Project project, @NotNull String title, @Nullable String description, @Nullable String login, @Nullable String password, boolean rememberByDefault) { + public AuthDialog(@NotNull Project project, + @NotNull @Nls @NlsContexts.DialogTitle String title, + @Nullable String description, + @Nullable String login, + @Nullable String password, + boolean rememberByDefault) { super(project, false); setTitle(title); Boolean rememberPassword = decideOnShowRememberPasswordOption(password, rememberByDefault); diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsStructureChooser.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsStructureChooser.java index cba0747b8a88..05b1c4d2475b 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsStructureChooser.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsStructureChooser.java @@ -25,6 +25,7 @@ import com.intellij.ui.render.RenderingUtil; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.PlatformIcons; import com.intellij.util.containers.Convertor; +import com.intellij.util.nls.NlsContexts; import com.intellij.util.treeWithCheckedNodes.SelectionManager; import com.intellij.util.treeWithCheckedNodes.TreeNodeState; import com.intellij.util.ui.JBUI; @@ -66,7 +67,7 @@ public class VcsStructureChooser extends DialogWrapper { private Tree myTree; public VcsStructureChooser(@NotNull Project project, - @Nls(capitalization = Nls.Capitalization.Title) @NotNull String title, + @Nls @NlsContexts.DialogTitle @NotNull String title, @NotNull Collection initialSelection, @NotNull List roots) { super(project, true); diff --git a/plugins/devkit/devkit-core/src/actions/service/NewServiceActionBase.java b/plugins/devkit/devkit-core/src/actions/service/NewServiceActionBase.java index a11848545672..4980e950198c 100644 --- a/plugins/devkit/devkit-core/src/actions/service/NewServiceActionBase.java +++ b/plugins/devkit/devkit-core/src/actions/service/NewServiceActionBase.java @@ -24,7 +24,9 @@ import com.intellij.psi.xml.XmlTag; import com.intellij.ui.DocumentAdapter; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.nls.NlsContexts; import com.intellij.xml.util.IncludedXmlTag; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.devkit.DevKitBundle; @@ -96,6 +98,8 @@ abstract class NewServiceActionBase extends CreateInDirectoryActionBase implemen protected abstract String getImplementationTemplateName(); + @Nls + @NlsContexts.DialogTitle protected abstract String getDialogTitle(); diff --git a/plugins/git4idea/src/git4idea/branch/GitNewBranchDialog.kt b/plugins/git4idea/src/git4idea/branch/GitNewBranchDialog.kt index d92a2ca1c87a..2956a408eeaa 100644 --- a/plugins/git4idea/src/git4idea/branch/GitNewBranchDialog.kt +++ b/plugins/git4idea/src/git4idea/branch/GitNewBranchDialog.kt @@ -6,6 +6,7 @@ import com.intellij.openapi.ui.DialogWrapper import com.intellij.openapi.ui.ValidationInfo import com.intellij.ui.DocumentAdapter import com.intellij.ui.layout.* +import com.intellij.util.nls.NlsContexts import com.intellij.util.ui.UIUtil.BR import git4idea.branch.GitBranchOperationType.CHECKOUT import git4idea.branch.GitBranchOperationType.CREATE @@ -35,7 +36,7 @@ enum class GitBranchOperationType(@Nls val text: String, @Nls val description: S internal class GitNewBranchDialog @JvmOverloads constructor(project: Project, private val repositories: Collection, - @Nls(capitalization = Nls.Capitalization.Title) dialogTitle: String, + dialogTitle: @Nls @NlsContexts.DialogTitle String, initialName: String?, private val showCheckOutOption: Boolean = true, private val showResetOption: Boolean = false, diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/BaseIntroduceDialog.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/BaseIntroduceDialog.java index 1f6ddef10991..a5d11989aefb 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/BaseIntroduceDialog.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/BaseIntroduceDialog.java @@ -21,8 +21,10 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.InputValidator; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.TextFieldWithHistory; +import com.intellij.util.nls.NlsContexts; import org.intellij.lang.xpath.psi.XPathExpression; import org.intellij.lang.xpath.xslt.util.NameValidator; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -47,7 +49,7 @@ public abstract class BaseIntroduceDialog extends DialogWrapper implements Refac if (myInputValidator.canClose(getName())) super.doOKAction(); } - protected void init(XPathExpression expression, int numberOfExpressions, String title) { + protected void init(XPathExpression expression, int numberOfExpressions, @Nls @NlsContexts.DialogTitle String title) { setModal(true); setTitle(title);