From 14aa2e2b2976d00711713b61ec90de7f1bba7fe3 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 14 Feb 2013 11:52:36 +0400 Subject: [PATCH] notnull --- .../actions/GenerateAntBuildDialog.java | 2 + .../debugger/actions/ViewTextAction.java | 2 + .../intellij/debugger/ui/ExportDialog.java | 2 + .../intellij/debugger/ui/GetJPDADialog.java | 2 + .../debugger/ui/RunHotswapDialog.java | 2 + .../ui/StatementEvaluationDialog.java | 2 + .../util/projectWizard/JdkChooserPanel.java | 2 + ...ProjectStructureChooseLibrariesDialog.java | 1 + .../AnalyzeDependenciesDialog.java | 2 + .../quickfix/SideEffectWarningDialog.java | 4 ++ .../intention/impl/CreateClassDialog.java | 1 + .../ide/util/SuperMethodWarningDialog.java | 2 + .../AnonymousToInnerDialog.java | 2 + .../refactoring/copy/CopyClassDialog.java | 2 + .../extractMethod/ExtractMethodDialog.java | 2 + .../ExtractMethodObjectDialog.java | 2 + .../IntroduceConstantDialog.java | 2 + .../introduceField/IntroduceFieldDialog.java | 2 + .../EnclosingMethodSelectionDialog.java | 2 + .../IntroduceVariableDialog.java | 2 + .../migration/MigrationDialog.java | 2 + .../safeDelete/OverridingMethodsDialog.java | 2 + .../ui/FailedConversionsDialog.java | 2 + .../intellij/refactoring/ui/InfoDialog.java | 2 + .../ui/YesNoPreviewUsagesDialog.java | 2 + .../createTest/CreateTestDialog.java | 1 + .../intellij/unscramble/UnscrambleDialog.java | 2 + .../util/RefactoringMessageDialog.java | 2 + .../ManageCodeStyleSchemesDialog.java | 1 + .../printing/ExportToHTMLDialog.java | 2 + .../codeEditor/printing/PrintDialog.java | 2 + .../codeInsight/actions/LayoutCodeDialog.java | 1 + .../actions/LayoutProjectCodeDialog.java | 1 + .../template/impl/EditVariableDialog.java | 2 + .../intellij/execution/impl/RunDialog.java | 2 + .../findUsages/AbstractFindUsagesDialog.java | 1 + .../com/intellij/ide/macro/MacrosDialog.java | 2 + .../ide/todo/configurable/FilterDialog.java | 2 + .../com/intellij/ide/util/DeleteDialog.java | 3 ++ .../com/intellij/ide/util/MemberChooser.java | 1 + .../internal/ImageDuplicateResultsDialog.java | 1 + .../internal/psiView/PsiViewerDialog.java | 1 + .../openapi/util/registry/RegistryUi.java | 2 + .../copy/CopyFilesOrDirectoriesDialog.java | 2 + .../AbstractExtractMethodDialog.java | 2 + .../lang/ExtractIncludeDialog.java | 1 + .../MoveFilesOrDirectoriesDialog.java | 2 + .../safeDelete/SafeDeleteDialog.java | 2 + .../safeDelete/UnsafeUsagesDialog.java | 2 + .../refactoring/ui/ConflictsDialog.java | 1 + .../refactoring/ui/RefactoringDialog.java | 1 + .../intellij/tools/OutputFiltersDialog.java | 2 + .../com/intellij/tools/ToolEditorDialog.java | 1 + .../com/intellij/ui/debugger/UiDebugger.java | 1 + .../intellij/openapi/ui/DialogBuilder.java | 2 + .../intellij/openapi/ui/DialogWrapper.java | 53 ++++++++++++++----- .../vfs/newvfs/NewVirtualFileSystem.java | 1 + .../com/intellij/ui/AbstractFieldPanel.java | 2 + .../util/net/HTTPProxySettingsDialog.java | 2 + .../util/ui/OptionsMessageDialog.java | 2 + .../options/pathMacros/PathMacroEditor.java | 2 + .../intellij/diagnostic/IdeErrorsDialog.java | 1 + .../diagnostic/OutOfMemoryDialog.java | 2 + .../DisablePluginWarningDialog.java | 2 + .../ShowFeatureUsageStatisticsDialog.java | 2 + .../ui/AdaptiveTipDialog.java | 2 + .../masterKey/MasterPasswordDialog.java | 2 + .../plugins/InstalledPluginsManagerMain.java | 1 + .../ide/plugins/PluginHostsConfigurable.java | 2 + .../intellij/ide/util/ExportToFileUtil.java | 2 + .../src/com/intellij/ide/util/TipDialog.java | 2 + .../internal/focus/FocusTracesDialog.java | 2 + .../command/impl/CannotUndoReportDialog.java | 2 + .../diff/impl/external/BinaryDiffTool.java | 1 + .../impl/ui/KeyboardShortcutDialog.java | 2 + .../options/ex/SingleConfigurableEditor.java | 2 + .../newEditor/OptionsEditorDialog.java | 1 + .../project/impl/DefineMacrosDialog.java | 2 + .../ui/impl/DialogWrapperPeerFactoryImpl.java | 4 ++ .../updateSettings/impl/NewChannelDialog.java | 2 + .../updateSettings/impl/NoUpdatesDialog.java | 2 + .../updateSettings/impl/UpdateInfoDialog.java | 2 + .../openapi/vfs/ex/temp/TempFileSystem.java | 1 + .../vfs/impl/jar/JarFileSystemImpl.java | 9 +++- .../vfs/impl/local/LocalFileSystemBase.java | 1 + .../intellij/mock/MockLocalFileSystem.java | 1 + .../openapi/diff/impl/dir/DirDiffDialog.java | 2 + .../vcs/changes/UnversionedViewDialog.java | 2 + .../vcs/changes/VcsConfirmationDialog.java | 2 + .../committed/ChangesBrowserDialog.java | 2 + .../conflicts/ChangelistConflictDialog.java | 2 + .../patch/ApplyPatchDifferentiatedDialog.java | 1 + .../changes/ui/ChangeListViewerDialog.java | 2 + .../changes/ui/ChangelistMoveOfferDialog.java | 2 + .../changes/ui/CommitChangeListDialog.java | 2 + .../changes/ui/IgnoreUnversionedDialog.java | 2 + .../vcs/changes/ui/IgnoredSettingsDialog.java | 2 + .../VcsMappingConfigurationDialog.java | 1 + .../vcs/history/impl/VcsHistoryDialog.java | 2 + .../vcs/merge/MultipleFileMergeDialog.java | 2 + .../update/UpdateOrStatusOptionsDialog.java | 2 + .../evaluate/XDebuggerEvaluationDialog.java | 1 + .../config/explorer/SaveMetaTargetDialog.java | 2 + .../ui/ConfigureCvsGlobalSettingsDialog.java | 2 + .../ui/CvsConfigurationsListEditor.java | 3 ++ .../ui/CorruptedProjectFilesDialog.java | 2 + .../RestoreDirectoriesConfirmationDialog.java | 2 + .../GitBranchIsNotFullyMergedDialog.java | 2 + .../branch/GitSmartOperationDialog.java | 1 + .../src/git4idea/crlf/GitCrlfDialog.java | 2 + .../SelectRepositoryAndShowLogAction.java | 1 + .../push/GitRejectedPushUpdateDialog.java | 6 +-- .../ui/branch/GitCompareBranchesDialog.java | 1 + .../git4idea/util/UntrackedFilesNotifier.java | 1 + .../github/ui/GitHubCreateGistDialog.java | 1 + .../plugins/github/ui/GithubLoginDialog.java | 2 + .../plugins/github/ui/GithubShareDialog.java | 2 + .../intentions/GroovyCreateClassDialog.java | 2 + .../groovy/mvc/MvcRunTargetDialog.java | 1 + .../method/GroovyExtractMethodDialog.java | 1 + .../zmlx/hg4idea/ui/HgGlobalStatusDialog.java | 2 + .../extract/SelectMavenProjectDialog.java | 1 + .../introduce/IntroducePropertyDialog.java | 1 + .../indices/MavenArtifactSearchDialog.java | 1 + .../navigator/SelectMavenProjectDialog.java | 2 + .../references/I18nizeQuickFixDialog.java | 1 + .../dialogs/AddRepositoryLocationDialog.java | 2 + .../idea/svn/dialogs/ChangeFormatDialog.java | 2 + .../idea/svn/dialogs/CheckoutDialog.java | 2 + .../idea/svn/dialogs/CopyDialog.java | 2 + .../idea/svn/dialogs/ImportDialog.java | 2 + .../idea/svn/dialogs/LockDialog.java | 2 + .../svn/dialogs/RepositoryBrowserDialog.java | 1 + .../svn/dialogs/SSHCredentialsDialog.java | 2 + .../svn/dialogs/SSLCredentialsDialog.java | 2 + .../SelectCreateExternalTargetDialog.java | 2 + .../idea/svn/dialogs/SelectFilesDialog.java | 2 + .../svn/dialogs/SelectLocationDialog.java | 2 + .../idea/svn/dialogs/ServerSSHDialog.java | 1 + .../idea/svn/dialogs/ServerSSLDialog.java | 2 + .../idea/svn/dialogs/SetPropertyDialog.java | 2 + .../idea/svn/dialogs/ShareDialog.java | 2 + .../svn/dialogs/SimpleCredentialsDialog.java | 2 + .../idea/svn/dialogs/ToBeMergedDialog.java | 2 + .../idea/svn/dialogs/UpgradeFormatDialog.java | 2 + .../dialogs/UserNameCredentialsDialog.java | 2 + .../palette/ComponentItemDialog.java | 1 + .../editors/string/KeyChooserDialog.java | 1 + .../snapShooter/CreateSnapShotAction.java | 2 + .../IntroduceParameterDialog.java | 2 + .../xpathView/ui/ModeSwitchableDialog.java | 2 + .../relaxNG/convert/ConvertSchemaDialog.java | 2 + 152 files changed, 310 insertions(+), 21 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java b/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java index 1cd1c3928851..eb17b844e542 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java @@ -35,6 +35,7 @@ import com.intellij.util.ListWithSelection; import com.intellij.util.ui.ComboBoxTableCellEditor; import com.intellij.util.ui.Table; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.table.AbstractTableModel; @@ -350,6 +351,7 @@ public class GenerateAntBuildDialog extends DialogWrapper { } } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ViewTextAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/ViewTextAction.java index e195ff9dd750..780096c0ccda 100644 --- a/java/debugger/impl/src/com/intellij/debugger/actions/ViewTextAction.java +++ b/java/debugger/impl/src/com/intellij/debugger/actions/ViewTextAction.java @@ -27,6 +27,7 @@ import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.EditorTextField; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -62,6 +63,7 @@ public class ViewTextAction extends BaseValueAction { myTextViewer.setText(text); } + @NotNull protected Action[] createActions() { return new Action[] {getCancelAction()}; } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/ExportDialog.java b/java/debugger/impl/src/com/intellij/debugger/ui/ExportDialog.java index 535853d51ee9..8e6b2cd54029 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/ExportDialog.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/ExportDialog.java @@ -42,6 +42,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.ScrollPaneFactory; import com.sun.jdi.*; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -77,6 +78,7 @@ public class ExportDialog extends DialogWrapper { setHorizontalStretch(1.5f); } + @NotNull protected Action[] createActions(){ return new Action[]{getOKAction(), myCopyToClipboardAction, getCancelAction(), getHelpAction()}; } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/GetJPDADialog.java b/java/debugger/impl/src/com/intellij/debugger/ui/GetJPDADialog.java index c88c008288ff..468dd1c246e4 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/GetJPDADialog.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/GetJPDADialog.java @@ -27,6 +27,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.DoubleClickListener; import com.intellij.ui.JBColor; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -42,6 +43,7 @@ public class GetJPDADialog extends DialogWrapper { init(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction()}; } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/RunHotswapDialog.java b/java/debugger/impl/src/com/intellij/debugger/ui/RunHotswapDialog.java index 36a5351162e6..b4aeec987d2f 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/RunHotswapDialog.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/RunHotswapDialog.java @@ -25,6 +25,7 @@ import com.intellij.openapi.ui.MultiLineLabelUI; import com.intellij.ui.IdeBorderFactory; import com.intellij.util.ui.OptionsDialog; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -98,6 +99,7 @@ public class RunHotswapDialog extends OptionsDialog { return true; } + @NotNull protected Action[] createActions(){ setOKButtonText(CommonBundle.getYesButtonText()); setCancelButtonText(CommonBundle.getNoButtonText()); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/StatementEvaluationDialog.java b/java/debugger/impl/src/com/intellij/debugger/ui/StatementEvaluationDialog.java index b8de25ab29c8..653f24f75eb7 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/StatementEvaluationDialog.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/StatementEvaluationDialog.java @@ -38,6 +38,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiWhiteSpace; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -167,6 +168,7 @@ public class StatementEvaluationDialog extends EvaluationDialog{ mySwitchAction.setEnabled(true); } + @NotNull protected Action[] createActions(){ return new Action[]{getOKAction(), getCancelAction(), mySwitchAction, getHelpAction() }; } diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java index a05f325abc90..3ea1bcf567c5 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java @@ -37,6 +37,7 @@ import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; import gnu.trove.TIntArrayList; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -282,6 +283,7 @@ public class JdkChooserPanel extends JPanel { return JdkChooserPanel.this; } + @NotNull protected Action[] createActions() { return new Action[]{new ConfigureAction(), getOKAction(), getCancelAction()}; } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ProjectStructureChooseLibrariesDialog.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ProjectStructureChooseLibrariesDialog.java index a5bfdd191f19..680e5a968d27 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ProjectStructureChooseLibrariesDialog.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/ProjectStructureChooseLibrariesDialog.java @@ -125,6 +125,7 @@ public class ProjectStructureChooseLibrariesDialog extends ChooseLibrariesFromTa return library.getName(); } + @NotNull @Override protected Action[] createActions() { if (SystemInfo.isMac) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesDialog.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesDialog.java index afae2c50121c..db1578d0ba8a 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesDialog.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesDialog.java @@ -19,6 +19,7 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.module.Module; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Disposer; +import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -54,6 +55,7 @@ public class AnalyzeDependenciesDialog extends DialogWrapper { /** * {@inheritDoc} */ + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction()}; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SideEffectWarningDialog.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SideEffectWarningDialog.java index 8da93c134c2b..5a15f0f7ee84 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SideEffectWarningDialog.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SideEffectWarningDialog.java @@ -21,6 +21,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.psi.PsiVariable; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -53,6 +54,7 @@ public class SideEffectWarningDialog extends DialogWrapper { } + @NotNull @Override protected Action[] createActions() { List actions = new ArrayList(); @@ -97,11 +99,13 @@ public class SideEffectWarningDialog extends DialogWrapper { return actions.toArray(new Action[actions.size()]); } + @NotNull @Override protected Action getCancelAction() { return myCancelAllAction; } + @NotNull @Override protected Action getOKAction() { return myRemoveAllAction; diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassDialog.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassDialog.java index 2aa865d316c6..2f4ff88fddf0 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassDialog.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassDialog.java @@ -126,6 +126,7 @@ public class CreateClassDialog extends DialogWrapper { return false; } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction()}; diff --git a/java/java-impl/src/com/intellij/ide/util/SuperMethodWarningDialog.java b/java/java-impl/src/com/intellij/ide/util/SuperMethodWarningDialog.java index eb83161cacaa..15c17f6cc639 100644 --- a/java/java-impl/src/com/intellij/ide/util/SuperMethodWarningDialog.java +++ b/java/java-impl/src/com/intellij/ide/util/SuperMethodWarningDialog.java @@ -20,6 +20,7 @@ import com.intellij.ide.IdeBundle; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -55,6 +56,7 @@ class SuperMethodWarningDialog extends DialogWrapper { init(); } + @NotNull protected Action[] createActions(){ return new Action[]{getOKAction(),new NoAction(),getCancelAction()}; } diff --git a/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerDialog.java b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerDialog.java index 5a8a050ea450..3f6d15814df7 100644 --- a/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerDialog.java @@ -35,6 +35,7 @@ import com.intellij.ui.NonFocusableCheckBox; import com.intellij.util.Function; import com.intellij.util.containers.HashMap; import com.intellij.util.ui.FormBuilder; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -105,6 +106,7 @@ class AnonymousToInnerDialog extends DialogWrapper{ myNameField.selectNameWithoutExtension(); } + @NotNull protected Action[] createActions(){ return new Action[]{getOKAction(),getCancelAction(),getHelpAction()}; } diff --git a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java index 1465aa097d49..b8d1f1770cd6 100644 --- a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java @@ -37,6 +37,7 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.ui.FormBuilder; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -84,6 +85,7 @@ class CopyClassDialog extends DialogWrapper{ myNameField.selectAll(); } + @NotNull protected Action[] createActions(){ return new Action[]{getOKAction(),getCancelAction(),getHelpAction()}; } diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java index 35e7ffafbfb9..5e64113cfda7 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java @@ -41,6 +41,7 @@ import com.intellij.util.VisibilityUtil; import com.intellij.util.containers.MultiMap; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.border.Border; @@ -142,6 +143,7 @@ public class ExtractMethodDialog extends AbstractExtractDialog { return myCbChainedConstructor != null && myCbChainedConstructor.isSelected(); } + @NotNull protected Action[] createActions() { if (myHelpId != null) { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectDialog.java b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectDialog.java index 92f992e7914a..b5a9099c8c14 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectDialog.java @@ -33,6 +33,7 @@ import com.intellij.util.VisibilityUtil; import com.intellij.util.containers.MultiMap; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -126,6 +127,7 @@ public class ExtractMethodObjectDialog extends AbstractExtractDialog { return false; } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java index ca2009d89145..553610f7e0fa 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java @@ -55,6 +55,7 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.ui.UIUtil; import gnu.trove.THashSet; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -163,6 +164,7 @@ class IntroduceConstantDialog extends DialogWrapper { return myTypeSelector.getSelectedType(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldDialog.java index 0aaad5f3608f..27ad6be98620 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldDialog.java @@ -32,6 +32,7 @@ import com.intellij.refactoring.ui.*; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.refactoring.util.RefactoringMessageUtil; import com.intellij.util.ArrayUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -125,6 +126,7 @@ class IntroduceFieldDialog extends DialogWrapper { } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java index e8518f3d6300..346b1571f690 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java @@ -32,6 +32,7 @@ import com.intellij.refactoring.ui.MethodCellRenderer; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -62,6 +63,7 @@ public class EnclosingMethodSelectionDialog extends DialogWrapper { } } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction()/*, getHelpAction()*/}; } diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java index 74782d91cb3c..99b2d6a096a1 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java @@ -29,6 +29,7 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.ui.*; import com.intellij.ui.NonFocusableCheckBox; import com.intellij.ui.StateRestoringCheckBox; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -82,6 +83,7 @@ class IntroduceVariableDialog extends DialogWrapper implements IntroduceVariable super.dispose(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java b/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java index 6bc6c77dcf27..ac3891bb0b1d 100644 --- a/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java @@ -23,6 +23,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.refactoring.HelpID; import com.intellij.refactoring.RefactoringBundle; import com.intellij.ui.ScrollPaneFactory; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.event.ActionEvent; @@ -56,6 +57,7 @@ public class MigrationDialog extends DialogWrapper{ init(); } + @NotNull protected Action[] createActions(){ return new Action[]{getOKAction(),getCancelAction(),getHelpAction()}; } diff --git a/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java b/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java index 89c7c3b2af8d..4217acec0330 100644 --- a/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java @@ -32,6 +32,7 @@ import com.intellij.usageView.UsageInfo; import com.intellij.usages.impl.UsagePreviewPanel; import com.intellij.util.ui.Table; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -93,6 +94,7 @@ class OverridingMethodsDialog extends DialogWrapper { return result; } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction()/*, getHelpAction()*/}; } diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java index d42e32e368b6..02acc41ec8cc 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java @@ -21,6 +21,7 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -43,6 +44,7 @@ public class FailedConversionsDialog extends DialogWrapper { init(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), new ViewUsagesAction(), new CancelAction()}; } diff --git a/java/java-impl/src/com/intellij/refactoring/ui/InfoDialog.java b/java/java-impl/src/com/intellij/refactoring/ui/InfoDialog.java index c20ade157515..9cecc2200c88 100644 --- a/java/java-impl/src/com/intellij/refactoring/ui/InfoDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/ui/InfoDialog.java @@ -25,6 +25,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.project.Project; import com.intellij.util.ui.UIUtil; import com.intellij.refactoring.RefactoringBundle; +import org.jetbrains.annotations.NotNull; public class InfoDialog extends DialogWrapper{ private JCheckBox myShowInFutureCheckBox; @@ -42,6 +43,7 @@ public class InfoDialog extends DialogWrapper{ setOKButtonText(RefactoringBundle.message("ok.button")); } + @NotNull protected Action[] createActions(){ return new Action[]{getOKAction()}; } diff --git a/java/java-impl/src/com/intellij/refactoring/ui/YesNoPreviewUsagesDialog.java b/java/java-impl/src/com/intellij/refactoring/ui/YesNoPreviewUsagesDialog.java index 4867f3269eac..7f82cda4a051 100644 --- a/java/java-impl/src/com/intellij/refactoring/ui/YesNoPreviewUsagesDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/ui/YesNoPreviewUsagesDialog.java @@ -26,6 +26,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.MultiLineLabelUI; import com.intellij.openapi.ui.Messages; import com.intellij.refactoring.RefactoringBundle; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -80,6 +81,7 @@ public class YesNoPreviewUsagesDialog extends DialogWrapper { return panel; } + @NotNull protected Action[] createActions() { if(myHelpID != null){ return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; diff --git a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java index ac604a13516d..ffecd93366e6 100644 --- a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java +++ b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java @@ -257,6 +257,7 @@ public class CreateTestDialog extends DialogWrapper { return getClass().getName(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java b/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java index 1572e71f5180..4c51caf02632 100644 --- a/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java +++ b/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java @@ -45,6 +45,7 @@ import com.intellij.util.Consumer; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -207,6 +208,7 @@ public class UnscrambleDialog extends DialogWrapper { myEditorPanel.add(myStacktraceEditorPanel, BorderLayout.CENTER); } + @NotNull protected Action[] createActions(){ return new Action[]{createNormalizeTextAction(), getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/platform/lang-api/src/com/intellij/refactoring/util/RefactoringMessageDialog.java b/platform/lang-api/src/com/intellij/refactoring/util/RefactoringMessageDialog.java index ce1f58d924de..78f46071ca89 100644 --- a/platform/lang-api/src/com/intellij/refactoring/util/RefactoringMessageDialog.java +++ b/platform/lang-api/src/com/intellij/refactoring/util/RefactoringMessageDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.MultiLineLabelUI; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -42,6 +43,7 @@ public class RefactoringMessageDialog extends DialogWrapper { init(); } + @NotNull @Override protected Action[] createActions() { List actions = new ArrayList(); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/ManageCodeStyleSchemesDialog.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/ManageCodeStyleSchemesDialog.java index 28f3044a6747..a4c5d97da8b6 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/ManageCodeStyleSchemesDialog.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/ManageCodeStyleSchemesDialog.java @@ -153,6 +153,7 @@ public class ManageCodeStyleSchemesDialog extends DialogWrapper { return mySchemesTableModel.getSchemeAt(row); } + @NotNull @Override protected Action[] createActions() { return new Action[]{}; diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLDialog.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLDialog.java index 70449b615abd..1730017bb1e8 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLDialog.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/ExportToHTMLDialog.java @@ -28,6 +28,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.LabeledComponent; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.ui.OptionGroup; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.event.ActionEvent; @@ -183,6 +184,7 @@ public class ExportToHTMLDialog extends DialogWrapper { } } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(),getCancelAction(), getHelpAction()}; } diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintDialog.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintDialog.java index 03adf428bf97..68edb7229b26 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintDialog.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintDialog.java @@ -22,6 +22,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.TabbedPaneWrapper; import com.intellij.ui.MappingListCellRenderer; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -632,6 +633,7 @@ class PrintDialog extends DialogWrapper { } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(),getCancelAction(), new ApplyAction(), getHelpAction()}; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutCodeDialog.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutCodeDialog.java index 5e6158280f8a..8f46f242e817 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutCodeDialog.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutCodeDialog.java @@ -208,6 +208,7 @@ public class LayoutCodeDialog extends DialogWrapper { return OptionsDialog.addDoNotShowCheckBox(southPanel, myDoNotAskMeCheckBox); } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java index 4efa3e0108e7..638a22526f80 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/LayoutProjectCodeDialog.java @@ -79,6 +79,7 @@ public class LayoutProjectCodeDialog extends DialogWrapper { return panel; } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java index 14c49eb6bcc0..2efa78c5d9dd 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java @@ -30,6 +30,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.ToolbarDecorator; import com.intellij.ui.table.JBTable; import com.intellij.util.ui.EditableModel; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.table.AbstractTableModel; @@ -57,6 +58,7 @@ class EditVariableDialog extends DialogWrapper { setOKButtonText(CommonBundle.getOkButtonText()); } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java b/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java index 199f5ca336ae..febce83826c7 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunDialog.java @@ -28,6 +28,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -56,6 +57,7 @@ public class RunDialog extends DialogWrapper implements RunConfigurable.RunDialo myConfigurable.reset(); } + @NotNull protected Action[] createActions(){ return new Action[]{getOKAction(),getCancelAction(),new ApplyAction(),getHelpAction()}; } diff --git a/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java b/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java index 7fb70e99858e..d1bae2c48f57 100644 --- a/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java +++ b/platform/lang-impl/src/com/intellij/find/findUsages/AbstractFindUsagesDialog.java @@ -89,6 +89,7 @@ public abstract class AbstractFindUsagesDialog extends DialogWrapper { setTitle(isSingleFile ? FindBundle.message("find.usages.in.file.dialog.title") : FindBundle.message("find.usages.dialog.title")); } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; diff --git a/platform/lang-impl/src/com/intellij/ide/macro/MacrosDialog.java b/platform/lang-impl/src/com/intellij/ide/macro/MacrosDialog.java index 8fc1ce7fa6f8..7cd2f0086745 100644 --- a/platform/lang-impl/src/com/intellij/ide/macro/MacrosDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/macro/MacrosDialog.java @@ -27,6 +27,7 @@ import com.intellij.ui.DoubleClickListener; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SeparatorFactory; import com.intellij.ui.components.JBList; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -99,6 +100,7 @@ public final class MacrosDialog extends DialogWrapper { } } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(),getCancelAction(),getHelpAction()}; } diff --git a/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java b/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java index b0013ee44732..b17c648948e6 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java @@ -26,6 +26,7 @@ import com.intellij.psi.search.TodoPattern; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.Table; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.border.Border; @@ -106,6 +107,7 @@ class FilterDialog extends DialogWrapper { super.doOKAction(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/platform/lang-impl/src/com/intellij/ide/util/DeleteDialog.java b/platform/lang-impl/src/com/intellij/ide/util/DeleteDialog.java index fad5071a8edb..5e92dc385f90 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DeleteDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DeleteDialog.java @@ -25,6 +25,7 @@ import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringSettings; import com.intellij.refactoring.safeDelete.SafeDeleteHandler; import com.intellij.ui.StateRestoringCheckBox; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -63,10 +64,12 @@ public class DeleteDialog extends DialogWrapper { return myCbSearchInNonJava.isSelected(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction()/*, getHelpAction()*/}; } + @NotNull @Override protected Action getOKAction() { Action result = super.getOKAction(); diff --git a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java index 8706f277f50e..902de6c5339b 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java +++ b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java @@ -235,6 +235,7 @@ public class MemberChooser extends DialogWrapper implemen } + @NotNull protected Action[] createActions() { if (myAllowEmptySelection) { return new Action[]{getOKAction(), new SelectNoneAction(), getCancelAction()}; diff --git a/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java b/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java index 2e0d735664fe..97a1ac228118 100644 --- a/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java +++ b/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java @@ -90,6 +90,7 @@ public class ImageDuplicateResultsDialog extends DialogWrapper { TreeUtil.selectFirstNode(myTree); } + @NotNull @Override protected Action[] createActions() { final Action[] actions = new Action[4]; diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java index 4731f8faf215..9461ac0db41d 100644 --- a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java +++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java @@ -688,6 +688,7 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider, Disp return null; } + @NotNull @Override protected Action[] createActions() { AbstractAction copyPsi = new AbstractAction("Cop&y PSI") { diff --git a/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java b/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java index 6c939197b441..24d763d8d413 100644 --- a/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java +++ b/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java @@ -31,6 +31,7 @@ import com.intellij.ui.*; import com.intellij.ui.table.JBTable; import com.intellij.util.PlatformIcons; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -277,6 +278,7 @@ public class RegistryUi implements Disposable { return myTable; } + @NotNull @Override protected Action[] createActions() { return new Action[]{myRestoreDefaultsAction, new AbstractAction("Close") { diff --git a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesDialog.java b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesDialog.java index 1e87733585b8..a8bf00c996a5 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesDialog.java @@ -45,6 +45,7 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.ui.FormBuilder; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.DocumentEvent; @@ -144,6 +145,7 @@ public class CopyFilesOrDirectoriesDialog extends DialogWrapper { } } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractExtractMethodDialog.java b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractExtractMethodDialog.java index 1775dddfb567..8d4c5c6ad01e 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractExtractMethodDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractExtractMethodDialog.java @@ -23,6 +23,7 @@ import com.intellij.openapi.ui.Messages; import com.intellij.refactoring.RefactoringBundle; import com.intellij.ui.DocumentAdapter; import com.intellij.util.containers.HashMap; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.DocumentEvent; @@ -118,6 +119,7 @@ public class AbstractExtractMethodDialog extends DialogWrapper implements Extrac return map; } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; diff --git a/platform/lang-impl/src/com/intellij/refactoring/lang/ExtractIncludeDialog.java b/platform/lang-impl/src/com/intellij/refactoring/lang/ExtractIncludeDialog.java index 7f1524c7b073..f803603a8d98 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/lang/ExtractIncludeDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/lang/ExtractIncludeDialog.java @@ -177,6 +177,7 @@ public class ExtractIncludeDialog extends DialogWrapper { return ExtractIncludeFileBase.HELP_ID; } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java index 189d7baa8553..7244db19aeb4 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java @@ -47,6 +47,7 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.ui.FormBuilder; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.DocumentEvent; @@ -76,6 +77,7 @@ public class MoveFilesOrDirectoriesDialog extends DialogWrapper { init(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java index 81b18e654de4..261dc1561240 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteDialog.java @@ -26,6 +26,7 @@ import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.RefactoringSettings; import com.intellij.refactoring.util.TextOccurrencesUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -66,6 +67,7 @@ public class SafeDeleteDialog extends DialogWrapper { return false; } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java index b6572c7ea191..086b38f3c704 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java @@ -26,6 +26,7 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -44,6 +45,7 @@ public class UnsafeUsagesDialog extends DialogWrapper { init(); } + @NotNull protected Action[] createActions() { final ViewUsagesAction viewUsagesAction = new ViewUsagesAction(); diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java b/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java index cd503c97bfb7..75b61e282fee 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java @@ -101,6 +101,7 @@ public class ConflictsDialog extends DialogWrapper{ init(); } + @NotNull protected Action[] createActions(){ final Action okAction = getOKAction(); if (myElementConflictDescription == null) { diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/RefactoringDialog.java b/platform/lang-impl/src/com/intellij/refactoring/ui/RefactoringDialog.java index ebd5b2363834..954b846f908a 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/RefactoringDialog.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/RefactoringDialog.java @@ -119,6 +119,7 @@ public abstract class RefactoringDialog extends DialogWrapper { return true; } + @NotNull protected Action[] createActions() { List actions = new ArrayList(); actions.add(getRefactorAction()); diff --git a/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java b/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java index 43bc3dbfb42a..b6b34a9040c2 100644 --- a/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java +++ b/platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java @@ -23,6 +23,7 @@ import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.*; import com.intellij.ui.components.JBList; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -42,6 +43,7 @@ public class OutputFiltersDialog extends DialogWrapper { initGui(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java b/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java index 47d7e6f28461..513298d63879 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java @@ -168,6 +168,7 @@ public class ToolEditorDialog extends DialogWrapper { return panel; } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/UiDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/UiDebugger.java index 0f9c095f125c..46a84a8247f3 100644 --- a/platform/lang-impl/src/com/intellij/ui/debugger/UiDebugger.java +++ b/platform/lang-impl/src/com/intellij/ui/debugger/UiDebugger.java @@ -103,6 +103,7 @@ public class UiDebugger extends JPanel implements Disposable { return result; } + @NotNull @Override protected Action[] createActions() { return new Action[] {new AbstractAction("Close") { diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java index 2c8c1021e9b3..d3959dec60dd 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java @@ -318,7 +318,9 @@ public class DialogBuilder implements Disposable { } public void init() { super.init(); } + @NotNull public Action getOKAction() { return super.getOKAction(); } // Make it public + @NotNull public Action getCancelAction() { return super.getCancelAction(); } // Make it public protected JComponent createCenterPanel() { return myCenterPanel; } 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 5d5c4036fd73..32226af8e2e8 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java @@ -140,11 +140,12 @@ public abstract class DialogWrapper { return DialogWrapper.this.toString(); } + @Override public void dispose() { DialogWrapper.this.dispose(); } }; - private List myOptionsButtons = new ArrayList(); + private final List myOptionsButtons = new ArrayList(); private int myCurrentOptionsButtonIndex = -1; private boolean myResizeInProgress = false; private ComponentAdapter myResizeListener; @@ -237,6 +238,7 @@ public abstract class DialogWrapper { //validation private final Alarm myValidationAlarm = new Alarm(getValidationThreadToUse(), myDisposable); + @NotNull protected Alarm.ThreadToUse getValidationThreadToUse() { return Alarm.ThreadToUse.SWING_THREAD; } @@ -272,12 +274,13 @@ public abstract class DialogWrapper { myValidationDelay = delay; } - private void reportProblem(final ValidationInfo info) { + private void reportProblem(@NotNull final ValidationInfo info) { installErrorPainter(); myErrorPainter.setValidationInfo(info); if (! myErrorText.isTextSet(info.message)) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if (myDisposed) return; setErrorText(info.message); @@ -303,6 +306,7 @@ public abstract class DialogWrapper { myErrorPainter.setValidationInfo(null); if (! myErrorText.isTextSet(null)) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if (myDisposed) return; setErrorText(null); @@ -323,15 +327,15 @@ public abstract class DialogWrapper { myPeer.setUndecorated(undecorated); } - public final void addMouseListener(MouseListener listener) { + public final void addMouseListener(@NotNull MouseListener listener) { myPeer.addMouseListener(listener); } - public final void addMouseListener(MouseMotionListener listener) { + public final void addMouseListener(@NotNull MouseMotionListener listener) { myPeer.addMouseListener(listener); } - public final void addKeyListener(KeyListener listener) { + public final void addKeyListener(@NotNull KeyListener listener) { myPeer.addKeyListener(listener); } @@ -516,7 +520,8 @@ public abstract class DialogWrapper { return false; } - public static JPanel addDoNotShowCheckBox(JComponent southPanel, JCheckBox checkBox) { + @NotNull + public static JPanel addDoNotShowCheckBox(JComponent southPanel, @NotNull JCheckBox checkBox) { final JPanel panel = new JPanel(new BorderLayout()); JPanel wrapper = new JPanel(new GridBagLayout()); @@ -529,7 +534,7 @@ public abstract class DialogWrapper { return panel; } - private boolean hasFocusedAction(Action[] actions) { + private boolean hasFocusedAction(@NotNull Action[] actions) { for (Action action : actions) { if (action.getValue(FOCUSED_ACTION) != null && (Boolean)action.getValue(FOCUSED_ACTION)) { return true; @@ -539,7 +544,8 @@ public abstract class DialogWrapper { return false; } - private JPanel createButtons(Action[] actions, List buttons) { + @NotNull + private JPanel createButtons(@NotNull Action[] actions, @NotNull List buttons) { if (!UISettings.getShadowInstance().ALLOW_MERGE_BUTTONS) { final List actionList = new ArrayList(); for (Action action : actions) { @@ -618,7 +624,8 @@ public abstract class DialogWrapper { } } - } else { + } + else { button = new JButton(action); } @@ -681,7 +688,7 @@ public abstract class DialogWrapper { } } - protected DialogWrapperPeer createPeer(final Component parent, final boolean canBeParent) { + protected DialogWrapperPeer createPeer(@NotNull Component parent, final boolean canBeParent) { return DialogWrapperPeerFactory.getInstance().createPeer(this, parent, canBeParent); } @@ -765,6 +772,7 @@ public abstract class DialogWrapper { public static void unregisterKeyboardActions(final JRootPane rootPane) { new AwtVisitor(rootPane) { + @Override public boolean visit(final Component component) { if (component instanceof JComponent) { final JComponent eachComp = (JComponent)component; @@ -895,6 +903,7 @@ public abstract class DialogWrapper { } } + @NotNull protected Action[] createLeftSideActions() { return new Action[0]; } @@ -904,6 +913,7 @@ public abstract class DialogWrapper { * doOKAction() method. * @see #doOKAction */ + @NotNull protected Action getOKAction() { return myOKAction; } @@ -913,6 +923,7 @@ public abstract class DialogWrapper { * doCancelAction() method. * @see #doCancelAction */ + @NotNull protected Action getCancelAction() { return myCancelAction; } @@ -922,6 +933,7 @@ public abstract class DialogWrapper { * doHelpAction() method. * @see #doHelpAction */ + @NotNull protected Action getHelpAction() { return myHelpAction; } @@ -1139,7 +1151,7 @@ public abstract class DialogWrapper { @Override public void update(AnActionEvent e) { final Component owner = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner(); - e.getPresentation().setEnabled((owner instanceof JButton && owner.isEnabled())); + e.getPresentation().setEnabled(owner instanceof JButton && owner.isEnabled()); } }.registerCustomShortcutSet(CustomShortcutSet.fromString("ENTER"), root); } @@ -1148,7 +1160,8 @@ public abstract class DialogWrapper { if (myCurrentOptionsButtonIndex > 0) { myOptionsButtons.get(myCurrentOptionsButtonIndex).closePopup(); myCurrentOptionsButtonIndex++; - } else if (myOptionsButtons.size() > 0) { + } + else if (!myOptionsButtons.isEmpty()) { myCurrentOptionsButtonIndex = 0; } @@ -1160,6 +1173,7 @@ public abstract class DialogWrapper { void startTrackingValidation() { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if (!myValidationStarted && !myDisposed) { myValidationStarted = true; @@ -1172,6 +1186,7 @@ public abstract class DialogWrapper { protected final void initValidation() { myValidationAlarm.cancelAllRequests(); final Runnable validateRequest = new Runnable() { + @Override public void run() { if (myDisposed) return; final ValidationInfo result = doValidate(); @@ -1427,6 +1442,7 @@ public abstract class DialogWrapper { * You need this method ONLY for NON-MODAL dialogs. Otherwise, use {@link #show()} or {@link #showAndGet()}. * @return result callback */ + @NotNull public AsyncResult showAndGetOk() { final AsyncResult result = new AsyncResult(); @@ -1440,6 +1456,7 @@ public abstract class DialogWrapper { } myPeer.show().doWhenProcessed(new Runnable() { + @Override public void run() { result.setDone(isOK()); } @@ -1463,6 +1480,7 @@ public abstract class DialogWrapper { private void registerKeyboardShortcuts() { ActionListener cancelKeyboardAction = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { MenuSelectionManager menuSelectionManager = MenuSelectionManager.defaultManager(); MenuElement[] selectedPath = menuSelectionManager.getSelectedPath(); @@ -1471,7 +1489,7 @@ public abstract class DialogWrapper { } else { final StackingPopupDispatcher popupDispatcher = StackingPopupDispatcher.getInstance(); - if (ApplicationManager.getApplication() == null || (popupDispatcher != null && !popupDispatcher.isPopupFocused())) { + if (ApplicationManager.getApplication() == null || popupDispatcher != null && !popupDispatcher.isPopupFocused()) { doCancelAction(e); } } @@ -1487,6 +1505,7 @@ public abstract class DialogWrapper { if (ApplicationInfo.contextHelpAvailable()) { ActionListener helpAction = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { doHelpAction(); } @@ -1498,11 +1517,13 @@ public abstract class DialogWrapper { if (myButtons != null) { rootPane.registerKeyboardAction(new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { focusPreviousButton(); } }, KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); rootPane.registerKeyboardAction(new AbstractAction() { + @Override public void actionPerformed(ActionEvent e) { focusNextButton(); } @@ -1518,7 +1539,7 @@ public abstract class DialogWrapper { } } - private void registerForEveryKeyboardShortcut(ActionListener action, ShortcutSet shortcuts) { + private void registerForEveryKeyboardShortcut(ActionListener action, @NotNull ShortcutSet shortcuts) { for (Shortcut shortcut : shortcuts.getShortcuts()){ if (shortcut instanceof KeyboardShortcut) { KeyboardShortcut ks = (KeyboardShortcut)shortcut; @@ -1591,6 +1612,7 @@ public abstract class DialogWrapper { /** * {@inheritDoc} */ + @Override public void actionPerformed(ActionEvent e) { if (myClosed) return; if (myPerformAction) return; @@ -1678,6 +1700,7 @@ public abstract class DialogWrapper { putValue(NAME, CommonBundle.getHelpButtonText()); } + @Override public void actionPerformed(ActionEvent e) { doHelpAction(); } @@ -1697,6 +1720,7 @@ public abstract class DialogWrapper { myErrorTextAlarm.cancelAllRequests(); myErrorTextAlarm.addRequest(new Runnable() { + @Override public void run() { final String text = myLastErrorText; myErrorText.setError(text); @@ -1820,6 +1844,7 @@ public abstract class DialogWrapper { return StringUtil.equals(text, myText); } + @Override public Dimension getPreferredSize() { return myPrefSize == null ? myLabel.getPreferredSize() : myPrefSize; } diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/NewVirtualFileSystem.java b/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/NewVirtualFileSystem.java index f8da4536ebaa..bfe552770921 100644 --- a/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/NewVirtualFileSystem.java +++ b/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/NewVirtualFileSystem.java @@ -70,6 +70,7 @@ public abstract class NewVirtualFileSystem extends VirtualFileSystem implements return false; } + @NotNull protected abstract String extractRootPath(@NotNull String path); @Override diff --git a/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java b/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java index 95e8be04765f..60309cee6bfe 100644 --- a/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java +++ b/platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java @@ -23,6 +23,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.FixedSizeButton; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.util.PlatformIcons; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.DocumentEvent; @@ -172,6 +173,7 @@ public abstract class AbstractFieldPanel extends JPanel { init(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction()}; } diff --git a/platform/platform-api/src/com/intellij/util/net/HTTPProxySettingsDialog.java b/platform/platform-api/src/com/intellij/util/net/HTTPProxySettingsDialog.java index e4dc41ada40c..52dfa7e7e5ab 100644 --- a/platform/platform-api/src/com/intellij/util/net/HTTPProxySettingsDialog.java +++ b/platform/platform-api/src/com/intellij/util/net/HTTPProxySettingsDialog.java @@ -17,6 +17,7 @@ package com.intellij.util.net; import com.intellij.CommonBundle; import com.intellij.openapi.ui.DialogWrapper; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.event.ActionEvent; @@ -58,6 +59,7 @@ public class HTTPProxySettingsDialog extends DialogWrapper { return panel.createComponent(); } + @NotNull protected Action[] createActions() { return new Action[]{okAction, cancelAction}; } diff --git a/platform/platform-api/src/com/intellij/util/ui/OptionsMessageDialog.java b/platform/platform-api/src/com/intellij/util/ui/OptionsMessageDialog.java index bff71ff7789d..09d85a6cc60c 100644 --- a/platform/platform-api/src/com/intellij/util/ui/OptionsMessageDialog.java +++ b/platform/platform-api/src/com/intellij/util/ui/OptionsMessageDialog.java @@ -17,6 +17,7 @@ package com.intellij.util.ui; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.MultiLineLabelUI; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -39,6 +40,7 @@ public abstract class OptionsMessageDialog extends OptionsDialog{ protected abstract String getOkActionName(); protected abstract String getCancelActionName(); + @NotNull protected Action[] createActions() { final Action okAction = getOKAction(); final Action cancelAction = getCancelAction(); diff --git a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroEditor.java b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroEditor.java index a092d73c4f3a..04f9af775303 100644 --- a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroEditor.java +++ b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroEditor.java @@ -21,6 +21,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.TextComponentAccessor; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.ui.DocumentAdapter; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.DocumentEvent; @@ -90,6 +91,7 @@ public class PathMacroEditor extends DialogWrapper { return myNameField; } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java index 0354841ddb81..ecd5f2af9736 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java @@ -191,6 +191,7 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene public void entryWasRead() { } + @NotNull @Override protected Action[] createActions() { if (SystemInfo.isMac) { diff --git a/platform/platform-impl/src/com/intellij/diagnostic/OutOfMemoryDialog.java b/platform/platform-impl/src/com/intellij/diagnostic/OutOfMemoryDialog.java index e0fc2c5d608f..211fba6078f0 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/OutOfMemoryDialog.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/OutOfMemoryDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.ui.JBColor; import com.intellij.ui.components.JBLabel; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.event.ActionEvent; @@ -159,6 +160,7 @@ public class OutOfMemoryDialog extends DialogWrapper { return myContentPane; } + @NotNull protected Action[] createActions() { return new Action[]{myShutdownAction, myIgnoreAction}; } diff --git a/platform/platform-impl/src/com/intellij/diagnostic/errordialog/DisablePluginWarningDialog.java b/platform/platform-impl/src/com/intellij/diagnostic/errordialog/DisablePluginWarningDialog.java index eb9c60e5e8a8..8fad9455d48e 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/errordialog/DisablePluginWarningDialog.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/errordialog/DisablePluginWarningDialog.java @@ -4,6 +4,7 @@ import com.intellij.diagnostic.DiagnosticBundle; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.SystemInfo; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -40,6 +41,7 @@ public class DisablePluginWarningDialog extends DialogWrapper { return myContentPane; } + @NotNull @Override protected Action[] createActions() { if (SystemInfo.isMac) { diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java b/platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java index afcda8ebdb41..f7282096d960 100644 --- a/platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java +++ b/platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java @@ -33,6 +33,7 @@ import com.intellij.util.text.DateFormatUtil; import com.intellij.util.ui.ColumnInfo; import com.intellij.util.ui.ListTableModel; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -123,6 +124,7 @@ public class ShowFeatureUsageStatisticsDialog extends DialogWrapper { return "#com.intellij.featureStatistics.actions.ShowFeatureUsageStatisticsDialog"; } + @NotNull protected Action[] createActions() { return new Action[] {getCancelAction(), getHelpAction()}; } diff --git a/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java b/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java index e557dadc28dc..f6c4a8e99456 100644 --- a/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java +++ b/platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java @@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -68,6 +69,7 @@ public class AdaptiveTipDialog extends DialogWrapper { return panel; } + @NotNull protected Action[] createActions() { if (myFeatures.length == 1) { return new Action[] {getCancelAction()}; diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterPasswordDialog.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterPasswordDialog.java index 00ef372a5463..5e85fa9d5c32 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterPasswordDialog.java +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/masterKey/MasterPasswordDialog.java @@ -19,6 +19,7 @@ import com.intellij.ide.passwordSafe.MasterPasswordUnavailableException; import com.intellij.ide.passwordSafe.PasswordSafeException; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -86,6 +87,7 @@ public class MasterPasswordDialog extends DialogWrapper { /** * {@inheritDoc} */ + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(), new DialogWrapperExitAction("C&hange Password", CHANGE_USER_CODE), diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsManagerMain.java b/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsManagerMain.java index 58d2dcad2489..5aac9ab0cf9b 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsManagerMain.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsManagerMain.java @@ -386,6 +386,7 @@ public class InstalledPluginsManagerMain extends PluginManagerMain { setOKButtonMnemonic('C'); } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction()}; diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginHostsConfigurable.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginHostsConfigurable.java index 6b20d12107bb..94f7e518760c 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginHostsConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginHostsConfigurable.java @@ -34,6 +34,7 @@ import com.intellij.ui.DocumentAdapter; import com.intellij.ui.ToolbarDecorator; import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.DocumentEvent; @@ -174,6 +175,7 @@ public class PluginHostsConfigurable extends BaseConfigurable { super(parentComponent, message, title, icon, initialValue, validator); } + @NotNull protected Action[] createActions() { final Action[] actions = super.createActions(); final AbstractAction checkNowAction = new AbstractAction("Check Now") { diff --git a/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java b/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java index 2a80061602a7..b5fda7d4ebea 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java @@ -37,6 +37,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.wm.WindowManager; import com.intellij.util.SystemProperties; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -238,6 +239,7 @@ public class ExportToFileUtil { return myTfFile.getText(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), new CopyToClipboardAction(), getCancelAction()}; } diff --git a/platform/platform-impl/src/com/intellij/ide/util/TipDialog.java b/platform/platform-impl/src/com/intellij/ide/util/TipDialog.java index 6542dae2332d..7f500430d0c9 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/TipDialog.java +++ b/platform/platform-impl/src/com/intellij/ide/util/TipDialog.java @@ -19,6 +19,7 @@ package com.intellij.ide.util; import com.intellij.CommonBundle; import com.intellij.ide.IdeBundle; import com.intellij.openapi.ui.DialogWrapper; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.event.ActionEvent; @@ -38,6 +39,7 @@ public class TipDialog extends DialogWrapper{ init(); } + @NotNull protected Action[] createActions(){ return new Action[]{new PreviousTipAction(),new NextTipAction(),getCancelAction()}; } diff --git a/platform/platform-impl/src/com/intellij/internal/focus/FocusTracesDialog.java b/platform/platform-impl/src/com/intellij/internal/focus/FocusTracesDialog.java index 2e676d0edd6c..a7810c10b435 100644 --- a/platform/platform-impl/src/com/intellij/internal/focus/FocusTracesDialog.java +++ b/platform/platform-impl/src/com/intellij/internal/focus/FocusTracesDialog.java @@ -22,6 +22,7 @@ import com.intellij.openapi.wm.impl.FocusRequestInfo; import com.intellij.ui.JBColor; import com.intellij.ui.table.JBTable; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -92,6 +93,7 @@ public class FocusTracesDialog extends DialogWrapper { return myRequestsTable; } + @NotNull @Override protected Action[] createActions() { return new Action[] {getOKAction(), getCopyStackTraceAction()}; diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/CannotUndoReportDialog.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/CannotUndoReportDialog.java index f56f638867be..1ae5345f341f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/command/impl/CannotUndoReportDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/CannotUndoReportDialog.java @@ -23,6 +23,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -59,6 +60,7 @@ public class CannotUndoReportDialog extends DialogWrapper { init(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction()}; } diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/BinaryDiffTool.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/BinaryDiffTool.java index d4a6eb975852..f3fa24b53248 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/BinaryDiffTool.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/BinaryDiffTool.java @@ -64,6 +64,7 @@ public class BinaryDiffTool implements DiffTool { return "BinaryDiffDialog"; } + @NotNull @Override protected Action[] createActions() { final Action close = getCancelAction(); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java index de4f4900bf38..12ec09f39738 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java @@ -32,6 +32,7 @@ import com.intellij.ui.JBColor; import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.border.EmptyBorder; @@ -68,6 +69,7 @@ public class KeyboardShortcutDialog extends DialogWrapper { init(); } + @NotNull protected Action[] createActions(){ return new Action[]{getOKAction(),getCancelAction(),getHelpAction()}; } diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/SingleConfigurableEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/SingleConfigurableEditor.java index f5a763878d66..7b5248b7a9e1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/SingleConfigurableEditor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/SingleConfigurableEditor.java @@ -31,6 +31,7 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy; import com.intellij.util.Alarm; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -118,6 +119,7 @@ public class SingleConfigurableEditor extends DialogWrapper { } } + @NotNull protected Action[] createActions() { List actions = new ArrayList(); actions.add(getOKAction()); diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditorDialog.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditorDialog.java index 52d3ed48bedd..f814ab2edd1a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditorDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditorDialog.java @@ -237,6 +237,7 @@ public class OptionsEditorDialog extends DialogWrapper implements DataProvider{ super.doCancelAction(); } + @NotNull @Override protected Action[] createActions() { myApplyAction = new ApplyAction(); diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/DefineMacrosDialog.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/DefineMacrosDialog.java index cce1525ff51a..4645eb3004b1 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/impl/DefineMacrosDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/DefineMacrosDialog.java @@ -22,6 +22,7 @@ import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.Table; import gnu.trove.TObjectIntHashMap; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.table.AbstractTableModel; @@ -71,6 +72,7 @@ public class DefineMacrosDialog extends DialogWrapper{ super.doOKAction(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction()}; } diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerFactoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerFactoryImpl.java index 367d57d97d2e..3ee72033768b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerFactoryImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/DialogWrapperPeerFactoryImpl.java @@ -25,18 +25,22 @@ import org.jetbrains.annotations.Nullable; import java.awt.*; public class DialogWrapperPeerFactoryImpl extends DialogWrapperPeerFactory { + @Override public DialogWrapperPeer createPeer(DialogWrapper wrapper, @Nullable Project project, boolean canBeParent) { return new DialogWrapperPeerImpl(wrapper, project, canBeParent); } + @Override public DialogWrapperPeer createPeer(DialogWrapper wrapper, boolean canBeParent) { return new DialogWrapperPeerImpl(wrapper, canBeParent); } + @Override public DialogWrapperPeer createPeer(final DialogWrapper wrapper, final boolean canBeParent, final boolean tryToolkitModal) { return new DialogWrapperPeerImpl(wrapper, canBeParent, tryToolkitModal); } + @Override public DialogWrapperPeer createPeer(DialogWrapper wrapper, @NotNull Component parent, boolean canBeParent) { return new DialogWrapperPeerImpl(wrapper, parent, canBeParent); } diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NewChannelDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NewChannelDialog.java index 22b002594631..1e42e9d00ba5 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NewChannelDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NewChannelDialog.java @@ -23,6 +23,7 @@ import com.intellij.ui.BrowserHyperlinkListener; import com.intellij.ui.LicensingFacade; import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.event.ActionEvent; @@ -46,6 +47,7 @@ public class NewChannelDialog extends DialogWrapper { setCancelButtonText("Ignore This Update"); } + @NotNull @Override protected Action[] createActions() { Action remindLater = new AbstractAction("Remind Me Later") { diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NoUpdatesDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NoUpdatesDialog.java index 3943966791af..54d4c28d4930 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NoUpdatesDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NoUpdatesDialog.java @@ -19,6 +19,7 @@ import com.intellij.CommonBundle; import com.intellij.ide.IdeBundle; import com.intellij.ide.plugins.PluginManagerConfigurable; import com.intellij.openapi.application.ApplicationInfo; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.util.List; @@ -42,6 +43,7 @@ class NoUpdatesDialog extends AbstractUpdateDialog { return myUploadedPlugins == null ? CommonBundle.getCloseButtonText() : IdeBundle.message("update.plugins.update.action"); } + @NotNull protected Action[] createActions() { final Action cancelAction = getCancelAction(); if (myUploadedPlugins != null) { diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java index db7e354a9486..5c30639a30c4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java @@ -25,6 +25,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.BrowserHyperlinkListener; import com.intellij.ui.components.JBScrollPane; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.event.ActionEvent; @@ -50,6 +51,7 @@ class UpdateInfoDialog extends AbstractUpdateDialog { init(); } + @NotNull @Override protected Action[] createActions() { List actions = new ArrayList(); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/ex/temp/TempFileSystem.java b/platform/platform-impl/src/com/intellij/openapi/vfs/ex/temp/TempFileSystem.java index a8e93ae8bf1d..f6e84a1e2b50 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/ex/temp/TempFileSystem.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/ex/temp/TempFileSystem.java @@ -52,6 +52,7 @@ public class TempFileSystem extends NewVirtualFileSystem { return true; } + @NotNull @Override protected String extractRootPath(@NotNull final String path) { //return path.startsWith("/") ? "/" : ""; diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java index 8cc7491f6946..a2a0c9ebd7ce 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarFileSystemImpl.java @@ -30,6 +30,7 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.SystemProperties; import com.intellij.util.containers.ConcurrentHashSet; import com.intellij.util.messages.MessageBus; +import gnu.trove.THashMap; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -38,7 +39,10 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; public class JarFileSystemImpl extends JarFileSystem implements ApplicationComponent { private static final class JarFileSystemImplLock { } @@ -47,7 +51,7 @@ public class JarFileSystemImpl extends JarFileSystem implements ApplicationCompo private final Set myNoCopyJarPaths = SystemProperties.getBooleanProperty("idea.jars.nocopy", false) ? null : new ConcurrentHashSet(FileUtil.PATH_HASHING_STRATEGY); private File myNoCopyJarDir; - private final Map myHandlers = new HashMap(); + private final Map myHandlers = new THashMap(FileUtil.PATH_HASHING_STRATEGY); private String[] jarPathsCache; public JarFileSystemImpl(MessageBus bus) { @@ -214,6 +218,7 @@ public class JarFileSystemImpl extends JarFileSystem implements ApplicationCompo return super.extractPresentableUrl(StringUtil.trimEnd(path, JAR_SEPARATOR)); } + @NotNull @Override protected String extractRootPath(@NotNull final String path) { final int jarSeparatorIndex = path.indexOf(JAR_SEPARATOR); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java index 3cea49f9a8f3..61928b69ddc8 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java @@ -584,6 +584,7 @@ public abstract class LocalFileSystemBase extends LocalFileSystem { } } + @NotNull @Override protected String extractRootPath(@NotNull final String path) { if (path.isEmpty()) { diff --git a/platform/testFramework/src/com/intellij/mock/MockLocalFileSystem.java b/platform/testFramework/src/com/intellij/mock/MockLocalFileSystem.java index 8c18c9f34077..cfaf4a30679f 100644 --- a/platform/testFramework/src/com/intellij/mock/MockLocalFileSystem.java +++ b/platform/testFramework/src/com/intellij/mock/MockLocalFileSystem.java @@ -164,6 +164,7 @@ public class MockLocalFileSystem extends LocalFileSystem { return myDelegate.copyFile(requestor, virtualFile, newParent, copyName); } + @NotNull @Override protected String extractRootPath(@NotNull final String path) { return path; diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffDialog.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffDialog.java index 5db3cf4f0adc..823fed2579cd 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffDialog.java @@ -19,6 +19,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Disposer; import com.intellij.ui.table.JBTable; +import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -62,6 +63,7 @@ public class DirDiffDialog extends DialogWrapper { return myDiffPanel.getTable(); } + @NotNull @Override protected Action[] createActions() { return new Action[]{}; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UnversionedViewDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UnversionedViewDialog.java index 844f17fa5097..39925f364e8b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UnversionedViewDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UnversionedViewDialog.java @@ -39,6 +39,7 @@ import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.EditSourceOnDoubleClickHandler; import com.intellij.util.EditSourceOnEnterKeyHandler; import com.intellij.util.ui.tree.TreeUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.tree.DefaultTreeModel; @@ -89,6 +90,7 @@ public class UnversionedViewDialog extends DialogWrapper { myView.setMinimumSize(new Dimension(100, 100)); } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction()}; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsConfirmationDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsConfirmationDialog.java index 202e15ad9d72..5b3860523a91 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsConfirmationDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsConfirmationDialog.java @@ -21,6 +21,7 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.vcs.VcsShowConfirmationOption; import com.intellij.util.ui.OptionsDialog; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -72,6 +73,7 @@ public class VcsConfirmationDialog extends OptionsDialog { return myDoNotShowMessage; } + @NotNull @Override protected Action[] createActions() { final AbstractAction okAction = new AbstractAction(CommonBundle.getYesButtonText()) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesBrowserDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesBrowserDialog.java index b06fd4969b66..564cd6f41e93 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesBrowserDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesBrowserDialog.java @@ -25,6 +25,7 @@ import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.util.AsynchConsumer; import com.intellij.util.Consumer; import com.intellij.util.ui.AdjustComponentWhenShown; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -138,6 +139,7 @@ public class ChangesBrowserDialog extends DialogWrapper { } } + @NotNull @Override protected Action[] createActions() { if (myMode == Mode.Simple) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictDialog.java index a2566a51d3a8..cba973307ca5 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictDialog.java @@ -25,6 +25,7 @@ import com.intellij.openapi.vcs.changes.ChangeListManagerImpl; import com.intellij.openapi.vcs.readOnlyHandler.FileListRenderer; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.CollectionListModel; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.event.ActionEvent; @@ -99,6 +100,7 @@ public class ChangelistConflictDialog extends DialogWrapper { return ChangelistConflictResolution.IGNORE; } + @NotNull @Override protected Action[] createLeftSideActions() { return new Action[] { new AbstractAction("&Configure...") { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java index acd4a36f037f..969714f2cf1c 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java @@ -244,6 +244,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper { }; } + @NotNull @Override protected Action[] createActions() { if (myExecutors.isEmpty()) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java index 0266db61a412..14610702a547 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java @@ -45,6 +45,7 @@ import com.intellij.ui.SeparatorFactory; import com.intellij.util.NotNullFunction; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -208,6 +209,7 @@ public class ChangeListViewerDialog extends DialogWrapper implements DataProvide super.dispose(); } + @NotNull @Override protected Action[] createActions() { Action cancelAction = getCancelAction(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangelistMoveOfferDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangelistMoveOfferDialog.java index 56a3de7bf5ad..a6b862b0bf7f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangelistMoveOfferDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangelistMoveOfferDialog.java @@ -21,6 +21,7 @@ import com.intellij.openapi.ui.MultiLineLabelUI; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsConfiguration; import com.intellij.util.ui.OptionsDialog; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -39,6 +40,7 @@ public class ChangelistMoveOfferDialog extends OptionsDialog { init(); } + @NotNull protected Action[] createActions() { setOKButtonText(CommonBundle.getYesButtonText()); setCancelButtonText(CommonBundle.getNoButtonText()); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java index fd350017a906..7f9bace33588 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java @@ -598,11 +598,13 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj } } + @NotNull @Override protected Action getOKAction() { return new CommitAction(); } + @NotNull protected Action[] createActions() { final List actions = new ArrayList(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoreUnversionedDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoreUnversionedDialog.java index 6efc794c0780..4d5e95999330 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoreUnversionedDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoreUnversionedDialog.java @@ -30,6 +30,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.DocumentAdapter; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -91,6 +92,7 @@ public class IgnoreUnversionedDialog extends DialogWrapper { updateControls(); } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsDialog.java index ad7c03ccd7d6..0b2d4ce6339f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsDialog.java @@ -27,6 +27,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.vcs.VcsBundle; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -47,6 +48,7 @@ public class IgnoredSettingsDialog extends DialogWrapper { return myPanel.createComponent(); } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java index 748ddd1b3c7f..49f546728a59 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java @@ -137,6 +137,7 @@ public class VcsMappingConfigurationDialog extends DialogWrapper { pack(); } + @NotNull @Override protected Action[] createLeftSideActions() { return new Action[] { new ConfigureVcsAction() }; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java index 591cbd1a6268..2dbbf7357cf5 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java @@ -41,6 +41,7 @@ import com.intellij.util.ui.ColumnInfo; import com.intellij.util.ui.ListTableModel; import com.intellij.util.ui.SortableColumnModel; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -418,6 +419,7 @@ public class VcsHistoryDialog extends DialogWrapper implements DataProvider { HelpManager.getInstance().invokeHelp(myHelpId); } + @NotNull protected Action[] createActions() { Action okAction = getOKAction(); okAction.putValue(Action.NAME, VcsBundle.message("close.tab.action.name")); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java index 838a96b3d174..900238502211 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java @@ -191,11 +191,13 @@ public class MultipleFileMergeDialog extends DialogWrapper { return myRootPanel; } + @NotNull @Override protected Action[] createActions() { return new Action[]{getCancelAction()}; } + @NotNull @Override protected Action getCancelAction() { Action action = super.getCancelAction(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateOrStatusOptionsDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateOrStatusOptionsDialog.java index ea9ac7b45f1f..622cce228553 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateOrStatusOptionsDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateOrStatusOptionsDialog.java @@ -25,6 +25,7 @@ import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.ui.components.JBTabbedPane; import com.intellij.util.ui.OptionsDialog; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -109,6 +110,7 @@ public abstract class UpdateOrStatusOptionsDialog extends OptionsDialog { return myMainPanel; } + @NotNull protected Action[] createActions() { for(Configurable conf: myEnvToConfMap.values()) { if (conf.getHelpTopic() != null) { diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java index 574897f83417..9eedd89fae6f 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/XDebuggerEvaluationDialog.java @@ -126,6 +126,7 @@ public class XDebuggerEvaluationDialog extends DialogWrapper { evaluate(); } + @NotNull @Override protected Action[] createActions() { if (myEvaluator.isCodeFragmentEvaluationSupported()) { diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/SaveMetaTargetDialog.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/SaveMetaTargetDialog.java index 5fa3f3eecc24..55b160c6bf8c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/SaveMetaTargetDialog.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/SaveMetaTargetDialog.java @@ -25,6 +25,7 @@ import com.intellij.ui.ListUtil; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; import com.intellij.util.ArrayUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.ListSelectionEvent; @@ -56,6 +57,7 @@ public class SaveMetaTargetDialog extends DialogWrapper { return "#com.intellij.ant.explorer.SaveMetaTargetDialog"; } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction()}; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/ConfigureCvsGlobalSettingsDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/ConfigureCvsGlobalSettingsDialog.java index e096cd15cfec..951026ba0468 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/ConfigureCvsGlobalSettingsDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/ConfigureCvsGlobalSettingsDialog.java @@ -21,6 +21,7 @@ import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.InputException; +import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -64,6 +65,7 @@ public class ConfigureCvsGlobalSettingsDialog extends DialogWrapper { return myGlobalCvsSettingsPanel.getPreferredFocusedComponent(); } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationsListEditor.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationsListEditor.java index 86774bb232a8..aa83c8fe1094 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationsListEditor.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationsListEditor.java @@ -34,6 +34,7 @@ import com.intellij.ui.ToolbarDecorator; import com.intellij.ui.components.JBList; import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -108,6 +109,7 @@ public class CvsConfigurationsListEditor extends DialogWrapper implements DataPr } } + @NotNull @Override protected Action[] createLeftSideActions() { final AbstractAction globalSettingsAction = new AbstractAction(CvsBundle.message("button.text.global.settings")) { @@ -296,6 +298,7 @@ public class CvsConfigurationsListEditor extends DialogWrapper implements DataPr HelpManager.getInstance().invokeHelp("reference.versioncontrol.cvs.roots"); } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java index 67e0efcd8864..daee96dd6c7e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java @@ -29,6 +29,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Options; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.event.ActionEvent; @@ -75,6 +76,7 @@ public class CorruptedProjectFilesDialog extends DialogWrapper { return myPanel; } + @NotNull protected Action[] createActions() { return new Action[]{new SkipFile(), new GetFile(), new SkipAll(), new GetAll() // , new VisualMerge() diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/RestoreDirectoriesConfirmationDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/RestoreDirectoriesConfirmationDialog.java index 19246b039627..9fa801665ed1 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/RestoreDirectoriesConfirmationDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/RestoreDirectoriesConfirmationDialog.java @@ -19,6 +19,7 @@ import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; import com.intellij.openapi.ui.Messages; import com.intellij.util.ui.OptionsDialog; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -50,6 +51,7 @@ public class RestoreDirectoriesConfirmationDialog extends OptionsDialog{ return CvsApplicationLevelConfiguration.getInstance().SHOW_RESTORE_DIRECTORIES_CONFIRMATION; } + @NotNull protected Action[] createActions() { Action okAction = getOKAction(); UIUtil.setActionNameAndMnemonic(com.intellij.CvsBundle.message("button.text.close"), okAction); diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchIsNotFullyMergedDialog.java b/plugins/git4idea/src/git4idea/branch/GitBranchIsNotFullyMergedDialog.java index 0511bac7ed51..5d0f40a42d84 100644 --- a/plugins/git4idea/src/git4idea/branch/GitBranchIsNotFullyMergedDialog.java +++ b/plugins/git4idea/src/git4idea/branch/GitBranchIsNotFullyMergedDialog.java @@ -196,11 +196,13 @@ public class GitBranchIsNotFullyMergedDialog extends DialogWrapper { return rootPanel; } + @NotNull @Override protected Action[] createLeftSideActions() { return new Action[] { getOKAction() }; } + @NotNull @Override protected Action[] createActions() { Action cancelAction = getCancelAction(); diff --git a/plugins/git4idea/src/git4idea/branch/GitSmartOperationDialog.java b/plugins/git4idea/src/git4idea/branch/GitSmartOperationDialog.java index 02429cf2800e..1c37e2f7bb5f 100644 --- a/plugins/git4idea/src/git4idea/branch/GitSmartOperationDialog.java +++ b/plugins/git4idea/src/git4idea/branch/GitSmartOperationDialog.java @@ -82,6 +82,7 @@ class GitSmartOperationDialog extends DialogWrapper { init(); } + @NotNull @Override protected Action[] createLeftSideActions() { if (myForceButton) { diff --git a/plugins/git4idea/src/git4idea/crlf/GitCrlfDialog.java b/plugins/git4idea/src/git4idea/crlf/GitCrlfDialog.java index 4f50735d24e1..aeb7f949e3a3 100644 --- a/plugins/git4idea/src/git4idea/crlf/GitCrlfDialog.java +++ b/plugins/git4idea/src/git4idea/crlf/GitCrlfDialog.java @@ -24,6 +24,7 @@ import com.intellij.ui.components.labels.LinkLabel; import com.intellij.ui.components.labels.LinkListener; import com.intellij.util.ui.GridBag; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -58,6 +59,7 @@ public class GitCrlfDialog extends DialogWrapper { init(); } + @NotNull @Override protected Action[] createActions() { return new Action[] { getHelpAction(), getOKAction(), getCancelAction(), new DialogWrapperExitAction("Commit As Is", DONT_SET) }; diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java b/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java index cfac2d4f8d28..9d268670e12f 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java +++ b/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java @@ -294,6 +294,7 @@ public class SelectRepositoryAndShowLogAction extends AnAction { return myGitLog.getVisualComponent(); } + @NotNull @Override protected Action[] createActions() { return new Action[0]; diff --git a/plugins/git4idea/src/git4idea/push/GitRejectedPushUpdateDialog.java b/plugins/git4idea/src/git4idea/push/GitRejectedPushUpdateDialog.java index adb9ef64e966..8bdeb9ef5610 100644 --- a/plugins/git4idea/src/git4idea/push/GitRejectedPushUpdateDialog.java +++ b/plugins/git4idea/src/git4idea/push/GitRejectedPushUpdateDialog.java @@ -175,16 +175,12 @@ class GitRejectedPushUpdateDialog extends DialogWrapper { return currentBranch; } + @NotNull @Override protected Action[] createActions() { return new Action[] { getCancelAction(), myMergeAction, myRebaseAction}; } - @Override - protected Action getHelpAction() { - return super.getHelpAction(); - } - boolean shouldUpdateAll() { return myUpdateAllRoots.isSelected(); } diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesDialog.java b/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesDialog.java index 492e1560ccba..06d6a8358b0c 100644 --- a/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesDialog.java +++ b/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesDialog.java @@ -75,6 +75,7 @@ public class GitCompareBranchesDialog extends DialogWrapper { } // it is information dialog - no need to OK or Cancel. Close the dialog by clicking the cross button or pressing Esc. + @NotNull @Override protected Action[] createActions() { return new Action[0]; diff --git a/plugins/git4idea/src/git4idea/util/UntrackedFilesNotifier.java b/plugins/git4idea/src/git4idea/util/UntrackedFilesNotifier.java index f4b7ef62fee9..03c5e75c2431 100644 --- a/plugins/git4idea/src/git4idea/util/UntrackedFilesNotifier.java +++ b/plugins/git4idea/src/git4idea/util/UntrackedFilesNotifier.java @@ -83,6 +83,7 @@ public class UntrackedFilesNotifier { super(project, new ArrayList(untrackedFiles), StringUtil.stripHtml(dialogDesc, true), null, false, false, true); } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction()}; diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubCreateGistDialog.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubCreateGistDialog.java index 981dffa6a070..66d840b3d3c6 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubCreateGistDialog.java +++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GitHubCreateGistDialog.java @@ -41,6 +41,7 @@ public class GitHubCreateGistDialog extends DialogWrapper { init(); } + @NotNull protected Action[] createActions() { return new Action[] {getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubLoginDialog.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubLoginDialog.java index c7254bbec0bb..63e4b3c22f4a 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubLoginDialog.java +++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubLoginDialog.java @@ -2,6 +2,7 @@ package org.jetbrains.plugins.github.ui; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; +import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.github.GithubSettings; import org.jetbrains.plugins.github.GithubUtil; @@ -29,6 +30,7 @@ public class GithubLoginDialog extends DialogWrapper { init(); } + @NotNull protected Action[] createActions() { return new Action[] {getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubShareDialog.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubShareDialog.java index 630952288025..2f90e690ae25 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubShareDialog.java +++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubShareDialog.java @@ -3,6 +3,7 @@ package org.jetbrains.plugins.github.ui; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.text.StringUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.util.Set; @@ -30,6 +31,7 @@ public class GithubShareDialog extends DialogWrapper { updateOkButton(); } + @NotNull protected Action[] createActions() { return new Action[] {getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyCreateClassDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyCreateClassDialog.java index 5cb1196bcd38..e05be4766cd5 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyCreateClassDialog.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyCreateClassDialog.java @@ -37,6 +37,7 @@ import com.intellij.psi.PsiPackage; import com.intellij.refactoring.util.RefactoringMessageUtil; import com.intellij.ui.EditorTextField; import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.codeInspection.GroovyInspectionBundle; @@ -119,6 +120,7 @@ public class GroovyCreateClassDialog extends DialogWrapper { return myTargetDirectory; } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunTargetDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunTargetDialog.java index 668554bdcb6e..0b49605cb887 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunTargetDialog.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunTargetDialog.java @@ -68,6 +68,7 @@ public class MvcRunTargetDialog extends DialogWrapper { init(); } + @NotNull @Override protected Action[] createLeftSideActions() { boolean hasOneSupportedModule = false; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/method/GroovyExtractMethodDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/method/GroovyExtractMethodDialog.java index d51fa00eb136..5c2ce80fc5c6 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/method/GroovyExtractMethodDialog.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/extract/method/GroovyExtractMethodDialog.java @@ -214,6 +214,7 @@ public class GroovyExtractMethodDialog extends DialogWrapper { HelpManager.getInstance().invokeHelp(HelpID.EXTRACT_METHOD); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java index 5a1340c534ed..8b7a8e87fbba 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java @@ -15,6 +15,7 @@ package org.zmlx.hg4idea.ui; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.text.StringUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -34,6 +35,7 @@ public class HgGlobalStatusDialog extends DialogWrapper { outputTextArea.append(text); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction()}; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/SelectMavenProjectDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/SelectMavenProjectDialog.java index 4480bd5d66b9..5e7e107babef 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/SelectMavenProjectDialog.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/SelectMavenProjectDialog.java @@ -69,6 +69,7 @@ public class SelectMavenProjectDialog extends DialogWrapper { init(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction()}; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyDialog.java index f5ccaf74f88b..7245313c6767 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyDialog.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyDialog.java @@ -83,6 +83,7 @@ public class IntroducePropertyDialog extends DialogWrapper { super.dispose(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction()}; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchDialog.java index 1b2366d81f93..cd951e106f48 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchDialog.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchDialog.java @@ -108,6 +108,7 @@ public class MavenArtifactSearchDialog extends DialogWrapper { setOKActionEnabled(canSelect); } + @NotNull @Override protected Action getOKAction() { Action result = super.getOKAction(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenProjectDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenProjectDialog.java index 5c3c3c791ec7..77b2e3e95ac9 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenProjectDialog.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectMavenProjectDialog.java @@ -18,6 +18,7 @@ package org.jetbrains.idea.maven.navigator; import com.intellij.openapi.project.Project; import com.intellij.ui.treeStructure.NullNode; import com.intellij.ui.treeStructure.SimpleNode; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.maven.project.MavenProject; import javax.swing.*; @@ -39,6 +40,7 @@ public class SelectMavenProjectDialog extends SelectFromMavenProjectsDialog { init(); } + @NotNull @Override protected Action[] createActions() { Action selectNoneAction = new AbstractAction("&None") { diff --git a/plugins/properties/src/com/intellij/lang/properties/references/I18nizeQuickFixDialog.java b/plugins/properties/src/com/intellij/lang/properties/references/I18nizeQuickFixDialog.java index d57712ba643f..03a72a8ca811 100644 --- a/plugins/properties/src/com/intellij/lang/properties/references/I18nizeQuickFixDialog.java +++ b/plugins/properties/src/com/intellij/lang/properties/references/I18nizeQuickFixDialog.java @@ -445,6 +445,7 @@ public class I18nizeQuickFixDialog extends DialogWrapper implements I18nizeQuick super.doOKAction(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/AddRepositoryLocationDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/AddRepositoryLocationDialog.java index 92ec885de739..746c9d054666 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/AddRepositoryLocationDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/AddRepositoryLocationDialog.java @@ -19,6 +19,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.MultiLineLabelUI; import com.intellij.util.ArrayUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnBundle; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; @@ -141,6 +142,7 @@ public class AddRepositoryLocationDialog extends DialogWrapper { super.doOKAction(); } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction()}; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ChangeFormatDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ChangeFormatDialog.java index f6b74221bf39..39735901a73c 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ChangeFormatDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ChangeFormatDialog.java @@ -18,6 +18,7 @@ package org.jetbrains.idea.svn.dialogs; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.MultiLineLabelUI; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.SvnBundle; @@ -35,6 +36,7 @@ public class ChangeFormatDialog extends UpgradeFormatDialog { init(); } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(),getCancelAction()}; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CheckoutDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CheckoutDialog.java index d751553bc7c1..8e02d59b94c1 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CheckoutDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CheckoutDialog.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.svn.dialogs; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.CheckoutProvider; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnBundle; import javax.swing.*; @@ -45,6 +46,7 @@ public class CheckoutDialog extends RepositoryBrowserDialog { getOKAction().setEnabled(getRepositoryBrowser().getSelectedURL() != null); } + @NotNull protected Action[] createActions() { return new Action[] {getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java index 051aff2b4ec7..5b31c7b7b266 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java @@ -29,6 +29,7 @@ import com.intellij.ui.ComboboxWithBrowseButton; import com.intellij.ui.DocumentAdapter; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.RootUrlInfo; import org.jetbrains.idea.svn.SvnBranchConfigurationManager; import org.jetbrains.idea.svn.SvnBundle; @@ -245,6 +246,7 @@ public class CopyDialog extends DialogWrapper { getOKAction().setEnabled(isOKActionEnabled()); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ImportDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ImportDialog.java index f5c6d284e52a..50b22c1f8178 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ImportDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ImportDialog.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.svn.dialogs; import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnBundle; import javax.swing.*; @@ -42,6 +43,7 @@ public class ImportDialog extends RepositoryBrowserDialog { updateOKAction(); } + @NotNull protected Action[] createActions() { return new Action[] {getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LockDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LockDialog.java index b7a980500a5c..38f5248758df 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LockDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LockDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.OptionsDialog; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnVcs; @@ -45,6 +46,7 @@ public class LockDialog extends OptionsDialog { } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java index 64d4afd743c3..ca596e92fefc 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java @@ -125,6 +125,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { return "reference.svn.repository"; } + @NotNull protected Action[] createActions() { return new Action[] {getOKAction(), getHelpAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSHCredentialsDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSHCredentialsDialog.java index 67d7956fc576..5f5e37b2e13d 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSHCredentialsDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSHCredentialsDialog.java @@ -32,6 +32,7 @@ import com.intellij.util.SystemProperties; import com.intellij.util.ui.UIUtil; import com.trilead.ssh2.crypto.PEMDecoder; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnBundle; import org.tmatesoft.svn.core.internal.io.svn.SVNSSHPrivateKeyUtil; @@ -89,6 +90,7 @@ public class SSHCredentialsDialog extends DialogWrapper implements ActionListene HelpManager.getInstance().invokeHelp(HELP_ID); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSLCredentialsDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSLCredentialsDialog.java index a5d0bb7f56d5..44e503fe08d2 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSLCredentialsDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSLCredentialsDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnBundle; import javax.swing.*; @@ -42,6 +43,7 @@ public class SSLCredentialsDialog extends DialogWrapper { return "svn.sslCredentialsDialog"; } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectCreateExternalTargetDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectCreateExternalTargetDialog.java index 4fefe1c92d87..9c1bad123f8b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectCreateExternalTargetDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectCreateExternalTargetDialog.java @@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.hash.HashSet; +import org.jetbrains.annotations.NotNull; import org.tmatesoft.svn.core.internal.util.SVNPathUtil; import javax.swing.*; @@ -90,6 +91,7 @@ public class SelectCreateExternalTargetDialog extends RepositoryBrowserDialog { getOKAction().setEnabled(enabled); } + @NotNull protected Action[] createActions() { return new Action[] {getOKAction(), getCancelAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java index 66a82cd943cd..dcffa18e387d 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java @@ -23,6 +23,7 @@ import com.intellij.ui.OrderPanelListener; import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnBundle; import javax.swing.*; @@ -67,6 +68,7 @@ public class SelectFilesDialog extends DialogWrapper implements ActionListener { } } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectLocationDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectLocationDialog.java index 01186c0b1f3e..8e0e4218d748 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectLocationDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectLocationDialog.java @@ -23,6 +23,7 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Ref; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnVcs; @@ -106,6 +107,7 @@ public class SelectLocationDialog extends DialogWrapper { HelpManager.getInstance().invokeHelp(HELP_ID); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSHDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSHDialog.java index 981d497eedeb..30ef5216614c 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSHDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSHDialog.java @@ -59,6 +59,7 @@ public class ServerSSHDialog extends DialogWrapper { return false; } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSLDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSLDialog.java index 64a9e23c3916..3506e5859a4c 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSLDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSLDialog.java @@ -19,6 +19,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.ScrollPaneFactory; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnBundle; import org.tmatesoft.svn.core.auth.ISVNAuthenticationProvider; @@ -54,6 +55,7 @@ public class ServerSSLDialog extends DialogWrapper { return false; } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getTempAction(), getCancelAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SetPropertyDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SetPropertyDialog.java index 82e90854d1a4..486fe2c4355e 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SetPropertyDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SetPropertyDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.DocumentAdapter; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnPropertyKeys; import org.jetbrains.idea.svn.SvnVcs; @@ -76,6 +77,7 @@ public class SetPropertyDialog extends DialogWrapper { HelpManager.getInstance().invokeHelp(HELP_ID); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ShareDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ShareDialog.java index b2be62d7ee9d..95b137115407 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ShareDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ShareDialog.java @@ -25,6 +25,7 @@ import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.changes.LocalChangeList; import com.intellij.openapi.vcs.changes.ui.EditChangelistSupport; import com.intellij.openapi.vcs.ui.CommitMessage; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -110,6 +111,7 @@ public class ShareDialog extends RepositoryBrowserDialog { return myPrefferedFocused; } + @NotNull protected Action[] createActions() { return new Action[] {getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SimpleCredentialsDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SimpleCredentialsDialog.java index a5c322d4efac..3c11acb0e14b 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SimpleCredentialsDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SimpleCredentialsDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnBundle; import javax.swing.*; @@ -57,6 +58,7 @@ public class SimpleCredentialsDialog extends DialogWrapper implements DocumentLi HelpManager.getInstance().invokeHelp(HELP_ID); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java index 4e739c1aa6f1..91d8bdb4a422 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java @@ -41,6 +41,7 @@ import com.intellij.util.containers.Convertor; import com.intellij.util.ui.ColumnInfo; import com.intellij.util.ui.ListTableModel; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.history.SvnChangeList; import org.jetbrains.idea.svn.mergeinfo.MergeChecker; @@ -88,6 +89,7 @@ public class ToBeMergedDialog extends DialogWrapper { init(); } + @NotNull @Override protected Action[] createActions() { return new Action[]{getOKAction(), new DialogWrapperAction("Merge All") { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/UpgradeFormatDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/UpgradeFormatDialog.java index 7d9c93fb8af9..a174c59f60d1 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/UpgradeFormatDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/UpgradeFormatDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.MultiLineLabelUI; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnConfiguration; @@ -53,6 +54,7 @@ public class UpgradeFormatDialog extends DialogWrapper { } } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction()}; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/UserNameCredentialsDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/UserNameCredentialsDialog.java index fac0009247d0..3896c020f880 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/UserNameCredentialsDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/UserNameCredentialsDialog.java @@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.SvnBundle; import javax.swing.*; @@ -54,6 +55,7 @@ public class UserNameCredentialsDialog extends DialogWrapper implements Document HelpManager.getInstance().invokeHelp(HELP_ID); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItemDialog.java b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItemDialog.java index cb1a4bd49f36..95be42a02d8b 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItemDialog.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/palette/ComponentItemDialog.java @@ -205,6 +205,7 @@ public final class ComponentItemDialog extends DialogWrapper { updateOKAction(); } + @NotNull protected Action[] createActions() { return new Action[]{getOKAction(), getCancelAction(), getHelpAction()}; } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java index 65702447187c..0d0900fb49b9 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/KeyChooserDialog.java @@ -177,6 +177,7 @@ public final class KeyChooserDialog extends DialogWrapper{ } } + @NotNull @Override protected Action[] createLeftSideActions() { return new Action[] { new NewKeyValueAction() }; } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java index b3fcb58426b6..075cf4c46613 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java @@ -63,6 +63,7 @@ import com.intellij.uiDesigner.radComponents.RadContainer; import com.intellij.util.IncorrectOperationException; import icons.UIDesignerIcons; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -458,6 +459,7 @@ public class CreateSnapShotAction extends AnAction { return myFormNameTextField; } + @NotNull @Override protected Action getOKAction() { final Action okAction = super.getOKAction(); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/introduceParameter/IntroduceParameterDialog.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/introduceParameter/IntroduceParameterDialog.java index 94b623b5f2c6..e0052e70e02a 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/introduceParameter/IntroduceParameterDialog.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/introduceParameter/IntroduceParameterDialog.java @@ -20,6 +20,7 @@ import com.intellij.lang.LanguageNamesValidation; import org.intellij.lang.xpath.psi.XPathExpression; import org.intellij.lang.xpath.xslt.refactoring.BaseIntroduceDialog; import org.intellij.lang.xpath.xslt.refactoring.BaseIntroduceForm; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.event.ActionEvent; @@ -65,6 +66,7 @@ public class IntroduceParameterDialog extends BaseIntroduceDialog implements Int myPreviewAction.setEnabled(false); } + @NotNull protected Action[] createActions() { return myForceDefault ? super.createActions() : new Action[]{ getOKAction(), getPreviewAction(), getCancelAction() }; } diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/ModeSwitchableDialog.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/ModeSwitchableDialog.java index c5ca7b58d304..2ad7e78023e5 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/ModeSwitchableDialog.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/ModeSwitchableDialog.java @@ -17,6 +17,7 @@ package org.intellij.plugins.xpathView.ui; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.DimensionService; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -43,6 +44,7 @@ public abstract class ModeSwitchableDialog extends DialogWrapper { super.init(); } + @NotNull protected Action[] createActions() { return new Action[]{ getOKAction(), getCancelAction(), new AbstractAction(myMode.other().getName()) { public void actionPerformed(ActionEvent e) { diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaDialog.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaDialog.java index d0f3fc41c666..b61f00b7a18c 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaDialog.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/ConvertSchemaDialog.java @@ -19,6 +19,7 @@ package org.intellij.plugins.relaxNG.convert; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -55,6 +56,7 @@ public class ConvertSchemaDialog extends DialogWrapper implements PropertyChange getOKAction().setEnabled(mySettings.getOutputDestination().trim().length() > 0); } + @NotNull @Override protected Action[] createLeftSideActions() { return new Action[]{