MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-235533 more @DialogTitle annotations

Browse Source 
GitOrigin-RevId: 8b0df8105ea7efc46b9d7768a2fcdff6b51b3754
This commit is contained in:
Dmitry.Krasilschikov
2020-03-22 18:37:25 +00:00
committed by intellij-monorepo-bot
parent 9ec3a63af8
commit 9c1286d2d2
47 changed files with 199 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AbstractProjectWizard.java
+3 -5
View File
@@ -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<ModuleWizardS
myWizardContext.setWizard(this);
}
public AbstractProjectWizard(String title, Project project, Component dialogParent) {
public AbstractProjectWizard(@Nls @NlsContexts.DialogTitle String title, Project project, Component dialogParent) {
super(title, dialogParent);
myWizardContext = initContext(project, null, getDisposable());
myWizardContext.setWizard(this);
platform/configuration-store-impl/src/ChooseComponentsToExportDialog.kt
+6 -1
View File
@@ -16,7 +16,9 @@ import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.openapi.vfs.VfsUtil
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.ui.FieldPanel
import com.intellij.util.nls.NlsContexts
import gnu.trove.THashSet
import org.jetbrains.annotations.Nls
import org.jetbrains.concurrency.AsyncPromise
import org.jetbrains.concurrency.Promise
import java.awt.Component
@@ -102,7 +104,10 @@ fun chooseSettingsFile(oldPath: String?, parent: Component?, title: String, desc
return result
}
internal class ChooseComponentsToExportDialog(fileToComponents: Map<Path, List<ExportableItem>>, private val isShowFilePath: Boolean, title: String, private val description: String) : DialogWrapper(false) {
internal class ChooseComponentsToExportDialog(fileToComponents: Map<Path, List<ExportableItem>>,
private val isShowFilePath: Boolean,
title: @Nls @NlsContexts.DialogTitle String,
private val description: String) : DialogWrapper(false) {
private val chooser: ElementsChooser<ComponentElementProperties>
private val pathPanel = FieldPanel(ConfigurationStoreBundle.message("editbox.export.settings.to"), null, { browse() }, null)
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffWindow.java
+4 -2
View File
@@ -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);
}
}
platform/execution-impl/src/com/intellij/execution/impl/RunDialog.java
+7 -2
View File
@@ -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<RunConfiguration> 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<RunConfiguration> configurable = SingleConfigurationConfigurable.editSettings(settings, null);
final SingleConfigurableEditor dialog = new SingleConfigurableEditor(settings.getConfiguration().getProject(), configurable, IdeModalityType.IDE) {
@Override
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ui/SelectExternalSystemNodeDialog.java
+3 -1
View File
@@ -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<? extends ExternalSystemNode>[] nodeClasses,
@Nullable Predicate<SimpleNode> selector) {
super(project, false);
platform/lang-api/src/com/intellij/find/FindManager.java
+6 -2
View File
@@ -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) {
platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java
+5 -2
View File
@@ -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);
platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
+3 -1
View File
@@ -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
platform/lang-impl/src/com/intellij/ide/actions/CreateFileFromTemplateDialog.java
+2 -1
View File
@@ -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;
}
platform/lang-impl/src/com/intellij/ide/util/AbstractTreeClassChooserDialog.java
+6 -4
View File
@@ -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<T extends PsiNamedElement>
private ChooseByNamePanel myGotoByNamePanel;
private T myInitialClass;
public AbstractTreeClassChooserDialog(String title, Project project, final Class<T> elementClass) {
public AbstractTreeClassChooserDialog(@Nls @NlsContexts.DialogTitle String title, Project project, final Class<T> elementClass) {
this(title, project, elementClass, null);
}
public AbstractTreeClassChooserDialog(String title, Project project, final Class<T> elementClass, @Nullable T initialClass) {
public AbstractTreeClassChooserDialog(@Nls @NlsContexts.DialogTitle String title, Project project, final Class<T> 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<T> elementClass,
@@ -80,7 +82,7 @@ public abstract class AbstractTreeClassChooserDialog<T extends PsiNamedElement>
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<T> elementClass,
platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java
+3 -1
View File
@@ -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,
platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/TypeEditor.java
+3 -1
View File
@@ -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<T extends UserFileType<T>> extends DialogWrapper {
private final T myFileType;
private final SettingsEditor<T> 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();
platform/lang-impl/src/com/intellij/openapi/module/impl/RemoveInvalidElementsDialog.java
+4 -2
View File
@@ -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<JCheckBox, ConfigurationErrorDescription> 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<? extends ConfigurationErrorDescription> errors) {
if (errors.isEmpty()) {
return true;
platform/lang-impl/src/com/intellij/refactoring/changeSignature/CallerChooserBase.java
+2 -1
View File
@@ -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<M extends PsiElement> extends DialogWrap
return "";
}
public CallerChooserBase(M method, Project project, @Nls(capitalization = Nls.Capitalization.Title) String title, Tree previousTree, String fileName, Consumer<? super Set<M>> callback) {
public CallerChooserBase(M method, Project project, @Nls @NlsContexts.DialogTitle String title, Tree previousTree, String fileName, Consumer<? super Set<M>> callback) {
super(true);
myMethod = method;
myProject = project;
platform/lang-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialogBase.java
+7 -1
View File
@@ -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<Storage extends AbstractMemberInfoStorage
protected List<MemberInfo> myMemberInfos;
private JComboBox myClassCombo;
public PullUpDialogBase(Project project, Class aClass, List<Class> superClasses, Storage memberInfoStorage, String title) {
public PullUpDialogBase(Project project,
Class aClass,
List<Class> superClasses,
Storage memberInfoStorage,
@Nls @NlsContexts.DialogTitle String title) {
super(project, true);
myClass = aClass;
mySuperClasses = superClasses;
platform/lang-impl/src/com/intellij/ui/ReplacePromptDialog.java
+4 -2
View File
@@ -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;
platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java
+4 -2
View File
@@ -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<T extends Step> 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);
platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java
+4 -2
View File
@@ -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;
}
platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+1
View File
@@ -309,6 +309,7 @@ public abstract class DialogWrapper {
}
@NotNull
@NlsUI.Checkbox
protected String getDoNotShowMessage() {
return UIBundle.message("dialog.options.do.not.show");
}
platform/platform-api/src/com/intellij/openapi/ui/SelectFromListDialog.java
+3 -1
View File
@@ -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;
platform/platform-api/src/com/intellij/openapi/ui/popup/ComponentPopupBuilder.java
+3 -1
View File
@@ -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);
platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java
+3 -1
View File
@@ -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;
platform/platform-api/src/com/intellij/util/net/AuthenticationDialog.java
+8 -1
View File
@@ -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);
platform/platform-api/src/com/intellij/util/net/IOExceptionDialog.java
+4 -1
View File
@@ -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);
}
platform/platform-api/src/com/intellij/util/net/ssl/CertificateWarningDialog.java
+6 -1
View File
@@ -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));
platform/platform-api/src/com/intellij/util/ui/OptionsMessageDialog.java
+5 -2
View File
@@ -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;
platform/platform-impl/src/com/intellij/ide/util/ChooseElementsDialog.java
+8 -5
View File
@@ -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<T> extends DialogWrapper {
protected ElementsChooser<T> myChooser;
private final String myDescription;
public ChooseElementsDialog(Project project, List<? extends T> items, String title, final String description) {
public ChooseElementsDialog(Project project, List<? extends T> items, @Nls @NlsContexts.DialogTitle String title, @Nls @NlsUI.Label String description) {
this(project, items, title, description, false);
}
public ChooseElementsDialog(Project project, List<? extends T> items, String title, final String description, boolean sort) {
public ChooseElementsDialog(Project project, List<? extends T> 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<? extends T> items, String title) {
public ChooseElementsDialog(Component parent, List<? extends T> items, @Nls @NlsContexts.DialogTitle String title) {
this(parent, items, title, null, false);
}
public ChooseElementsDialog(Component parent, List<? extends T> items, String title, @Nullable String description, final boolean sort) {
public ChooseElementsDialog(Component parent, List<? extends T> 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<T> extends DialogWrapper {
return false;
}
private void initializeDialog(final List<? extends T> items, final String title, boolean sort) {
private void initializeDialog(final List<? extends T> items, @Nls @NlsContexts.DialogTitle String title, boolean sort) {
setTitle(title);
myChooser = new ElementsChooser<T>(canElementsBeMarked()) {
@Override
platform/platform-impl/src/com/intellij/openapi/editor/actions/ContentChooser.java
+4 -2
View File
@@ -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<Data> 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;
platform/platform-impl/src/com/intellij/ui/ColorPicker.java
+8 -2
View File
@@ -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<? extends ColorPickerListener> listeners, boolean opacityInPercent) {
ColorPickerDialog(@NotNull Component parent,
@Nls @NlsContexts.DialogTitle String caption,
@Nullable Color preselectedColor,
boolean enableOpacity,
List<? extends ColorPickerListener> listeners,
boolean opacityInPercent) {
super(parent, true);
myListeners = listeners;
myPreselectedColor = preselectedColor;
platform/platform-impl/src/com/intellij/ui/components/components.kt
+2 -1
View File
@@ -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,
platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/StructuralSearchDialog.java
+4
View File
@@ -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");
}
platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java
+8 -7
View File
@@ -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<Change> changes, @Nullable @Nls String title);
public abstract void showWhatDiffersBrowser(@NotNull Collection<Change> 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<VirtualFile> selectFilesToProcess(List<? extends VirtualFile> 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<FilePath> selectFilePathsToProcess(@NotNull List<? extends FilePath> 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<FilePath> selectFilePathsToProcess(@NotNull List<? extends FilePath> files,
String title,
@Nls @NlsContexts.DialogTitle String title,
@Nullable String prompt,
@Nullable String singleFileTitle,
@Nullable String singleFilePromptTemplate,
platform/vcs-api/src/com/intellij/openapi/vcs/merge/MergeDialogCustomizer.kt
+2 -2
View File
@@ -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].
platform/vcs-impl/src/com/intellij/openapi/vcs/FilesProcessorWithNotificationImpl.kt
+6 -3
View File
@@ -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<VirtualFile>()
@@ -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)
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SpecificFilesViewDialog.java
+3 -1
View File
@@ -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<Stream<FilePath>> shownDataKey,
@NotNull List<? extends FilePath> initDataFiles) {
super(project, true);
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsConfirmationDialog.java
+8 -5
View File
@@ -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;
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ScheduleForAdditionWithIgnoredFilesConfirmationAction.kt
+4 -1
View File
@@ -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<FilePath>,
singlePathDialogTitle: (FilePath) -> String,
singlePathDialogMessage: (FilePath) -> String,
multiplePathsDialogTitle: String): List<FilePath> {
multiplePathsDialogTitle: @Nls @NlsContexts.DialogTitle String): List<FilePath> {
if (paths.isEmpty()) return paths
if (paths.size == 1) {
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchMode.java
+3 -1
View File
@@ -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;
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListChooser.java
+3 -1
View File
@@ -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<? extends ChangeList> changelists,
@Nullable ChangeList defaultSelection,
final String title,
@Nls @NlsContexts.DialogTitle String title,
@Nullable final String suggestedName) {
super(project, false);
myProject = project;
platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java
+3 -3
View File
@@ -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<String, VcsDescriptor> 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);
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
+2 -1
View File
@@ -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<VirtualFile> selectFilesToProcess(List<? extends VirtualFile> files,
String title,
@Nls @NlsContexts.DialogTitle String title,
@Nullable String prompt,
@Nullable String singleFileTitle,
@Nullable String singleFilePromptTemplate,
platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateOrStatusOptionsDialog.java
+3 -1
View File
@@ -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<Configurable> myConfigurables = new ArrayList<>();
private final Action myHelpAction = new MyHelpAction();
public UpdateOrStatusOptionsDialog(Project project, String title, Map<Configurable, AbstractVcs> envToConfMap) {
public UpdateOrStatusOptionsDialog(Project project, @Nls @NlsContexts.DialogTitle String title, Map<Configurable, AbstractVcs> envToConfMap) {
super(project);
setTitle(title);
myProject = project;
platform/vcs-impl/src/com/intellij/vcsUtil/AuthDialog.java
+8 -1
View File
@@ -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);
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsStructureChooser.java
+2 -1
View File
@@ -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<VirtualFile> initialSelection,
@NotNull List<VirtualFile> roots) {
super(project, true);
plugins/devkit/devkit-core/src/actions/service/NewServiceActionBase.java
+4
View File
@@ -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();
plugins/git4idea/src/git4idea/branch/GitNewBranchDialog.kt
+2 -1
View File
@@ -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<GitRepository>,
@Nls(capitalization = Nls.Capitalization.Title) dialogTitle: String,
dialogTitle: @Nls @NlsContexts.DialogTitle String,
initialName: String?,
private val showCheckOutOption: Boolean = true,
private val showResetOption: Boolean = false,
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/BaseIntroduceDialog.java
+3 -1
View File
@@ -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);