diff --git a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptor.java b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptor.java index 574904cb74ac..4c6657015fa6 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptor.java +++ b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptor.java @@ -27,6 +27,7 @@ import com.intellij.ui.LayeredIcon; import com.intellij.ui.UIBundle; import com.intellij.util.IconUtil; import com.intellij.util.PlatformIcons; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -125,11 +126,11 @@ public class FileChooserDescriptor implements Cloneable { return myTitle; } - public void setTitle(String title) { + public void setTitle(@Nls(capitalization = Nls.Capitalization.Title) String title) { withTitle(title); } - public FileChooserDescriptor withTitle(String title) { + public FileChooserDescriptor withTitle(@Nls(capitalization = Nls.Capitalization.Title) 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 087e68ec4e8b..a7d280ea2b00 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java @@ -52,6 +52,7 @@ import com.intellij.util.ui.DialogUtil; import com.intellij.util.ui.UIUtil; import com.intellij.xml.util.XmlStringUtil; 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; @@ -63,8 +64,6 @@ import javax.swing.border.EmptyBorder; import javax.swing.plaf.UIResource; import java.awt.*; import java.awt.event.*; -import java.lang.IllegalArgumentException; -import java.lang.String; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -1495,7 +1494,7 @@ public abstract class DialogWrapper { * @param title title * @see JDialog#setTitle */ - public void setTitle(String title) { + public void setTitle(@Nls(capitalization = Nls.Capitalization.Title) String title) { myPeer.setTitle(title); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/Messages.java b/platform/platform-api/src/com/intellij/openapi/ui/Messages.java index 66c028664897..763f773105aa 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/Messages.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/Messages.java @@ -123,7 +123,7 @@ public class Messages { */ public static int showDialog(@Nullable Project project, String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon) { @@ -136,7 +136,7 @@ public class Messages { */ public static int showDialog(@Nullable Project project, String message, - @NotNull String title, + @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon, @@ -166,7 +166,7 @@ public class Messages { */ public static int showIdeaMessageDialog(@Nullable Project project, String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon, @@ -192,7 +192,7 @@ public class Messages { */ public static int showDialog(Project project, String message, - @NotNull String title, + @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable String moreInfo, @NotNull String[] options, int defaultOptionIndex, @@ -225,7 +225,7 @@ public class Messages { /** * @return number of button pressed: from 0 up to options.length-1 inclusive, or -1 for Cancel */ - public static int showDialog(@NotNull Component parent, String message, @NotNull String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon) { + public static int showDialog(@NotNull Component parent, String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon) { if (isApplicationInUnitTestOrHeadless()) { return ourTestImplementation.show(message); } @@ -253,7 +253,7 @@ public class Messages { * @return number of button pressed: from 0 up to options.length-1 inclusive, or -1 for Cancel */ public static int showDialog(String message, - @NotNull String title, + @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, int focusedOptionIndex, @@ -284,7 +284,7 @@ public class Messages { * @see #showDialog(Component, String, String, String[], int, Icon) * @return number of button pressed: from 0 up to options.length-1 inclusive, or -1 for Cancel */ - public static int showDialog(String message, String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon, @Nullable DialogWrapper.DoNotAskOption doNotAskOption) { + public static int showDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon, @Nullable DialogWrapper.DoNotAskOption doNotAskOption) { return showDialog(message, title, options, defaultOptionIndex, defaultOptionIndex, icon, doNotAskOption); } @@ -295,14 +295,14 @@ public class Messages { * @see #showDialog(Component, String, String, String[], int, Icon) * @return number of button pressed: from 0 up to options.length-1 inclusive, or -1 for Cancel */ - public static int showDialog(String message, String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon) { + public static int showDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon) { return showDialog(message, title, options, defaultOptionIndex, icon, null); } /** - * @see com.intellij.openapi.ui.DialogWrapper#DialogWrapper(Project,boolean) + * @see DialogWrapper#DialogWrapper(Project,boolean) */ - public static void showMessageDialog(@Nullable Project project, String message, @NotNull String title, @Nullable Icon icon) { + public static void showMessageDialog(@Nullable Project project, String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon) { try { if (canShowMacSheetPanel()) { MacMessages.getInstance().showOkMessageDialog(title, message, OK_BUTTON, WindowManager.getInstance().suggestParentWindow(project)); @@ -315,7 +315,7 @@ public class Messages { showDialog(project, message, title, new String[]{OK_BUTTON}, 0, icon); } - public static void showMessageDialog(@NotNull Component parent, String message, @NotNull String title, @Nullable Icon icon) { + public static void showMessageDialog(@NotNull Component parent, String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon) { try { if (canShowMacSheetPanel()) { MacMessages.getInstance().showOkMessageDialog(title, message, OK_BUTTON, SwingUtilities.getWindowAncestor(parent)); @@ -334,7 +334,7 @@ public class Messages { * @see #showMessageDialog(Project, String, String, Icon) * @see #showMessageDialog(Component, String, String, Icon) */ - public static void showMessageDialog(String message, @NotNull String title, @Nullable Icon icon) { + public static void showMessageDialog(String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon) { try { if (canShowMacSheetPanel()) { MacMessages.getInstance().showOkMessageDialog(title, message, OK_BUTTON); @@ -355,7 +355,7 @@ public class Messages { * @return {@link #YES} if user pressed "Yes" or {@link #NO} if user pressed "No" button. */ @YesNoResult - public static int showYesNoDialog(@Nullable Project project, String message, @NotNull String title, @NotNull String yesText, @NotNull String noText, @Nullable Icon icon) { + public static int showYesNoDialog(@Nullable Project project, String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String yesText, @NotNull String noText, @Nullable Icon icon) { try { if (canShowMacSheetPanel()) { return MacMessages.getInstance() @@ -377,7 +377,7 @@ public class Messages { @YesNoResult public static int showYesNoDialog(@Nullable Project project, String message, - @NotNull String title, + @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String yesText, @NotNull String noText, @Nullable Icon icon, @@ -401,7 +401,7 @@ public class Messages { * @return {@link #YES} if user pressed "Yes" or {@link #NO} if user pressed "No" button. */ @YesNoResult - public static int showYesNoDialog(@Nullable Project project, String message, @NotNull String title, @Nullable Icon icon) { + public static int showYesNoDialog(@Nullable Project project, String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon) { try { if (canShowMacSheetPanel()) { return MacMessages.getInstance().showYesNoDialog(title, message, YES_BUTTON, NO_BUTTON, @@ -423,7 +423,7 @@ public class Messages { @YesNoResult public static int showYesNoDialog(@Nullable Project project, String message, - @NotNull String title, + @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, @Nullable DialogWrapper.DoNotAskOption doNotAskOption) { try { @@ -446,7 +446,7 @@ public class Messages { * @return {@link #YES} if user pressed "Yes" or {@link #NO} if user pressed "No" button. */ @YesNoResult - public static int showYesNoDialog(@NotNull Component parent, String message, @NotNull String title, @Nullable Icon icon) { + public static int showYesNoDialog(@NotNull Component parent, String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon) { try { if (canShowMacSheetPanel()) { return MacMessages.getInstance().showYesNoDialog(title, message, YES_BUTTON, NO_BUTTON, SwingUtilities.getWindowAncestor(parent)); @@ -464,12 +464,12 @@ public class Messages { /** * Use this method only if you do not know project or component * - * @see #showYesNoDialog(com.intellij.openapi.project.Project, String, String, javax.swing.Icon) - * @see #showYesNoCancelDialog(java.awt.Component, String, String, javax.swing.Icon) + * @see #showYesNoDialog(Project, String, String, Icon) + * @see #showYesNoCancelDialog(Component, String, String, Icon) * @return {@link #YES} if user pressed "Yes" or {@link #NO} if user pressed "No" button. */ @YesNoResult - public static int showYesNoDialog(String message, @NotNull String title, @NotNull String yesText, @NotNull String noText, @Nullable Icon icon, + public static int showYesNoDialog(String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String yesText, @NotNull String noText, @Nullable Icon icon, @Nullable DialogWrapper.DoNotAskOption doNotAskOption) { try { if (canShowMacSheetPanel()) { @@ -493,11 +493,11 @@ public class Messages { * Use this method only if you do not know project or component * * @see #showYesNoDialog(Project, String, String, String, String, Icon) - * @see #showYesNoDialog(java.awt.Component, String, String, javax.swing.Icon) + * @see #showYesNoDialog(Component, String, String, Icon) * @return {@link #YES} if user pressed "Yes" or {@link #NO} if user pressed "No" button. */ @YesNoResult - public static int showYesNoDialog(String message, String title, String yesText, String noText, @Nullable Icon icon) { + public static int showYesNoDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, String yesText, String noText, @Nullable Icon icon) { return showYesNoDialog(message, title, yesText, noText, icon, null); } @@ -509,7 +509,7 @@ public class Messages { * @return {@link #YES} if user pressed "Yes" or {@link #NO} if user pressed "No" button. */ @YesNoResult - public static int showYesNoDialog(String message, @NotNull String title, @Nullable Icon icon) { + public static int showYesNoDialog(String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon) { try { if (canShowMacSheetPanel()) { return MacMessages.getInstance().showYesNoDialog(title, message, YES_BUTTON, NO_BUTTON, null); @@ -533,7 +533,7 @@ public class Messages { @OkCancelResult public static int showOkCancelDialog(Project project, String message, - @NotNull String title, + @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String okText, @NotNull String cancelText, Icon icon, @@ -556,7 +556,7 @@ public class Messages { * @return {@link #OK} if user pressed "Ok" or {@link #CANCEL} if user pressed "Cancel" button. */ @OkCancelResult - public static int showOkCancelDialog(Project project, String message, @NotNull String title, @NotNull String okText, @NotNull String cancelText, Icon icon) { + public static int showOkCancelDialog(Project project, String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String okText, @NotNull String cancelText, Icon icon) { return showOkCancelDialog(project, message, title, okText, cancelText, icon, null); } @@ -564,7 +564,7 @@ public class Messages { * @return {@link #OK} if user pressed "Ok" or {@link #CANCEL} if user pressed "Cancel" button. */ @OkCancelResult - public static int showOkCancelDialog(Project project, String message, String title, Icon icon) { + public static int showOkCancelDialog(Project project, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, Icon icon) { return showOkCancelDialog(project, message, title, OK_BUTTON, CANCEL_BUTTON, icon); } @@ -572,7 +572,7 @@ public class Messages { * @return {@link #OK} if user pressed "Ok" or {@link #CANCEL} if user pressed "Cancel" button. */ @OkCancelResult - public static int showOkCancelDialog(@NotNull Component parent, String message, @NotNull String title, @NotNull String okText, @NotNull String cancelText, Icon icon) { + public static int showOkCancelDialog(@NotNull Component parent, String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String okText, @NotNull String cancelText, Icon icon) { try { if (canShowMacSheetPanel()) { int result = @@ -590,7 +590,7 @@ public class Messages { * @return {@link #OK} if user pressed "Ok" or {@link #CANCEL} if user pressed "Cancel" button. */ @OkCancelResult - public static int showOkCancelDialog(@NotNull Component parent, String message, String title, Icon icon) { + public static int showOkCancelDialog(@NotNull Component parent, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, Icon icon) { return showOkCancelDialog(parent, message, title, OK_BUTTON, CANCEL_BUTTON, icon); } @@ -602,7 +602,7 @@ public class Messages { * @return {@link #OK} if user pressed "Ok" or {@link #CANCEL} if user pressed "Cancel" button. */ @OkCancelResult - public static int showOkCancelDialog(String message, String title, Icon icon) { + public static int showOkCancelDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, Icon icon) { return showOkCancelDialog(message, title, OK_BUTTON, CANCEL_BUTTON, icon, null); } @@ -614,7 +614,7 @@ public class Messages { * @return {@link #OK} if user pressed "Ok" or {@link #CANCEL} if user pressed "Cancel" button. */ @OkCancelResult - public static int showOkCancelDialog(String message, String title, String okText, String cancelText, Icon icon) { + public static int showOkCancelDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, String okText, String cancelText, Icon icon) { return showOkCancelDialog(message, title, okText, cancelText, icon, null); } @@ -626,7 +626,7 @@ public class Messages { * @return {@link #OK} if user pressed "Ok" or {@link #CANCEL} if user pressed "Cancel" button. */ @OkCancelResult - public static int showOkCancelDialog(String message, @NotNull String title, @NotNull String okText, @NotNull String cancelText, Icon icon, @Nullable DialogWrapper.DoNotAskOption doNotAskOption) { + public static int showOkCancelDialog(String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String okText, @NotNull String cancelText, Icon icon, @Nullable DialogWrapper.DoNotAskOption doNotAskOption) { try { if (canShowMacSheetPanel()) { int result = MacMessages.getInstance().showYesNoDialog(title, message, okText, cancelText, null, doNotAskOption); @@ -639,7 +639,7 @@ public class Messages { return showDialog(message, title, new String[]{okText, cancelText}, 0, icon, doNotAskOption) == 0 ? OK : CANCEL; } - public static int showCheckboxOkCancelDialog(String message, String title, String checkboxText, final boolean checked, + public static int showCheckboxOkCancelDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, String checkboxText, final boolean checked, final int defaultOptionIndex, final int focusedOptionIndex, Icon icon) { return showCheckboxMessageDialog(message, title, new String[]{OK_BUTTON, CANCEL_BUTTON}, checkboxText, checked, defaultOptionIndex, focusedOptionIndex, icon, @@ -651,7 +651,7 @@ public class Messages { }); } - public static int showCheckboxMessageDialog(String message, String title, @NotNull String[] options, String checkboxText, final boolean checked, + public static int showCheckboxMessageDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, String checkboxText, final boolean checked, final int defaultOptionIndex, final int focusedOptionIndex, Icon icon, @Nullable final PairFunction exitFunc) { if (isApplicationInUnitTestOrHeadless()) { @@ -666,11 +666,11 @@ public class Messages { } - public static int showTwoStepConfirmationDialog(String message, String title, String checkboxText, Icon icon) { + public static int showTwoStepConfirmationDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, String checkboxText, Icon icon) { return showCheckboxMessageDialog(message, title, new String[]{OK_BUTTON}, checkboxText, true, -1, -1, icon, null); } - public static void showErrorDialog(@Nullable Project project, @Nls String message, @Nls @NotNull String title) { + public static void showErrorDialog(@Nullable Project project, @Nls String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title) { try { if (canShowMacSheetPanel()) { MacMessages.getInstance().showErrorDialog(title, message, OK_BUTTON, WindowManager.getInstance().suggestParentWindow(project)); @@ -683,7 +683,7 @@ public class Messages { showDialog(project, message, title, new String[]{OK_BUTTON}, 0, getErrorIcon()); } - public static void showErrorDialog(@NotNull Component component, String message, @Nls @NotNull String title) { + public static void showErrorDialog(@NotNull Component component, String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title) { try { if (canShowMacSheetPanel()) { MacMessages.getInstance().showErrorDialog(title, message, OK_BUTTON, SwingUtilities.getWindowAncestor(component)); @@ -716,7 +716,7 @@ public class Messages { * @see #showErrorDialog(Project, String, String) * @see #showErrorDialog(Component, String, String) */ - public static void showErrorDialog(String message, @NotNull String title) { + public static void showErrorDialog(String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title) { try { if (canShowMacSheetPanel()) { MacMessages.getInstance().showErrorDialog(title, message, OK_BUTTON, null); @@ -729,7 +729,7 @@ public class Messages { showDialog(message, title, new String[]{OK_BUTTON}, 0, getErrorIcon()); } - public static void showWarningDialog(@Nullable Project project, String message, @NotNull String title) { + public static void showWarningDialog(@Nullable Project project, String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title) { try { if (canShowMacSheetPanel()) { MacMessages.getInstance().showErrorDialog(title, message, OK_BUTTON, WindowManager.getInstance().suggestParentWindow(project)); @@ -742,7 +742,7 @@ public class Messages { showDialog(project, message, title, new String[]{OK_BUTTON}, 0, getWarningIcon()); } - public static void showWarningDialog(@NotNull Component component, String message, @NotNull String title) { + public static void showWarningDialog(@NotNull Component component, String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title) { try { if (canShowMacSheetPanel()) { MacMessages.getInstance().showErrorDialog(title, message, OK_BUTTON, SwingUtilities.getWindowAncestor(component)); @@ -761,7 +761,7 @@ public class Messages { * @see #showWarningDialog(Project, String, String) * @see #showWarningDialog(Component, String, String) */ - public static void showWarningDialog(String message, @NotNull String title) { + public static void showWarningDialog(String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title) { try { if (canShowMacSheetPanel()) { MacMessages.getInstance().showErrorDialog(title, message, OK_BUTTON, null); @@ -785,7 +785,7 @@ public class Messages { @YesNoCancelResult public static int showYesNoCancelDialog(Project project, String message, - @NotNull String title, + @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String yes, @NotNull String no, @NotNull String cancel, @@ -807,7 +807,7 @@ public class Messages { * @return {@link #YES} if user pressed "Yes" or {@link #NO} if user pressed "No", or {@link #CANCEL} if user pressed "Cancel" button. */ @YesNoCancelResult - public static int showYesNoCancelDialog(Project project, String message, String title, Icon icon) { + public static int showYesNoCancelDialog(Project project, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, Icon icon) { return showYesNoCancelDialog(project, message, title, YES_BUTTON, NO_BUTTON, CANCEL_BUTTON, icon); } @@ -817,7 +817,7 @@ public class Messages { @YesNoCancelResult public static int showYesNoCancelDialog(@NotNull Component parent, String message, - @NotNull String title, + @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String yes, @NotNull String no, @NotNull String cancel, @@ -839,7 +839,7 @@ public class Messages { * @return {@link #YES} if user pressed "Yes" or {@link #NO} if user pressed "No", or {@link #CANCEL} if user pressed "Cancel" button. */ @YesNoCancelResult - public static int showYesNoCancelDialog(@NotNull Component parent, String message, String title, Icon icon) { + public static int showYesNoCancelDialog(@NotNull Component parent, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, Icon icon) { return showYesNoCancelDialog(parent, message, title, YES_BUTTON, NO_BUTTON, CANCEL_BUTTON, icon); } @@ -853,7 +853,7 @@ public class Messages { */ @YesNoCancelResult public static int showYesNoCancelDialog(String message, - @NotNull String title, + @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String yes, @NotNull String no, @NotNull String cancel, @@ -879,7 +879,7 @@ public class Messages { * @return {@link #YES} if user pressed "Yes" or {@link #NO} if user pressed "No", or {@link #CANCEL} if user pressed "Cancel" button. */ @YesNoCancelResult - public static int showYesNoCancelDialog(String message, String title, String yes, String no, String cancel, Icon icon) { + public static int showYesNoCancelDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, String yes, String no, String cancel, Icon icon) { return showYesNoCancelDialog(message, title, yes, no, cancel, icon, null); } @@ -891,7 +891,7 @@ public class Messages { * @return {@link #YES} if user pressed "Yes" or {@link #NO} if user pressed "No", or {@link #CANCEL} if user pressed "Cancel" button. */ @YesNoCancelResult - public static int showYesNoCancelDialog(String message, String title, Icon icon) { + public static int showYesNoCancelDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, Icon icon) { return showYesNoCancelDialog(message, title, YES_BUTTON, NO_BUTTON, CANCEL_BUTTON, icon); } @@ -899,7 +899,7 @@ public class Messages { * @return trimmed input string or null if user cancelled dialog. */ @Nullable - public static String showPasswordDialog(@Nls String message, @Nls String title) { + public static String showPasswordDialog(@Nls String message, @Nls(capitalization = Nls.Capitalization.Title) String title) { return showPasswordDialog(null, message, title, null, null); } @@ -907,7 +907,7 @@ public class Messages { * @return trimmed input string or null if user cancelled dialog. */ @Nullable - public static String showPasswordDialog(Project project, @Nls String message, @Nls String title, @Nullable Icon icon) { + public static String showPasswordDialog(Project project, @Nls String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon) { return showPasswordDialog(project, message, title, icon, null); } @@ -917,7 +917,7 @@ public class Messages { @Nullable public static String showPasswordDialog(@Nullable Project project, @Nls String message, - @Nls String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, @Nullable InputValidator validator) { if (isApplicationInUnitTestOrHeadless()) { @@ -934,7 +934,7 @@ public class Messages { * @return trimmed input string or null if user cancelled dialog. */ @Nullable - public static String showInputDialog(@Nullable Project project, String message, String title, @Nullable Icon icon) { + public static String showInputDialog(@Nullable Project project, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon) { return showInputDialog(project, message, title, icon, null, null); } @@ -942,7 +942,7 @@ public class Messages { * @return trimmed input string or null if user cancelled dialog. */ @Nullable - public static String showInputDialog(@NotNull Component parent, String message, String title, @Nullable Icon icon) { + public static String showInputDialog(@NotNull Component parent, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon) { return showInputDialog(parent, message, title, icon, null, null); } @@ -953,14 +953,14 @@ public class Messages { * @see #showInputDialog(Component, String, String, Icon) */ @Nullable - public static String showInputDialog(String message, String title, @Nullable Icon icon) { + public static String showInputDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon) { return showInputDialog(message, title, icon, null, null); } @Nullable public static String showInputDialog(@Nullable Project project, @Nls String message, - @Nls String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, @Nullable String initialValue, @Nullable InputValidator validator) { @@ -977,7 +977,7 @@ public class Messages { @Nullable public static String showInputDialog(Project project, @Nls String message, - @Nls String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, @Nullable String initialValue, @Nullable InputValidator validator, @@ -1008,7 +1008,7 @@ public class Messages { @Nullable public static String showInputDialog(@NotNull Component parent, String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, @Nullable String initialValue, @Nullable InputValidator validator) { @@ -1031,7 +1031,7 @@ public class Messages { */ @Nullable public static String showInputDialog(String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, @Nullable String initialValue, @Nullable InputValidator validator) { @@ -1048,7 +1048,7 @@ public class Messages { @Nullable public static String showMultilineInputDialog(Project project, String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable String initialValue, @Nullable Icon icon, @Nullable InputValidator validator) { @@ -1062,7 +1062,7 @@ public class Messages { @NotNull public static Pair showInputDialogWithCheckBox(String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, String checkboxText, boolean checked, boolean checkboxEnabled, @@ -1081,7 +1081,7 @@ public class Messages { @Nullable public static String showEditableChooseDialog(String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, String[] values, String initialValue, @@ -1102,7 +1102,7 @@ public class Messages { /** @deprecated It looks awful! */ @Deprecated - public static int showChooseDialog(String message, String title, String[] values, String initialValue, @Nullable Icon icon) { + public static int showChooseDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, String[] values, String initialValue, @Nullable Icon icon) { if (isApplicationInUnitTestOrHeadless()) { return ourTestImplementation.show(message); } @@ -1115,7 +1115,7 @@ public class Messages { /** @deprecated It looks awful! */ @Deprecated - public static int showChooseDialog(@NotNull Component parent, String message, String title, String[] values, String initialValue, Icon icon) { + public static int showChooseDialog(@NotNull Component parent, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, String[] values, String initialValue, Icon icon) { if (isApplicationInUnitTestOrHeadless()) { return ourTestImplementation.show(message); } @@ -1128,10 +1128,10 @@ public class Messages { /** * @deprecated It looks awful! - * @see com.intellij.openapi.ui.DialogWrapper#DialogWrapper(Project,boolean) + * @see DialogWrapper#DialogWrapper(Project,boolean) */ @Deprecated - public static int showChooseDialog(Project project, String message, String title, Icon icon, String[] values, String initialValue) { + public static int showChooseDialog(Project project, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, Icon icon, String[] values, String initialValue) { if (isApplicationInUnitTestOrHeadless()) { return ourTestImplementation.show(message); } @@ -1145,7 +1145,7 @@ public class Messages { /** * Shows dialog with given message and title, information icon {@link #getInformationIcon()} and OK button */ - public static void showInfoMessage(Component component, String message, @NotNull String title) { + public static void showInfoMessage(Component component, String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title) { try { if (canShowMacSheetPanel()) { MacMessages.getInstance().showOkMessageDialog(title, message, OK_BUTTON, SwingUtilities.getWindowAncestor(component)); @@ -1161,7 +1161,7 @@ public class Messages { /** * Shows dialog with given message and title, information icon {@link #getInformationIcon()} and OK button */ - public static void showInfoMessage(@Nullable Project project, @Nls String message, @Nls @NotNull String title) { + public static void showInfoMessage(@Nullable Project project, @Nls String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title) { try { if (canShowMacSheetPanel()) { MacMessages.getInstance().showOkMessageDialog(title, message, OK_BUTTON, WindowManager.getInstance().suggestParentWindow(project)); @@ -1182,7 +1182,7 @@ public class Messages { * @see #showInputDialog(Project, String, String, Icon, String, InputValidator) * @see #showInputDialog(Component, String, String, Icon, String, InputValidator) */ - public static void showInfoMessage(String message, @NotNull String title) { + public static void showInfoMessage(String message, @NotNull @Nls(capitalization = Nls.Capitalization.Title) String title) { try { if (canShowMacSheetPanel()) { MacMessages.getInstance().showOkMessageDialog(title, message, OK_BUTTON, null); @@ -1199,7 +1199,7 @@ public class Messages { * Shows dialog with text area to edit long strings that don't fit in text field. */ public static void showTextAreaDialog(final JTextField textField, - final String title, + final @Nls(capitalization = Nls.Capitalization.Title) String title, @NonNls final String dimensionServiceKey, final Function> parser, final Function, String> lineJoiner) { @@ -1236,7 +1236,7 @@ public class Messages { } } - public static void showTextAreaDialog(final JTextField textField, final String title, @NonNls final String dimensionServiceKey) { + public static void showTextAreaDialog(final JTextField textField, final @Nls(capitalization = Nls.Capitalization.Title) String title, @NonNls final String dimensionServiceKey) { showTextAreaDialog(textField, title, dimensionServiceKey, ParametersListUtil.DEFAULT_LINE_PARSER, ParametersListUtil.DEFAULT_LINE_JOINER); } @@ -1245,7 +1245,7 @@ public class Messages { public MoreInfoMessageDialog(Project project, String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable String moreInfo, @NotNull String[] options, int defaultOptionIndex, int focusedOptionIndex, Icon icon) { @@ -1291,13 +1291,13 @@ public class Messages { protected Icon myIcon; private MyBorderLayout myLayout; - public MessageDialog(@Nullable Project project, String message, String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon, boolean canBeParent) { + public MessageDialog(@Nullable Project project, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon, boolean canBeParent) { this(project, message, title, options, defaultOptionIndex, -1, icon, canBeParent); } public MessageDialog(@Nullable Project project, String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, int focusedOptionIndex, @@ -1308,23 +1308,23 @@ public class Messages { _init(title, message, options, defaultOptionIndex, focusedOptionIndex, icon, doNotAskOption); } - public MessageDialog(@Nullable Project project, String message, String title, @NotNull String[] options, int defaultOptionIndex, int focusedOptionIndex, @Nullable Icon icon, + public MessageDialog(@Nullable Project project, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, int focusedOptionIndex, @Nullable Icon icon, boolean canBeParent) { super(project, canBeParent); _init(title, message, options, defaultOptionIndex, focusedOptionIndex, icon, null); } - public MessageDialog(@NotNull Component parent, String message, String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon) { + public MessageDialog(@NotNull Component parent, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon) { this(parent, message, title, options, defaultOptionIndex, icon, false); } - public MessageDialog(@NotNull Component parent, String message, String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon, boolean canBeParent) { + public MessageDialog(@NotNull Component parent, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon, boolean canBeParent) { this(parent, message, title, options, defaultOptionIndex, -1, icon, canBeParent); } public MessageDialog(@NotNull Component parent, String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, int focusedOptionIndex, @@ -1334,21 +1334,21 @@ public class Messages { _init(title, message, options, defaultOptionIndex, focusedOptionIndex, icon, null); } - public MessageDialog(String message, String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon) { + public MessageDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon) { this(message, title, options, defaultOptionIndex, icon, false); } - public MessageDialog(String message, String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon, boolean canBeParent) { + public MessageDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, @Nullable Icon icon, boolean canBeParent) { super(canBeParent); _init(title, message, options, defaultOptionIndex, -1, icon, null); } - public MessageDialog(String message, String title, @NotNull String[] options, int defaultOptionIndex, int focusedOptionIndex, @Nullable Icon icon, @Nullable DoNotAskOption doNotAskOption) { + public MessageDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, int focusedOptionIndex, @Nullable Icon icon, @Nullable DoNotAskOption doNotAskOption) { super(false); _init(title, message, options, defaultOptionIndex, focusedOptionIndex, icon, doNotAskOption); } - public MessageDialog(String message, String title, @NotNull String[] options, int defaultOptionIndex, Icon icon, DoNotAskOption doNotAskOption) { + public MessageDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, int defaultOptionIndex, Icon icon, DoNotAskOption doNotAskOption) { this(message, title, options, defaultOptionIndex, -1, icon, doNotAskOption); } @@ -1360,7 +1360,7 @@ public class Messages { super(project, false); } - protected void _init(String title, + protected void _init(@Nls(capitalization = Nls.Capitalization.Title) String title, String message, @NotNull String[] options, int defaultOptionIndex, @@ -1627,7 +1627,7 @@ public class Messages { private final boolean myChecked; private final PairFunction myExitFunc; - public TwoStepConfirmationDialog(String message, String title, @NotNull String[] options, String checkboxText, boolean checked, final int defaultOptionIndexed, + public TwoStepConfirmationDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @NotNull String[] options, String checkboxText, boolean checked, final int defaultOptionIndexed, final int focusedOptionIndex, Icon icon, @Nullable final PairFunction exitFunc) { myCheckboxText = checkboxText; myChecked = checked; @@ -1697,7 +1697,7 @@ public class Messages { public InputDialog(@Nullable Project project, String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, @Nullable String initialValue, @Nullable InputValidator validator, @@ -1710,7 +1710,7 @@ public class Messages { public InputDialog(@Nullable Project project, String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, @Nullable String initialValue, @Nullable InputValidator validator) { @@ -1719,7 +1719,7 @@ public class Messages { public InputDialog(@NotNull Component parent, String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, @Nullable String initialValue, @Nullable InputValidator validator) { @@ -1729,7 +1729,7 @@ public class Messages { } public InputDialog(String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, @Nullable String initialValue, @Nullable InputValidator validator) { @@ -1855,7 +1855,7 @@ public class Messages { protected static class MultilineInputDialog extends InputDialog { public MultilineInputDialog(Project project, String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, @Nullable String initialValue, @Nullable InputValidator validator, @@ -1872,7 +1872,7 @@ public class Messages { protected static class PasswordInputDialog extends InputDialog { public PasswordInputDialog(String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, @Nullable InputValidator validator) { super(message, title, icon, null, validator); @@ -1880,7 +1880,7 @@ public class Messages { public PasswordInputDialog(Project project, String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, @Nullable InputValidator validator) { super(project, message, title, icon, null, validator); @@ -1896,7 +1896,7 @@ public class Messages { private JCheckBox myCheckBox; public InputDialogWithCheckbox(String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, String checkboxText, boolean checked, boolean checkboxEnabled, @@ -1939,7 +1939,7 @@ public class Messages { public ChooseDialog(Project project, String message, - String title, + @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, String[] values, String initialValue, @@ -1950,17 +1950,17 @@ public class Messages { myComboBox.setSelectedItem(initialValue); } - public ChooseDialog(Project project, String message, String title, @Nullable Icon icon, String[] values, String initialValue) { + public ChooseDialog(Project project, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, String[] values, String initialValue) { this(project, message, title, icon, values, initialValue, new String[]{OK_BUTTON, CANCEL_BUTTON}, 0); } - public ChooseDialog(@NotNull Component parent, String message, String title, @Nullable Icon icon, String[] values, String initialValue) { + public ChooseDialog(@NotNull Component parent, String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, String[] values, String initialValue) { super(parent, message, title, new String[]{OK_BUTTON, CANCEL_BUTTON}, 0, icon); myComboBox.setModel(new DefaultComboBoxModel(values)); myComboBox.setSelectedItem(initialValue); } - public ChooseDialog(String message, String title, @Nullable Icon icon, String[] values, String initialValue) { + public ChooseDialog(String message, @Nls(capitalization = Nls.Capitalization.Title) String title, @Nullable Icon icon, String[] values, String initialValue) { super(message, title, new String[]{OK_BUTTON, CANCEL_BUTTON}, 0, icon); myComboBox.setModel(new DefaultComboBoxModel(values)); myComboBox.setSelectedItem(initialValue); diff --git a/plugins/devkit/src/inspections/TitleCapitalizationInspection.java b/plugins/devkit/src/inspections/TitleCapitalizationInspection.java index a175ee77faf0..507f9f679e74 100644 --- a/plugins/devkit/src/inspections/TitleCapitalizationInspection.java +++ b/plugins/devkit/src/inspections/TitleCapitalizationInspection.java @@ -20,10 +20,7 @@ import com.intellij.codeInspection.*; import com.intellij.lang.properties.psi.Property; import com.intellij.lang.properties.references.PropertyReference; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.ReadonlyStatusHandler; import com.intellij.openapi.vfs.VirtualFile; @@ -31,7 +28,6 @@ import com.intellij.psi.*; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PropertyUtil; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -89,32 +85,6 @@ public class TitleCapitalizationInspection extends BaseJavaLocalInspectionTool { @Override public void visitMethodCallExpression(PsiMethodCallExpression expression) { - PsiReferenceExpression methodExpression = expression.getMethodExpression(); - String calledName = methodExpression.getReferenceName(); - if (calledName == null) return; - if ("setTitle".equals(calledName)) { - if (!isMethodOfClass(expression, DialogWrapper.class.getName(), FileChooserDescriptor.class.getName())) return; - PsiExpression[] args = expression.getArgumentList().getExpressions(); - if (args.length == 0) { - return; - } - checkCapitalization(args[0], holder, Nls.Capitalization.Title); - } - else if (calledName.startsWith("show") && (calledName.endsWith("Dialog") || calledName.endsWith("Message"))) { - if (!isMethodOfClass(expression, Messages.class.getName())) return; - PsiExpression[] args = expression.getArgumentList().getExpressions(); - PsiMethod psiMethod = expression.resolveMethod(); - assert psiMethod != null; - PsiParameter[] parameters = psiMethod.getParameterList().getParameters(); - for (int i = 0, parametersLength = parameters.length; i < parametersLength; i++) { - PsiParameter parameter = parameters[i]; - if ("title".equals(parameter.getName()) && i < args.length) { - checkCapitalization(args[i], holder, Nls.Capitalization.Title); - break; - } - } - } - PsiMethod psiMethod = expression.resolveMethod(); if (psiMethod != null) { PsiExpression[] args = expression.getArgumentList().getExpressions(); @@ -147,19 +117,6 @@ public class TitleCapitalizationInspection extends BaseJavaLocalInspectionTool { } } - private static boolean isMethodOfClass(PsiMethodCallExpression expression, String... classNames) { - PsiMethod psiMethod = expression.resolveMethod(); - if (psiMethod == null) { - return false; - } - PsiClass containingClass = psiMethod.getContainingClass(); - if (containingClass == null) { - return false; - } - String name = containingClass.getQualifiedName(); - return ArrayUtil.contains(name, classNames); - } - @Nullable private static String getTitleValue(@Nullable PsiExpression arg) { if (arg instanceof PsiLiteralExpression) {