From 261dd69bb437d62b5f1fdeee61d5e029169de700 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 25 Jan 2013 13:55:04 +0400 Subject: [PATCH 1/3] @NotNull --- .../folding/impl/actions/CollapseBlockAction.java | 2 ++ .../actions/GenerateSuperMethodCallAction.java | 4 +++- .../src/com/intellij/slicer/SliceBackwardAction.java | 2 ++ .../src/com/intellij/slicer/SliceForwardAction.java | 2 ++ .../BaseGenerateTestSupportMethodAction.java | 2 +- .../generation/actions/BaseGenerateAction.java | 4 +++- .../intellij/codeInsight/actions/CodeInsightAction.java | 9 +++++++-- .../codeInsight/actions/SimpleCodeInsightAction.java | 2 ++ .../codeInsight/completion/NextPrevParameterAction.java | 3 ++- .../actions/HippieBackwardCompletionAction.java | 1 + .../completion/actions/HippieCompletionAction.java | 1 + .../daemon/impl/actions/GotoNextErrorAction.java | 4 +++- .../daemon/impl/actions/GotoPreviousErrorAction.java | 4 +++- .../daemon/impl/actions/ShowErrorDescriptionAction.java | 3 ++- .../documentation/actions/ShowQuickDocInfoAction.java | 1 + .../editorActions/EmacsStyleIndentAction.java | 3 ++- .../editorActions/fillParagraph/FillParagraphAction.java | 3 ++- .../folding/impl/actions/CollapseDocCommentsAction.java | 2 ++ .../folding/impl/actions/CollapseSelectionAction.java | 2 ++ .../folding/impl/actions/ExpandDocCommentsAction.java | 2 ++ .../generation/actions/AutoIndentLinesAction.java | 4 +++- .../generation/actions/CommentByBlockCommentAction.java | 4 +++- .../generation/actions/CommentByLineCommentAction.java | 4 +++- .../generation/actions/DelegateMethodsAction.java | 4 +++- .../generation/actions/ImplementMethodsAction.java | 4 +++- .../generation/actions/OverrideMethodsAction.java | 4 +++- .../generation/actions/SurroundWithAction.java | 4 +++- .../hint/actions/ShowContainerInfoAction.java | 4 +++- .../hint/actions/ShowParameterInfoAction.java | 4 +++- .../intention/actions/ShowIntentionActionsAction.java | 2 ++ .../navigation/actions/GotoDeclarationAction.java | 1 + .../navigation/actions/GotoImplementationAction.java | 2 ++ .../codeInsight/navigation/actions/GotoSuperAction.java | 1 + .../navigation/actions/GotoTypeDeclarationAction.java | 1 + .../codeInsight/navigation/actions/MethodDownAction.java | 4 +++- .../codeInsight/navigation/actions/MethodUpAction.java | 4 +++- .../template/impl/actions/ListTemplatesAction.java | 2 ++ .../impl/actions/SurroundWithTemplateAction.java | 2 ++ .../com/intellij/codeInsight/unwrap/UnwrapAction.java | 4 +++- .../intellij/testIntegration/GotoTestOrCodeAction.java | 2 ++ .../groovy/actions/generate/GrBaseGenerateAction.java | 3 ++- .../maven/dom/generate/MavenGenerateTemplateAction.java | 2 +- .../xml/ui/actions/generate/CreateDomElementAction.java | 2 +- .../ui/actions/generate/GenerateDomElementAction.java | 3 ++- .../intellij/codeInsight/actions/GenerateDTDAction.java | 3 ++- .../com/intellij/xml/actions/GenerateXmlTagAction.java | 2 +- 46 files changed, 103 insertions(+), 29 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseBlockAction.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseBlockAction.java index ee56654784f4..1bc86f48ff47 100644 --- a/java/java-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseBlockAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseBlockAction.java @@ -18,11 +18,13 @@ package com.intellij.codeInsight.folding.impl.actions; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.actions.BaseCodeInsightAction; import com.intellij.codeInsight.folding.impl.CollapseBlockHandler; +import org.jetbrains.annotations.NotNull; /** * @author ven */ public class CollapseBlockAction extends BaseCodeInsightAction { + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new CollapseBlockHandler (); diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallAction.java b/java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallAction.java index 550b621eee87..62881172e102 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallAction.java @@ -22,15 +22,17 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiJavaFile; import com.intellij.psi.PsiMethod; +import org.jetbrains.annotations.NotNull; public class GenerateSuperMethodCallAction extends BaseCodeInsightAction { + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new GenerateSuperMethodCallHandler(); } @Override - protected boolean isValidForFile(Project project, Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) { if (!(file instanceof PsiJavaFile)) { return false; } diff --git a/java/java-impl/src/com/intellij/slicer/SliceBackwardAction.java b/java/java-impl/src/com/intellij/slicer/SliceBackwardAction.java index 30ff46b81ef0..0ad568907ee4 100644 --- a/java/java-impl/src/com/intellij/slicer/SliceBackwardAction.java +++ b/java/java-impl/src/com/intellij/slicer/SliceBackwardAction.java @@ -17,6 +17,7 @@ package com.intellij.slicer; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.actions.CodeInsightAction; +import org.jetbrains.annotations.NotNull; /** * @author cdr @@ -24,6 +25,7 @@ import com.intellij.codeInsight.actions.CodeInsightAction; public class SliceBackwardAction extends CodeInsightAction{ private final SliceHandler myHandler = new SliceHandler(true); + @NotNull @Override protected CodeInsightActionHandler getHandler() { return myHandler; diff --git a/java/java-impl/src/com/intellij/slicer/SliceForwardAction.java b/java/java-impl/src/com/intellij/slicer/SliceForwardAction.java index f561ea84e970..688abc6d8d64 100644 --- a/java/java-impl/src/com/intellij/slicer/SliceForwardAction.java +++ b/java/java-impl/src/com/intellij/slicer/SliceForwardAction.java @@ -17,6 +17,7 @@ package com.intellij.slicer; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.actions.CodeInsightAction; +import org.jetbrains.annotations.NotNull; /** * @author cdr @@ -24,6 +25,7 @@ import com.intellij.codeInsight.actions.CodeInsightAction; public class SliceForwardAction extends CodeInsightAction{ private final SliceHandler myHandler = new SliceForwardHandler(); + @NotNull @Override protected CodeInsightActionHandler getHandler() { return myHandler; diff --git a/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java b/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java index 5c9ff9c153e4..cb62f4d47492 100644 --- a/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java +++ b/java/java-impl/src/com/intellij/testIntegration/BaseGenerateTestSupportMethodAction.java @@ -72,7 +72,7 @@ public class BaseGenerateTestSupportMethodAction extends BaseGenerateAction { } @Override - protected boolean isValidForFile(Project project, Editor editor, PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { if (file instanceof PsiCompiledElement) return false; PsiDocumentManager.getInstance(project).commitAllDocuments(); diff --git a/java/openapi/src/com/intellij/codeInsight/generation/actions/BaseGenerateAction.java b/java/openapi/src/com/intellij/codeInsight/generation/actions/BaseGenerateAction.java index cd3fed795f8a..e8afbc66751e 100644 --- a/java/openapi/src/com/intellij/codeInsight/generation/actions/BaseGenerateAction.java +++ b/java/openapi/src/com/intellij/codeInsight/generation/actions/BaseGenerateAction.java @@ -22,6 +22,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public class BaseGenerateAction extends CodeInsightAction { @@ -31,6 +32,7 @@ public class BaseGenerateAction extends CodeInsightAction { myHandler = handler; } + @NotNull @Override protected final CodeInsightActionHandler getHandler() { return myHandler; @@ -46,7 +48,7 @@ public class BaseGenerateAction extends CodeInsightAction { } @Override - protected boolean isValidForFile(Project project, Editor editor, PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { if (!(file instanceof PsiJavaFile)) return false; if (file instanceof PsiCompiledElement) return false; diff --git a/platform/lang-api/src/com/intellij/codeInsight/actions/CodeInsightAction.java b/platform/lang-api/src/com/intellij/codeInsight/actions/CodeInsightAction.java index 3540ab780e3f..a141f5594629 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/actions/CodeInsightAction.java +++ b/platform/lang-api/src/com/intellij/codeInsight/actions/CodeInsightAction.java @@ -32,6 +32,7 @@ import org.jetbrains.annotations.NotNull; * @author Dmitry Avdeev */ public abstract class CodeInsightAction extends AnAction { + @Override public void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); Project project = PlatformDataKeys.PROJECT.getData(dataContext); @@ -52,9 +53,11 @@ public abstract class CodeInsightAction extends AnAction { final PsiFile psiFile = PsiUtilBase.getPsiFileInEditor(editor, project); if (psiFile == null) return; CommandProcessor.getInstance().executeCommand(project, new Runnable() { + @Override public void run() { final CodeInsightActionHandler handler = getHandler(); final Runnable action = new Runnable() { + @Override public void run() { if (!ApplicationManager.getApplication().isUnitTestMode() && !editor.getContentComponent().isShowing()) return; handler.invoke(project, editor, psiFile); @@ -70,6 +73,7 @@ public abstract class CodeInsightAction extends AnAction { }, getCommandName(), DocCommandGroupId.noneGroupId(editor.getDocument())); } + @Override public void update(AnActionEvent event) { Presentation presentation = event.getPresentation(); DataContext dataContext = event.getDataContext(); @@ -90,14 +94,15 @@ public abstract class CodeInsightAction extends AnAction { presentation.setEnabled(file != null && isValidForFile(project, editor, file)); } - protected boolean isValidForFile(Project project, Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { return true; } + @NotNull protected abstract CodeInsightActionHandler getHandler(); protected String getCommandName() { String text = getTemplatePresentation().getText(); - return text != null ? text : ""; + return text == null ? "" : text; } } diff --git a/platform/lang-api/src/com/intellij/codeInsight/actions/SimpleCodeInsightAction.java b/platform/lang-api/src/com/intellij/codeInsight/actions/SimpleCodeInsightAction.java index 6c8ea93c64e1..c941b2fc2422 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/actions/SimpleCodeInsightAction.java +++ b/platform/lang-api/src/com/intellij/codeInsight/actions/SimpleCodeInsightAction.java @@ -16,12 +16,14 @@ package com.intellij.codeInsight.actions; import com.intellij.codeInsight.CodeInsightActionHandler; +import org.jetbrains.annotations.NotNull; /** * @author Dmitry Avdeev */ public abstract class SimpleCodeInsightAction extends CodeInsightAction implements CodeInsightActionHandler { + @NotNull @Override protected CodeInsightActionHandler getHandler() { return this; diff --git a/platform/lang-api/src/com/intellij/codeInsight/completion/NextPrevParameterAction.java b/platform/lang-api/src/com/intellij/codeInsight/completion/NextPrevParameterAction.java index 87248caa69e6..01d5889685b0 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/completion/NextPrevParameterAction.java +++ b/platform/lang-api/src/com/intellij/codeInsight/completion/NextPrevParameterAction.java @@ -37,13 +37,14 @@ public abstract class NextPrevParameterAction extends CodeInsightAction { myNext = next; } + @NotNull @Override public CodeInsightActionHandler getHandler() { return new Handler(); } @Override - protected boolean isValidForFile(Project project, Editor editor, PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { return hasSutablePolicy(editor, file); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieBackwardCompletionAction.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieBackwardCompletionAction.java index 371b49698a03..0614bdab2c30 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieBackwardCompletionAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieBackwardCompletionAction.java @@ -36,6 +36,7 @@ public class HippieBackwardCompletionAction extends BaseCodeInsightAction implem super.actionPerformedImpl(project, editor); } + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new HippieWordCompletionHandler(false); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieCompletionAction.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieCompletionAction.java index 6ca75c7ccd86..1a1958571c00 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieCompletionAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieCompletionAction.java @@ -36,6 +36,7 @@ public class HippieCompletionAction extends BaseCodeInsightAction implements Dum super.actionPerformedImpl(project, editor); } + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new HippieWordCompletionHandler(true); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/GotoNextErrorAction.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/GotoNextErrorAction.java index f21d854712e5..b99f6b5efec0 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/GotoNextErrorAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/GotoNextErrorAction.java @@ -23,19 +23,21 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; public class GotoNextErrorAction extends BaseCodeInsightAction implements DumbAware { public GotoNextErrorAction() { super(false); } + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new GotoNextErrorHandler(true); } @Override - protected boolean isValidForFile(Project project, Editor editor, PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { return DaemonCodeAnalyzer.getInstance(project).isHighlightingAvailable(file); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/GotoPreviousErrorAction.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/GotoPreviousErrorAction.java index 81ed32464238..04fba0f60788 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/GotoPreviousErrorAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/GotoPreviousErrorAction.java @@ -25,19 +25,21 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; public class GotoPreviousErrorAction extends BaseCodeInsightAction implements DumbAware { public GotoPreviousErrorAction() { super(false); } + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new GotoNextErrorHandler(false); } @Override - protected boolean isValidForFile(Project project, Editor editor, PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { return DaemonCodeAnalyzer.getInstance(project).isHighlightingAvailable(file); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/ShowErrorDescriptionAction.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/ShowErrorDescriptionAction.java index a4173cc9a491..7e86c8ea7e1e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/ShowErrorDescriptionAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/ShowErrorDescriptionAction.java @@ -41,13 +41,14 @@ public class ShowErrorDescriptionAction extends BaseCodeInsightAction implements setEnabledInModalContext(true); } + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new ShowErrorDescriptionHandler(shouldShowDescription ? width : 0); } @Override - protected boolean isValidForFile(Project project, Editor editor, PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { return DaemonCodeAnalyzer.getInstance(project).isHighlightingAvailable(file) && isEnabledForFile(project, editor, file); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/actions/ShowQuickDocInfoAction.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/actions/ShowQuickDocInfoAction.java index ea40b1dc8ea5..70fbdb144dea 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/actions/ShowQuickDocInfoAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/actions/ShowQuickDocInfoAction.java @@ -43,6 +43,7 @@ public class ShowQuickDocInfoAction extends BaseCodeInsightAction implements Hin setInjectedContext(true); } + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new CodeInsightActionHandler() { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EmacsStyleIndentAction.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EmacsStyleIndentAction.java index 3afc70bec71f..5709982ca892 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EmacsStyleIndentAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EmacsStyleIndentAction.java @@ -41,13 +41,14 @@ public class EmacsStyleIndentAction extends BaseCodeInsightAction implements Dum private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.actions.EmacsStyleIndentAction"); + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new Handler(); } @Override - protected boolean isValidForFile(final Project project, final Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) { final PsiElement context = file.findElementAt(editor.getCaretModel().getOffset()); return context != null && LanguageFormatting.INSTANCE.forContext(context) != null; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/fillParagraph/FillParagraphAction.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/fillParagraph/FillParagraphAction.java index f4cef0d59ced..3e4449f714a8 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/fillParagraph/FillParagraphAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/fillParagraph/FillParagraphAction.java @@ -18,6 +18,7 @@ import org.jetbrains.annotations.NotNull; */ public class FillParagraphAction extends BaseCodeInsightAction { + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new Handler(); @@ -45,7 +46,7 @@ public class FillParagraphAction extends BaseCodeInsightAction { } @Override - protected boolean isValidForFile(Project project, Editor editor, PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { final ParagraphFillHandler handler = LanguageFillParagraphExtension.INSTANCE.forLanguage(file.getLanguage()); return handler != null && handler.isAvailableForFile(file); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseDocCommentsAction.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseDocCommentsAction.java index 38af70944d57..345a4e69f1b1 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseDocCommentsAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseDocCommentsAction.java @@ -18,8 +18,10 @@ package com.intellij.codeInsight.folding.impl.actions; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.actions.BaseCodeInsightAction; import com.intellij.codeInsight.folding.impl.CollapseExpandDocCommentsHandler; +import org.jetbrains.annotations.NotNull; public class CollapseDocCommentsAction extends BaseCodeInsightAction{ + @NotNull @Override protected CodeInsightActionHandler getHandler(){ return new CollapseExpandDocCommentsHandler(false); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseSelectionAction.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseSelectionAction.java index fe0273c76e10..8ce61cc828cd 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseSelectionAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseSelectionAction.java @@ -20,11 +20,13 @@ import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.actions.BaseCodeInsightAction; import com.intellij.codeInsight.folding.impl.CollapseSelectionHandler; import com.intellij.openapi.project.DumbAware; +import org.jetbrains.annotations.NotNull; /** * @author ven */ public class CollapseSelectionAction extends BaseCodeInsightAction implements DumbAware { + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new CollapseSelectionHandler(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/ExpandDocCommentsAction.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/ExpandDocCommentsAction.java index 6d2d95ff9ee4..93e7f0ab138f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/ExpandDocCommentsAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/ExpandDocCommentsAction.java @@ -18,8 +18,10 @@ package com.intellij.codeInsight.folding.impl.actions; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.actions.BaseCodeInsightAction; import com.intellij.codeInsight.folding.impl.CollapseExpandDocCommentsHandler; +import org.jetbrains.annotations.NotNull; public class ExpandDocCommentsAction extends BaseCodeInsightAction{ + @NotNull @Override protected CodeInsightActionHandler getHandler(){ return new CollapseExpandDocCommentsHandler(true); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/AutoIndentLinesAction.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/AutoIndentLinesAction.java index f92cea83e19b..75ffec152654 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/AutoIndentLinesAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/AutoIndentLinesAction.java @@ -26,8 +26,10 @@ import com.intellij.openapi.fileTypes.LanguageFileType; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; public class AutoIndentLinesAction extends BaseCodeInsightAction implements DumbAware { + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new AutoIndentLinesHandler(); @@ -38,7 +40,7 @@ public class AutoIndentLinesAction extends BaseCodeInsightAction implements Dumb } @Override - protected boolean isValidForFile(Project project, Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) { final FileType fileType = file.getFileType(); return fileType instanceof LanguageFileType && LanguageFormatting.INSTANCE.forContext(((LanguageFileType)fileType).getLanguage(), file) != null; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByBlockCommentAction.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByBlockCommentAction.java index 18d0a78a276c..ce0d3b63e6e0 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByBlockCommentAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByBlockCommentAction.java @@ -27,19 +27,21 @@ import com.intellij.openapi.fileTypes.impl.AbstractFileType; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; public class CommentByBlockCommentAction extends BaseCodeInsightAction implements DumbAware { public CommentByBlockCommentAction() { setEnabledInModalContext(true); } + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new CommentByBlockCommentHandler(); } @Override - protected boolean isValidForFile(Project project, Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) { final FileType fileType = file.getFileType(); if (fileType instanceof AbstractFileType) { return ((AbstractFileType)fileType).getCommenter() != null; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java index e54a096d1a22..990e64701ce1 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java @@ -26,19 +26,21 @@ import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.lang.LanguageCommenters; +import org.jetbrains.annotations.NotNull; public class CommentByLineCommentAction extends BaseCodeInsightAction implements DumbAware { public CommentByLineCommentAction() { setEnabledInModalContext(true); } + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new CommentByLineCommentHandler(); } @Override - protected boolean isValidForFile(Project project, Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) { final FileType fileType = file.getFileType(); if (fileType instanceof AbstractFileType) { return ((AbstractFileType)fileType).getCommenter() != null; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/DelegateMethodsAction.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/DelegateMethodsAction.java index b16bc5af0010..bc5d831dcd47 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/DelegateMethodsAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/DelegateMethodsAction.java @@ -27,16 +27,18 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiUtilBase; +import org.jetbrains.annotations.NotNull; public class DelegateMethodsAction extends BaseCodeInsightAction { + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new DelegateMethodsHandler(); } @Override - protected boolean isValidForFile(Project project, Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) { Language language = PsiUtilBase.getLanguageAtOffset(file, editor.getCaretModel().getOffset()); final LanguageCodeInsightActionHandler codeInsightActionHandler = CodeInsightActions.DELEGATE_METHODS.forLanguage(language); if (codeInsightActionHandler != null) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/ImplementMethodsAction.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/ImplementMethodsAction.java index b947cf223744..ed97b98f7868 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/ImplementMethodsAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/ImplementMethodsAction.java @@ -27,15 +27,17 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiUtilBase; +import org.jetbrains.annotations.NotNull; public class ImplementMethodsAction extends BaseCodeInsightAction { + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new ImplementMethodsHandler(); } @Override - protected boolean isValidForFile(Project project, Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) { final Language language = PsiUtilBase.getLanguageAtOffset(file, editor.getCaretModel().getOffset()); final LanguageCodeInsightActionHandler codeInsightActionHandler = CodeInsightActions.IMPLEMENT_METHOD.forLanguage(language); return codeInsightActionHandler != null && codeInsightActionHandler.isValidFor(editor, file); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/OverrideMethodsAction.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/OverrideMethodsAction.java index a355b2f752f7..9827f1272294 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/OverrideMethodsAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/OverrideMethodsAction.java @@ -27,16 +27,18 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiUtilBase; +import org.jetbrains.annotations.NotNull; public class OverrideMethodsAction extends BaseCodeInsightAction { + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new OverrideMethodsHandler(); } @Override - protected boolean isValidForFile(Project project, Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) { Language language = PsiUtilBase.getLanguageAtOffset(file, editor.getCaretModel().getOffset()); final LanguageCodeInsightActionHandler codeInsightActionHandler = CodeInsightActions.OVERRIDE_METHOD.forLanguage(language); if (codeInsightActionHandler != null) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/SurroundWithAction.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/SurroundWithAction.java index e7e1b3471a60..6f0d6dfe561d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/SurroundWithAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/SurroundWithAction.java @@ -26,19 +26,21 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiUtilCore; +import org.jetbrains.annotations.NotNull; public class SurroundWithAction extends BaseCodeInsightAction{ public SurroundWithAction() { setEnabledInModalContext(true); } + @NotNull @Override protected CodeInsightActionHandler getHandler(){ return new SurroundWithHandler(); } @Override - protected boolean isValidForFile(Project project, Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) { final Language language = file.getLanguage(); if (!LanguageSurrounders.INSTANCE.allForLanguage(language).isEmpty()) { return true; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java index 0e17662d4be0..05557e0044d1 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java @@ -25,9 +25,11 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public class ShowContainerInfoAction extends BaseCodeInsightAction{ + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new ShowContainerInfoHandler(); @@ -40,7 +42,7 @@ public class ShowContainerInfoAction extends BaseCodeInsightAction{ } @Override - protected boolean isValidForFile(Project project, Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) { return LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(file) instanceof TreeBasedStructureViewBuilder; } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowParameterInfoAction.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowParameterInfoAction.java index 3a60dcb66431..439e6dc7b8c5 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowParameterInfoAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowParameterInfoAction.java @@ -25,19 +25,21 @@ import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiUtilBase; +import org.jetbrains.annotations.NotNull; public class ShowParameterInfoAction extends BaseCodeInsightAction implements DumbAware { public ShowParameterInfoAction() { setEnabledInModalContext(true); } + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new ShowParameterInfoHandler(); } @Override - protected boolean isValidForFile(Project project, Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) { final Language language = PsiUtilBase.getLanguageAtOffset(file, editor.getCaretModel().getOffset()); return ShowParameterInfoHandler.getHandlers(project, language, file.getViewProvider().getBaseLanguage()) != null; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/actions/ShowIntentionActionsAction.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/actions/ShowIntentionActionsAction.java index 373f512c8825..38e50e7fdef9 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/actions/ShowIntentionActionsAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/actions/ShowIntentionActionsAction.java @@ -20,6 +20,7 @@ import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.actions.BaseCodeInsightAction; import com.intellij.codeInsight.hint.HintManagerImpl; import com.intellij.codeInsight.intention.impl.ShowIntentionActionsHandler; +import org.jetbrains.annotations.NotNull; /** * @author mike @@ -34,6 +35,7 @@ public class ShowIntentionActionsAction extends BaseCodeInsightAction implements return true; } + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new ShowIntentionActionsHandler(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java index 3f5ffaa298fa..09101ab08c49 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java @@ -61,6 +61,7 @@ import java.util.Collections; public class GotoDeclarationAction extends BaseCodeInsightAction implements CodeInsightActionHandler, DumbAware { private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.navigation.actions.GotoDeclarationAction"); + @NotNull @Override protected CodeInsightActionHandler getHandler() { String s = "/java/lang/Object.class"; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoImplementationAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoImplementationAction.java index 9a0dd0cfa721..9914b9363e60 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoImplementationAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoImplementationAction.java @@ -22,8 +22,10 @@ import com.intellij.codeInsight.navigation.GotoImplementationHandler; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.DumbAware; import com.intellij.psi.search.searches.DefinitionsSearch; +import org.jetbrains.annotations.NotNull; public class GotoImplementationAction extends BaseCodeInsightAction implements DumbAware { + @NotNull @Override protected CodeInsightActionHandler getHandler(){ return new GotoImplementationHandler(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoSuperAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoSuperAction.java index 6e1c6c50d54c..13f75d480460 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoSuperAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoSuperAction.java @@ -33,6 +33,7 @@ public class GotoSuperAction extends BaseCodeInsightAction implements CodeInsigh @NonNls public static final String FEATURE_ID = "navigation.goto.super"; + @NotNull @Override protected CodeInsightActionHandler getHandler() { return this; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoTypeDeclarationAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoTypeDeclarationAction.java index 7293cff2df79..e0d06b82b14f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoTypeDeclarationAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoTypeDeclarationAction.java @@ -41,6 +41,7 @@ import java.util.Set; public class GotoTypeDeclarationAction extends BaseCodeInsightAction implements CodeInsightActionHandler, DumbAware { + @NotNull @Override protected CodeInsightActionHandler getHandler(){ return this; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/MethodDownAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/MethodDownAction.java index f334bbf02daa..ab0ec054cb69 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/MethodDownAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/MethodDownAction.java @@ -22,8 +22,10 @@ import com.intellij.codeInsight.navigation.MethodDownHandler; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; public class MethodDownAction extends BaseCodeInsightAction { + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new MethodDownHandler(); @@ -35,7 +37,7 @@ public class MethodDownAction extends BaseCodeInsightAction { } @Override - protected boolean isValidForFile(Project project, Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) { return MethodUpAction.checkValidForFile(file); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/MethodUpAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/MethodUpAction.java index 41b1fc40044e..430c4d5a57b9 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/MethodUpAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/MethodUpAction.java @@ -26,8 +26,10 @@ import com.intellij.lang.LanguageStructureViewBuilder; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; public class MethodUpAction extends BaseCodeInsightAction { + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new MethodUpHandler(); @@ -39,7 +41,7 @@ public class MethodUpAction extends BaseCodeInsightAction { } @Override - protected boolean isValidForFile(Project project, Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) { return checkValidForFile(file); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/ListTemplatesAction.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/ListTemplatesAction.java index 48e9e3e8b71c..e4285bcb6605 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/ListTemplatesAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/ListTemplatesAction.java @@ -20,8 +20,10 @@ package com.intellij.codeInsight.template.impl.actions; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.actions.BaseCodeInsightAction; import com.intellij.codeInsight.template.impl.ListTemplatesHandler; +import org.jetbrains.annotations.NotNull; public class ListTemplatesAction extends BaseCodeInsightAction{ + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new ListTemplatesHandler(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/SurroundWithTemplateAction.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/SurroundWithTemplateAction.java index 045cc6f0947f..98449f7c0324 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/SurroundWithTemplateAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/actions/SurroundWithTemplateAction.java @@ -19,11 +19,13 @@ package com.intellij.codeInsight.template.impl.actions; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.codeInsight.actions.BaseCodeInsightAction; import com.intellij.codeInsight.template.impl.SurroundWithTemplateHandler; +import org.jetbrains.annotations.NotNull; /** * @author mike */ public class SurroundWithTemplateAction extends BaseCodeInsightAction { + @NotNull @Override protected CodeInsightActionHandler getHandler() { return new SurroundWithTemplateHandler(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/unwrap/UnwrapAction.java b/platform/lang-impl/src/com/intellij/codeInsight/unwrap/UnwrapAction.java index 9b754c810bd5..12f8bfff442f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/unwrap/UnwrapAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/unwrap/UnwrapAction.java @@ -21,6 +21,7 @@ import com.intellij.codeInsight.actions.BaseCodeInsightAction; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; +import org.jetbrains.annotations.NotNull; public class UnwrapAction extends BaseCodeInsightAction{ public UnwrapAction() { @@ -28,13 +29,14 @@ public class UnwrapAction extends BaseCodeInsightAction{ setEnabledInModalContext(true); } + @NotNull @Override protected CodeInsightActionHandler getHandler(){ return new UnwrapHandler(); } @Override - protected boolean isValidForFile(Project project, Editor editor, PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { return !LanguageUnwrappers.INSTANCE.allForLanguage(file.getLanguage()).isEmpty(); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeAction.java b/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeAction.java index 9941adebd06e..e458c6762ac9 100644 --- a/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeAction.java +++ b/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeAction.java @@ -27,8 +27,10 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiUtilBase; +import org.jetbrains.annotations.NotNull; public class GotoTestOrCodeAction extends BaseCodeInsightAction { + @NotNull protected CodeInsightActionHandler getHandler(){ return new GotoTestOrCodeHandler(); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/GrBaseGenerateAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/GrBaseGenerateAction.java index 0914ff7c4158..7ba2fb83ae31 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/GrBaseGenerateAction.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/GrBaseGenerateAction.java @@ -23,6 +23,7 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiCompiledElement; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.GroovyFileType; /** @@ -34,7 +35,7 @@ public abstract class GrBaseGenerateAction extends BaseGenerateAction { super(handler); } - protected boolean isValidForFile(Project project, Editor editor, PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { if (file instanceof PsiCompiledElement) return false; if (!GroovyFileType.GROOVY_FILE_TYPE.equals(file.getFileType())) return false; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/generate/MavenGenerateTemplateAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/generate/MavenGenerateTemplateAction.java index 0d23a049e745..7c2afa86418a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/generate/MavenGenerateTemplateAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/generate/MavenGenerateTemplateAction.java @@ -26,7 +26,7 @@ public class MavenGenerateTemplateAction extends GenerateDomElementAction { getTemplatePresentation().setIcon(ElementPresentationManager.getIconForClass(childElementClass)); } - protected boolean isValidForFile(Project project, Editor editor, PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { return file instanceof XmlFile && MavenDomUtil.getMavenDomModel(file, MavenDomProjectModel.class) != null; } } \ No newline at end of file diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/CreateDomElementAction.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/CreateDomElementAction.java index 2d3d1eddd84d..198016b2b3b2 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/CreateDomElementAction.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/CreateDomElementAction.java @@ -49,7 +49,7 @@ public abstract class CreateDomElementAction extends Simpl protected abstract DomElement createElement(T context, Editor editor, PsiFile file, Project project); @Override - protected boolean isValidForFile(Project project, Editor editor, PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { return getContextElement(editor) != null; } diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/GenerateDomElementAction.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/GenerateDomElementAction.java index dad9336d321b..dd6f1c03ae2c 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/GenerateDomElementAction.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/actions/generate/GenerateDomElementAction.java @@ -50,6 +50,7 @@ public class GenerateDomElementAction extends CodeInsightAction { this(generateProvider, null); } + @NotNull protected CodeInsightActionHandler getHandler() { return new CodeInsightActionHandler() { public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) { @@ -82,7 +83,7 @@ public class GenerateDomElementAction extends CodeInsightAction { return true; } - protected boolean isValidForFile(final Project project, final Editor editor, final PsiFile file) { + protected boolean isValidForFile(@NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) { final DomElement element = DomUtil.getContextElement(editor); return element != null && myProvider.isAvailableForElement(element); } diff --git a/xml/impl/src/com/intellij/codeInsight/actions/GenerateDTDAction.java b/xml/impl/src/com/intellij/codeInsight/actions/GenerateDTDAction.java index 1aa5ae4d708b..027bb15ac45b 100644 --- a/xml/impl/src/com/intellij/codeInsight/actions/GenerateDTDAction.java +++ b/xml/impl/src/com/intellij/codeInsight/actions/GenerateDTDAction.java @@ -42,6 +42,7 @@ import org.jetbrains.annotations.Nullable; */ public class GenerateDTDAction extends BaseCodeInsightAction{ private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.actions.GenerateDTDAction"); + @NotNull protected CodeInsightActionHandler getHandler(){ return new CodeInsightActionHandler(){ public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { @@ -115,7 +116,7 @@ public class GenerateDTDAction extends BaseCodeInsightAction{ } } - protected boolean isValidForFile(Project project, Editor editor, PsiFile file){ + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file){ return file instanceof XmlFile; } } diff --git a/xml/impl/src/com/intellij/xml/actions/GenerateXmlTagAction.java b/xml/impl/src/com/intellij/xml/actions/GenerateXmlTagAction.java index 5a2b4ea478f6..ff74f8f335a7 100644 --- a/xml/impl/src/com/intellij/xml/actions/GenerateXmlTagAction.java +++ b/xml/impl/src/com/intellij/xml/actions/GenerateXmlTagAction.java @@ -300,7 +300,7 @@ public class GenerateXmlTagAction extends SimpleCodeInsightAction { } @Override - protected boolean isValidForFile(Project project, Editor editor, PsiFile file) { + protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) { if (!(file instanceof XmlFile)) return false; XmlTag contextTag = getContextTag(editor, file); return contextTag != null && contextTag.getDescriptor() != null; From 06e60f8141145ba3228168739b0baf2db35f00af Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 25 Jan 2013 14:59:30 +0400 Subject: [PATCH 2/3] @NotNull --- .../refactoring/actions/AnonymousToInnerAction.java | 7 ++++--- .../actions/ConvertToInstanceMethodAction.java | 7 ++++--- .../refactoring/actions/EncapsulateFieldsAction.java | 7 ++++--- .../actions/InheritanceToDelegationAction.java | 5 +++-- .../actions/IntroduceParameterObjectAction.java | 5 +++-- .../refactoring/actions/InvertBooleanAction.java | 7 ++++--- .../refactoring/actions/MakeStaticAction.java | 7 ++++--- .../refactoring/actions/MethodDuplicatesAction.java | 5 +++-- .../refactoring/actions/RemoveMiddlemanAction.java | 7 ++++--- .../actions/ReplaceConstructorWithBuilderAction.java | 7 ++++--- .../actions/ReplaceConstructorWithFactoryAction.java | 5 +++-- .../actions/ReplaceMethodWithMethodObjectAction.java | 5 +++-- .../refactoring/actions/TempWithQueryAction.java | 7 ++++--- .../refactoring/actions/TurnRefsToSuperAction.java | 5 +++-- .../intellij/refactoring/actions/TypeCookAction.java | 5 +++-- .../actions/ChangeTypeSignatureAction.java | 7 ++++--- .../wrapreturnvalue/WrapReturnValueAction.java | 7 ++++--- .../actions/QuickChangeCodeStyleSchemeAction.java | 3 ++- .../actions/AddToFavoritesPopupAction.java | 3 ++- .../actions/BasePlatformRefactoringAction.java | 6 +++--- .../refactoring/actions/BaseRefactoringAction.java | 10 ++++++---- .../refactoring/actions/ChangeSignatureAction.java | 8 ++++---- .../refactoring/actions/ExtractIncludeAction.java | 5 +++-- .../refactoring/actions/ExtractMethodAction.java | 2 +- .../intellij/refactoring/actions/InlineAction.java | 4 ++-- .../refactoring/actions/IntroduceConstantAction.java | 2 +- .../refactoring/actions/IntroduceFieldAction.java | 2 +- .../actions/IntroduceParameterAction.java | 2 +- .../refactoring/actions/IntroduceVariableAction.java | 2 +- .../com/intellij/refactoring/actions/MoveAction.java | 5 +++-- .../actions/RefactoringQuickListPopupAction.java | 12 +++++++----- .../refactoring/actions/RenameElementAction.java | 9 +++++---- .../refactoring/actions/SafeDeleteAction.java | 7 ++++--- .../ide/actions/QuickSwitchSchemeAction.java | 6 ++++-- .../ide/actions/QuickChangeColorSchemeAction.java | 3 ++- .../ide/actions/QuickChangeKeymapAction.java | 3 ++- .../intellij/ide/actions/QuickChangeLookAndFeel.java | 3 ++- .../ide/actions/QuickChangeSchemesAction.java | 3 ++- .../openapi/actionSystem/ex/QuickListsManager.java | 2 +- .../openapi/vcs/actions/VcsQuickListPopupAction.java | 4 ++-- .../plugins/groovy/actions/ConvertToJavaAction.java | 7 ++++--- .../extract/ExtractManagedDependenciesAction.java | 6 +++--- .../introduce/IntroducePropertyAction.java | 6 +++--- 43 files changed, 132 insertions(+), 98 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/actions/AnonymousToInnerAction.java b/java/java-impl/src/com/intellij/refactoring/actions/AnonymousToInnerAction.java index ef797c391279..9e8ab42443be 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/AnonymousToInnerAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/AnonymousToInnerAction.java @@ -24,17 +24,18 @@ import com.intellij.psi.PsiNewExpression; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.anonymousToInner.AnonymousToInnerHandler; +import org.jetbrains.annotations.NotNull; public class AnonymousToInnerAction extends BaseRefactoringAction { public boolean isAvailableInEditorOnly() { return true; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return false; } - protected boolean isAvailableOnElementInEditorAndFile(final PsiElement element, final Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull final PsiElement element, @NotNull final Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { final PsiElement targetElement = file.findElementAt(editor.getCaretModel().getOffset()); if (PsiTreeUtil.getParentOfType(targetElement, PsiAnonymousClass.class) != null) { return true; @@ -46,7 +47,7 @@ public class AnonymousToInnerAction extends BaseRefactoringAction { return newExpression != null && newExpression.getAnonymousClass() != null; } - public RefactoringActionHandler getHandler(DataContext dataContext) { + public RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new AnonymousToInnerHandler(); } } diff --git a/java/java-impl/src/com/intellij/refactoring/actions/ConvertToInstanceMethodAction.java b/java/java-impl/src/com/intellij/refactoring/actions/ConvertToInstanceMethodAction.java index d0f11ebc6a75..6983e34f4020 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/ConvertToInstanceMethodAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/ConvertToInstanceMethodAction.java @@ -20,6 +20,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.psi.*; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.convertToInstanceMethod.ConvertToInstanceMethodHandler; +import org.jetbrains.annotations.NotNull; /** * @author dsl @@ -29,16 +30,16 @@ public class ConvertToInstanceMethodAction extends BaseRefactoringAction { return false; } - protected boolean isEnabledOnElements(PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return elements.length == 1 && elements[0] instanceof PsiMethod; } - protected boolean isAvailableOnElementInEditorAndFile(PsiElement element, final Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element, @NotNull final Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { if (element instanceof PsiIdentifier) element = element.getParent(); return element instanceof PsiMethod && ((PsiMethod) element).hasModifierProperty(PsiModifier.STATIC); } - protected RefactoringActionHandler getHandler(DataContext dataContext) { + protected RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new ConvertToInstanceMethodHandler(); } } diff --git a/java/java-impl/src/com/intellij/refactoring/actions/EncapsulateFieldsAction.java b/java/java-impl/src/com/intellij/refactoring/actions/EncapsulateFieldsAction.java index bfdc4db4b429..fc1762e85d9e 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/EncapsulateFieldsAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/EncapsulateFieldsAction.java @@ -25,6 +25,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.encapsulateFields.EncapsulateFieldsHandler; +import org.jetbrains.annotations.NotNull; public class EncapsulateFieldsAction extends BaseRefactoringAction { public boolean isAvailableInEditorOnly() { @@ -32,7 +33,7 @@ public class EncapsulateFieldsAction extends BaseRefactoringAction { } @Override - protected boolean isAvailableOnElementInEditorAndFile(PsiElement element, Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element, @NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { final PsiElement psiElement = file.findElementAt(editor.getCaretModel().getOffset()); final PsiClass containingClass = PsiTreeUtil.getParentOfType(psiElement, PsiClass.class, false); if (containingClass != null) { @@ -44,7 +45,7 @@ public class EncapsulateFieldsAction extends BaseRefactoringAction { return false; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { if (elements.length == 1) { return elements[0] instanceof PsiClass && elements[0].getLanguage().isKindOf(JavaLanguage.INSTANCE) || isAcceptedField(elements[0]); } @@ -59,7 +60,7 @@ public class EncapsulateFieldsAction extends BaseRefactoringAction { return false; } - public RefactoringActionHandler getHandler(DataContext dataContext) { + public RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new EncapsulateFieldsHandler(); } diff --git a/java/java-impl/src/com/intellij/refactoring/actions/InheritanceToDelegationAction.java b/java/java-impl/src/com/intellij/refactoring/actions/InheritanceToDelegationAction.java index 290cafd1911c..d97a86b80148 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/InheritanceToDelegationAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/InheritanceToDelegationAction.java @@ -21,20 +21,21 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.inheritanceToDelegation.InheritanceToDelegationHandler; +import org.jetbrains.annotations.NotNull; public class InheritanceToDelegationAction extends BaseRefactoringAction { public boolean isAvailableInEditorOnly() { return false; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return elements.length == 1 && elements[0] instanceof PsiClass && !((PsiClass)elements[0]).isInterface() && elements[0].getLanguage().isKindOf(JavaLanguage.INSTANCE); } - public RefactoringActionHandler getHandler(DataContext dataContext) { + public RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new InheritanceToDelegationHandler(); } } \ No newline at end of file diff --git a/java/java-impl/src/com/intellij/refactoring/actions/IntroduceParameterObjectAction.java b/java/java-impl/src/com/intellij/refactoring/actions/IntroduceParameterObjectAction.java index d2e348e0d8df..ec09e1c1fb34 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/IntroduceParameterObjectAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/IntroduceParameterObjectAction.java @@ -21,6 +21,7 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.introduceparameterobject.IntroduceParameterObjectHandler; +import org.jetbrains.annotations.NotNull; public class IntroduceParameterObjectAction extends BaseRefactoringAction { @@ -28,11 +29,11 @@ public class IntroduceParameterObjectAction extends BaseRefactoringAction { return false; } - protected boolean isEnabledOnElements(final PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull final PsiElement[] elements) { return elements.length == 1 && PsiTreeUtil.getParentOfType(elements[0], PsiMethod.class, false) != null; } - protected RefactoringActionHandler getHandler(DataContext context) { + protected RefactoringActionHandler getHandler(@NotNull DataContext context) { return new IntroduceParameterObjectHandler(); } } diff --git a/java/java-impl/src/com/intellij/refactoring/actions/InvertBooleanAction.java b/java/java-impl/src/com/intellij/refactoring/actions/InvertBooleanAction.java index 7ad4645837d5..3f95b678cafc 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/InvertBooleanAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/InvertBooleanAction.java @@ -20,6 +20,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.psi.*; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.invertBoolean.InvertBooleanHandler; +import org.jetbrains.annotations.NotNull; /** * @author ven @@ -29,11 +30,11 @@ public class InvertBooleanAction extends BaseRefactoringAction { return false; } - protected boolean isEnabledOnElements(PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return elements.length == 1 && (elements[0] instanceof PsiMethod || elements[0] instanceof PsiVariable); } - protected boolean isAvailableOnElementInEditorAndFile(final PsiElement element, final Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull final PsiElement element, @NotNull final Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { if (element instanceof PsiVariable) { return PsiType.BOOLEAN.equals(((PsiVariable) element).getType()); } @@ -43,7 +44,7 @@ public class InvertBooleanAction extends BaseRefactoringAction { return false; } - protected RefactoringActionHandler getHandler(DataContext dataContext) { + protected RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new InvertBooleanHandler(); } } diff --git a/java/java-impl/src/com/intellij/refactoring/actions/MakeStaticAction.java b/java/java-impl/src/com/intellij/refactoring/actions/MakeStaticAction.java index 4514b13c2eab..ec329966493f 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/MakeStaticAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/MakeStaticAction.java @@ -29,17 +29,18 @@ import com.intellij.openapi.editor.Editor; import com.intellij.psi.*; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.makeStatic.MakeStaticHandler; +import org.jetbrains.annotations.NotNull; public class MakeStaticAction extends BaseRefactoringAction { protected boolean isAvailableInEditorOnly() { return false; } - protected boolean isEnabledOnElements(PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return (elements.length == 1) && (elements[0] instanceof PsiMethod) && !((PsiMethod)elements[0]).isConstructor(); } - protected boolean isAvailableOnElementInEditorAndFile(PsiElement element, final Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element, @NotNull final Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { if (element instanceof PsiIdentifier) { element = element.getParent(); } @@ -47,7 +48,7 @@ public class MakeStaticAction extends BaseRefactoringAction { MakeStaticHandler.validateTarget((PsiTypeParameterListOwner) element) == null; } - protected RefactoringActionHandler getHandler(DataContext dataContext) { + protected RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new MakeStaticHandler(); } } diff --git a/java/java-impl/src/com/intellij/refactoring/actions/MethodDuplicatesAction.java b/java/java-impl/src/com/intellij/refactoring/actions/MethodDuplicatesAction.java index 7982d07a616e..4abd04b6e166 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/MethodDuplicatesAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/MethodDuplicatesAction.java @@ -19,6 +19,7 @@ import com.intellij.openapi.actionSystem.DataContext; import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.util.duplicates.MethodDuplicatesHandler; +import org.jetbrains.annotations.NotNull; /** * @author dsl @@ -28,11 +29,11 @@ public class MethodDuplicatesAction extends BaseRefactoringAction { return true; } - protected boolean isEnabledOnElements(PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return false; } - protected RefactoringActionHandler getHandler(DataContext dataContext) { + protected RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new MethodDuplicatesHandler(); } } diff --git a/java/java-impl/src/com/intellij/refactoring/actions/RemoveMiddlemanAction.java b/java/java-impl/src/com/intellij/refactoring/actions/RemoveMiddlemanAction.java index 77223a97b3d9..b7171948f1aa 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/RemoveMiddlemanAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/RemoveMiddlemanAction.java @@ -23,15 +23,16 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.removemiddleman.RemoveMiddlemanHandler; +import org.jetbrains.annotations.NotNull; public class RemoveMiddlemanAction extends BaseRefactoringAction{ - protected RefactoringActionHandler getHandler(DataContext context) { + protected RefactoringActionHandler getHandler(@NotNull DataContext context) { return new RemoveMiddlemanHandler(); } @Override - protected boolean isAvailableOnElementInEditorAndFile(PsiElement element, Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element, @NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { return element instanceof PsiField; } @@ -39,7 +40,7 @@ public class RemoveMiddlemanAction extends BaseRefactoringAction{ return false; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return elements.length == 1 && PsiTreeUtil.getParentOfType(elements[0], PsiField.class, false) != null; } } diff --git a/java/java-impl/src/com/intellij/refactoring/actions/ReplaceConstructorWithBuilderAction.java b/java/java-impl/src/com/intellij/refactoring/actions/ReplaceConstructorWithBuilderAction.java index 429aeed4e6c0..0775c65258a8 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/ReplaceConstructorWithBuilderAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/ReplaceConstructorWithBuilderAction.java @@ -27,6 +27,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.replaceConstructorWithBuilder.ReplaceConstructorWithBuilderHandler; +import org.jetbrains.annotations.NotNull; public class ReplaceConstructorWithBuilderAction extends BaseRefactoringAction{ protected boolean isAvailableInEditorOnly() { @@ -34,18 +35,18 @@ public class ReplaceConstructorWithBuilderAction extends BaseRefactoringAction{ } @Override - protected boolean isAvailableOnElementInEditorAndFile(PsiElement element, Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element, @NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { final int offset = editor.getCaretModel().getOffset(); final PsiElement elementAt = file.findElementAt(offset); final PsiClass psiClass = ReplaceConstructorWithBuilderHandler.getParentNamedClass(elementAt); return psiClass != null && psiClass.getConstructors().length > 0; } - protected boolean isEnabledOnElements(final PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull final PsiElement[] elements) { return false; } - protected RefactoringActionHandler getHandler(final DataContext dataContext) { + protected RefactoringActionHandler getHandler(@NotNull final DataContext dataContext) { return new ReplaceConstructorWithBuilderHandler(); } } diff --git a/java/java-impl/src/com/intellij/refactoring/actions/ReplaceConstructorWithFactoryAction.java b/java/java-impl/src/com/intellij/refactoring/actions/ReplaceConstructorWithFactoryAction.java index d73d802eb1aa..1d32d0ee5183 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/ReplaceConstructorWithFactoryAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/ReplaceConstructorWithFactoryAction.java @@ -22,6 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.replaceConstructorWithFactory.ReplaceConstructorWithFactoryHandler; +import org.jetbrains.annotations.NotNull; /** * @author dsl @@ -31,13 +32,13 @@ public class ReplaceConstructorWithFactoryAction extends BaseRefactoringAction { return false; } - protected boolean isEnabledOnElements(PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return elements.length == 1 && (elements[0] instanceof PsiMethod && ((PsiMethod)elements[0]).isConstructor() || elements[0] instanceof PsiClass) && elements[0].getLanguage().isKindOf(JavaLanguage.INSTANCE); } - protected RefactoringActionHandler getHandler(DataContext dataContext) { + protected RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new ReplaceConstructorWithFactoryHandler(); } } diff --git a/java/java-impl/src/com/intellij/refactoring/actions/ReplaceMethodWithMethodObjectAction.java b/java/java-impl/src/com/intellij/refactoring/actions/ReplaceMethodWithMethodObjectAction.java index ad4433b1af56..e103ab110d36 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/ReplaceMethodWithMethodObjectAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/ReplaceMethodWithMethodObjectAction.java @@ -24,17 +24,18 @@ import com.intellij.openapi.actionSystem.DataContext; import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.extractMethodObject.ExtractMethodObjectHandler; +import org.jetbrains.annotations.NotNull; public class ReplaceMethodWithMethodObjectAction extends BaseRefactoringAction{ protected boolean isAvailableInEditorOnly() { return true; } - protected boolean isEnabledOnElements(final PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull final PsiElement[] elements) { return false; } - protected RefactoringActionHandler getHandler(final DataContext dataContext) { + protected RefactoringActionHandler getHandler(@NotNull final DataContext dataContext) { return new ExtractMethodObjectHandler(); } } \ No newline at end of file diff --git a/java/java-impl/src/com/intellij/refactoring/actions/TempWithQueryAction.java b/java/java-impl/src/com/intellij/refactoring/actions/TempWithQueryAction.java index 6717bc14dd56..704f6efa6dd5 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/TempWithQueryAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/TempWithQueryAction.java @@ -23,21 +23,22 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiLocalVariable; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.tempWithQuery.TempWithQueryHandler; +import org.jetbrains.annotations.NotNull; public class TempWithQueryAction extends BaseRefactoringAction{ public boolean isAvailableInEditorOnly() { return true; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return false; } - public RefactoringActionHandler getHandler(DataContext dataContext) { + public RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new TempWithQueryHandler(); } - protected boolean isAvailableOnElementInEditorAndFile(final PsiElement element, final Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull final PsiElement element, @NotNull final Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { return element instanceof PsiLocalVariable && ((PsiLocalVariable) element).getInitializer() != null; } } \ No newline at end of file diff --git a/java/java-impl/src/com/intellij/refactoring/actions/TurnRefsToSuperAction.java b/java/java-impl/src/com/intellij/refactoring/actions/TurnRefsToSuperAction.java index db8ca11a9bbd..b4895335c37d 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/TurnRefsToSuperAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/TurnRefsToSuperAction.java @@ -21,17 +21,18 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.turnRefsToSuper.TurnRefsToSuperHandler; +import org.jetbrains.annotations.NotNull; public class TurnRefsToSuperAction extends BaseRefactoringAction { public boolean isAvailableInEditorOnly() { return false; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return elements.length == 1 && elements[0] instanceof PsiClass && elements[0].getLanguage() == JavaLanguage.INSTANCE; } - public RefactoringActionHandler getHandler(DataContext dataContext) { + public RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new TurnRefsToSuperHandler(); } } \ No newline at end of file diff --git a/java/java-impl/src/com/intellij/refactoring/actions/TypeCookAction.java b/java/java-impl/src/com/intellij/refactoring/actions/TypeCookAction.java index 03f14276cc19..f05c7aafe0c2 100644 --- a/java/java-impl/src/com/intellij/refactoring/actions/TypeCookAction.java +++ b/java/java-impl/src/com/intellij/refactoring/actions/TypeCookAction.java @@ -24,6 +24,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.typeCook.TypeCookHandler; +import org.jetbrains.annotations.NotNull; public class TypeCookAction extends BaseRefactoringAction { @@ -35,7 +36,7 @@ public class TypeCookAction extends BaseRefactoringAction { return language.equals(JavaLanguage.INSTANCE); } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { Project project = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); if (project == null) { @@ -59,7 +60,7 @@ public class TypeCookAction extends BaseRefactoringAction { return true; } - public RefactoringActionHandler getHandler(DataContext dataContext) { + public RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return getHandler(); } public RefactoringActionHandler getHandler() { diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/actions/ChangeTypeSignatureAction.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/actions/ChangeTypeSignatureAction.java index d5dc2b00388c..b7eb338fe326 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/actions/ChangeTypeSignatureAction.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/actions/ChangeTypeSignatureAction.java @@ -26,13 +26,14 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.actions.BaseRefactoringAction; import com.intellij.refactoring.typeMigration.ChangeTypeSignatureHandler; +import org.jetbrains.annotations.NotNull; public class ChangeTypeSignatureAction extends BaseRefactoringAction { public boolean isAvailableInEditorOnly() { return false; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { Project currProject = PlatformDataKeys.PROJECT.getData(DataManager.getInstance().getDataContext()); if (currProject == null) { @@ -50,7 +51,7 @@ public class ChangeTypeSignatureAction extends BaseRefactoringAction { return true; } - protected boolean isAvailableOnElementInEditorAndFile(final PsiElement element, final Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull final PsiElement element, @NotNull final Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { final int offset = TargetElementUtilBase.adjustOffset(file, editor.getDocument(), editor.getCaretModel().getOffset()); final PsiElement psiElement = file.findElementAt(offset); final PsiReferenceParameterList referenceParameterList = PsiTreeUtil.getParentOfType(psiElement, PsiReferenceParameterList.class); @@ -60,7 +61,7 @@ public class ChangeTypeSignatureAction extends BaseRefactoringAction { return PsiTreeUtil.getParentOfType(psiElement, PsiTypeElement.class) != null; } - public RefactoringActionHandler getHandler(DataContext dataContext) { + public RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new ChangeTypeSignatureHandler(); } } diff --git a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueAction.java b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueAction.java index ecc505629b44..026fa135fdb3 100644 --- a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueAction.java +++ b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueAction.java @@ -21,10 +21,11 @@ import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.actions.BaseRefactoringAction; +import org.jetbrains.annotations.NotNull; public class WrapReturnValueAction extends BaseRefactoringAction{ - protected RefactoringActionHandler getHandler(DataContext context){ + protected RefactoringActionHandler getHandler(@NotNull DataContext context){ return new WrapReturnValueHandler(); } @@ -33,7 +34,7 @@ public class WrapReturnValueAction extends BaseRefactoringAction{ } @Override - protected boolean isAvailableOnElementInEditorAndFile(PsiElement element, Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element, @NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { final PsiMethod psiMethod = PsiTreeUtil.getParentOfType(element, PsiMethod.class, false); if (psiMethod != null && !(psiMethod instanceof PsiCompiledElement)) { final PsiType returnType = psiMethod.getReturnType(); @@ -42,7 +43,7 @@ public class WrapReturnValueAction extends BaseRefactoringAction{ return false; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { if (elements.length != 1) { return false; } diff --git a/platform/lang-impl/src/com/intellij/ide/actions/QuickChangeCodeStyleSchemeAction.java b/platform/lang-impl/src/com/intellij/ide/actions/QuickChangeCodeStyleSchemeAction.java index 72fd2900a2e4..f4d6dfdb1e5b 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/QuickChangeCodeStyleSchemeAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/QuickChangeCodeStyleSchemeAction.java @@ -25,6 +25,7 @@ import com.intellij.psi.codeStyle.CodeStyleSchemes; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.psi.impl.source.codeStyle.CodeStyleSchemeImpl; import com.intellij.psi.impl.source.codeStyle.CodeStyleSchemesImpl; +import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -32,7 +33,7 @@ import java.util.Collection; * @author max */ public class QuickChangeCodeStyleSchemeAction extends QuickSwitchSchemeAction { - protected void fillActions(Project project, DefaultActionGroup group, DataContext dataContext) { + protected void fillActions(Project project, @NotNull DefaultActionGroup group, @NotNull DataContext dataContext) { final CodeStyleSettingsManager manager = CodeStyleSettingsManager.getInstance(project); if (manager.PER_PROJECT_SETTINGS != null) { //noinspection HardCodedStringLiteral diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesPopupAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesPopupAction.java index 385ea6e1fc55..53d3a7f11368 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesPopupAction.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesPopupAction.java @@ -21,13 +21,14 @@ import com.intellij.ide.favoritesTreeView.FavoritesManager; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; /** * User: anna * Date: Feb 24, 2005 */ public class AddToFavoritesPopupAction extends QuickSwitchSchemeAction { - protected void fillActions(Project project, DefaultActionGroup group, DataContext dataContext) { + protected void fillActions(Project project, @NotNull DefaultActionGroup group, @NotNull DataContext dataContext) { group.removeAll(); final String[] availableFavoritesLists = FavoritesManager.getInstance(project).getAvailableFavoritesListNames(); for (String favoritesList : availableFavoritesLists) { diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java index 650c2014b8ba..3a80a88c3bf2 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java @@ -60,7 +60,7 @@ public abstract class BasePlatformRefactoringAction extends BaseRefactoringActio } @Override - protected final RefactoringActionHandler getHandler(DataContext dataContext) { + protected final RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { PsiElement element = null; Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); @@ -123,7 +123,7 @@ public abstract class BasePlatformRefactoringAction extends BaseRefactoringActio } @Override - protected boolean isAvailableOnElementInEditorAndFile(PsiElement element, Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element, @NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { return getHandler(context) != null; } @@ -133,7 +133,7 @@ public abstract class BasePlatformRefactoringAction extends BaseRefactoringActio } @Override - protected boolean isEnabledOnElements(PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull PsiElement[] elements) { if (elements.length > 0) { Language language = elements[0].getLanguage(); RefactoringActionHandler handler = getHandler(language, elements[0]); diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java index 332f352d3881..de7b985bb7c9 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/BaseRefactoringAction.java @@ -57,19 +57,20 @@ public abstract class BaseRefactoringAction extends AnAction { protected abstract boolean isAvailableInEditorOnly(); - protected abstract boolean isEnabledOnElements(PsiElement[] elements); + protected abstract boolean isEnabledOnElements(@NotNull PsiElement[] elements); - protected boolean isAvailableOnElementInEditorAndFile(final PsiElement element, final Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element, @NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { return true; } - protected boolean hasAvailableHandler(DataContext dataContext) { + protected boolean hasAvailableHandler(@NotNull DataContext dataContext) { return getHandler(dataContext) != null; } @Nullable - protected abstract RefactoringActionHandler getHandler(DataContext dataContext); + protected abstract RefactoringActionHandler getHandler(@NotNull DataContext dataContext); + @Override public final void actionPerformed(AnActionEvent e) { DataContext dataContext = e.getDataContext(); final Project project = e.getData(PlatformDataKeys.PROJECT); @@ -129,6 +130,7 @@ public abstract class BaseRefactoringAction extends AnAction { return false; } + @Override public void update(AnActionEvent e) { Presentation presentation = e.getPresentation(); presentation.setVisible(true); diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/ChangeSignatureAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/ChangeSignatureAction.java index 10e3c6b54ca2..c316d98482f5 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/ChangeSignatureAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/ChangeSignatureAction.java @@ -40,11 +40,11 @@ public class ChangeSignatureAction extends BaseRefactoringAction { return false; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return elements.length == 1 && findTargetMember(elements[0]) != null; } - protected boolean isAvailableOnElementInEditorAndFile(final PsiElement element, final Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull final PsiElement element, @NotNull final Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { PsiElement targetMember = findTargetMember(file, editor); if (targetMember == null) { final ChangeSignatureHandler targetHandler = getChangeSignatureHandler(file.getLanguage()); @@ -88,7 +88,7 @@ public class ChangeSignatureAction extends BaseRefactoringAction { } @Override - protected boolean hasAvailableHandler(DataContext dataContext) { + protected boolean hasAvailableHandler(@NotNull DataContext dataContext) { final Project project = PlatformDataKeys.PROJECT.getData(dataContext); if (project == null) return false; final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext); @@ -105,7 +105,7 @@ public class ChangeSignatureAction extends BaseRefactoringAction { return targetMember != null && getChangeSignatureHandler(targetMember.getLanguage()) != null; } - public RefactoringActionHandler getHandler(DataContext dataContext) { + public RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { Language language = LangDataKeys.LANGUAGE.getData(dataContext); if (language == null) { PsiElement psiElement = LangDataKeys.PSI_ELEMENT.getData(dataContext); diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractIncludeAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractIncludeAction.java index 3201d002312f..59f5ca9213bb 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractIncludeAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractIncludeAction.java @@ -25,6 +25,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.lang.LanguageExtractInclude; +import org.jetbrains.annotations.NotNull; /** * @author ven @@ -34,7 +35,7 @@ public class ExtractIncludeAction extends BaseRefactoringAction { return true; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return false; } @@ -59,7 +60,7 @@ public class ExtractIncludeAction extends BaseRefactoringAction { return LanguageExtractInclude.INSTANCE.forLanguage(baseLanguage) != null; } - public RefactoringActionHandler getHandler(DataContext dataContext) { + public RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { PsiFile file = LangDataKeys.PSI_FILE.getData(dataContext); if (file == null) return null; return LanguageExtractInclude.INSTANCE.forLanguage(file.getViewProvider().getBaseLanguage()); diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractMethodAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractMethodAction.java index 029b0751c243..97dde20d0fdf 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractMethodAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractMethodAction.java @@ -32,7 +32,7 @@ public class ExtractMethodAction extends BasePlatformRefactoringAction { return true; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return false; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/InlineAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/InlineAction.java index 20365ef56a33..f456656c83d3 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/InlineAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/InlineAction.java @@ -51,11 +51,11 @@ public class InlineAction extends BasePlatformRefactoringAction { } @Override - protected boolean isAvailableOnElementInEditorAndFile(PsiElement element, Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element, @NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { return hasInlineActionHandler(element, PsiUtilBase.getLanguageInEditor(editor, element.getProject()), editor); } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return elements.length == 1 && hasInlineActionHandler(elements [0], null, null); } diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceConstantAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceConstantAction.java index 4146daac3434..03d813bd9a4e 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceConstantAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceConstantAction.java @@ -37,7 +37,7 @@ public class IntroduceConstantAction extends BasePlatformRefactoringAction { return true; } - protected boolean isEnabledOnElements(PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return false; } } diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceFieldAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceFieldAction.java index 84b3948ff6c4..4a29266f0a43 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceFieldAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceFieldAction.java @@ -37,7 +37,7 @@ public class IntroduceFieldAction extends BasePlatformRefactoringAction { return true; } - protected boolean isEnabledOnElements(PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return false; } } diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceParameterAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceParameterAction.java index c2d398cec233..4d6468f0fd5c 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceParameterAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceParameterAction.java @@ -36,7 +36,7 @@ public class IntroduceParameterAction extends BasePlatformRefactoringAction { return true; } - protected boolean isEnabledOnElements(PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return false; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceVariableAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceVariableAction.java index 946c2dd3cd88..3f735235994c 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceVariableAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/IntroduceVariableAction.java @@ -32,7 +32,7 @@ public class IntroduceVariableAction extends BasePlatformRefactoringAction { return true; } - protected boolean isEnabledOnElements(PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return false; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/MoveAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/MoveAction.java index e1cbd4cc6bea..e74572b4c603 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/MoveAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/MoveAction.java @@ -21,6 +21,7 @@ import com.intellij.openapi.actionSystem.DataContext; import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.move.MoveHandler; +import org.jetbrains.annotations.NotNull; public class MoveAction extends BaseRefactoringAction { @@ -37,7 +38,7 @@ public class MoveAction extends BaseRefactoringAction { return true; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return MoveHandler.canMove(elements, null); } @@ -45,7 +46,7 @@ public class MoveAction extends BaseRefactoringAction { return MoveHandler.canMove(dataContext); } - public RefactoringActionHandler getHandler(DataContext dataContext) { + public RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new MoveHandler(); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/RefactoringQuickListPopupAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/RefactoringQuickListPopupAction.java index 4f84db060360..a4e053d25669 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/RefactoringQuickListPopupAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/RefactoringQuickListPopupAction.java @@ -20,13 +20,14 @@ import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.ListPopup; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public class RefactoringQuickListPopupAction extends QuickSwitchSchemeAction { protected void fillActions(@Nullable final Project project, - final DefaultActionGroup group, - final DataContext dataContext) { + @NotNull final DefaultActionGroup group, + @NotNull final DataContext dataContext) { if (project == null) { return; } @@ -37,9 +38,10 @@ public class RefactoringQuickListPopupAction extends QuickSwitchSchemeAction { } private static void collectEnabledChildren(AnAction action, - DefaultActionGroup destinationGroup, - DataContext dataContext, - ActionManager actionManager, boolean popup) { + @NotNull DefaultActionGroup destinationGroup, + @NotNull DataContext dataContext, + @NotNull ActionManager actionManager, + boolean popup) { if (action instanceof DefaultActionGroup) { final AnAction[] children = ((DefaultActionGroup)action).getChildren(null); for (AnAction child : children) { diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java index 346465870ecc..7157e8fd2948 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java @@ -25,6 +25,7 @@ import com.intellij.psi.PsiNamedElement; import com.intellij.psi.SyntheticElement; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.rename.RenameHandlerRegistry; +import org.jetbrains.annotations.NotNull; public class RenameElementAction extends BaseRefactoringAction { @@ -36,19 +37,19 @@ public class RenameElementAction extends BaseRefactoringAction { return false; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { if (elements.length != 1) return false; PsiElement element = elements[0]; return element instanceof PsiNamedElement && !(element instanceof SyntheticElement); } - public RefactoringActionHandler getHandler(DataContext dataContext) { + public RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return RenameHandlerRegistry.getInstance().getRenameHandler(dataContext); } @Override - protected boolean hasAvailableHandler(DataContext dataContext) { + protected boolean hasAvailableHandler(@NotNull DataContext dataContext) { return isEnabledOnDataContext(dataContext); } @@ -61,7 +62,7 @@ public class RenameElementAction extends BaseRefactoringAction { } @Override - protected boolean isAvailableOnElementInEditorAndFile(PsiElement element, Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element, @NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { return RenameHandlerRegistry.getInstance().hasAvailableHandler(context); } } diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/SafeDeleteAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/SafeDeleteAction.java index c701e7c66b99..91821c375283 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/SafeDeleteAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/SafeDeleteAction.java @@ -24,6 +24,7 @@ import com.intellij.psi.PsiFile; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.safeDelete.SafeDeleteHandler; import com.intellij.refactoring.safeDelete.SafeDeleteProcessor; +import org.jetbrains.annotations.NotNull; public class SafeDeleteAction extends BaseRefactoringAction { public SafeDeleteAction() { @@ -38,18 +39,18 @@ public class SafeDeleteAction extends BaseRefactoringAction { return true; } - public boolean isEnabledOnElements(PsiElement[] elements) { + public boolean isEnabledOnElements(@NotNull PsiElement[] elements) { for (PsiElement element : elements) { if (!SafeDeleteProcessor.validElement(element)) return false; } return true; } - protected boolean isAvailableOnElementInEditorAndFile(final PsiElement element, final Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull final PsiElement element, @NotNull final Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { return SafeDeleteProcessor.validElement(element); } - public RefactoringActionHandler getHandler(DataContext dataContext) { + public RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new SafeDeleteHandler(); } diff --git a/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java b/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java index 8a29dfa8841c..6323ffec31ef 100644 --- a/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java +++ b/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java @@ -46,6 +46,7 @@ public abstract class QuickSwitchSchemeAction extends AnAction implements DumbAw myShowPopupWithNoActions = showPopupWithNoActions; } + @Override public void actionPerformed(AnActionEvent e) { Project project = e.getData(PlatformDataKeys.PROJECT); DefaultActionGroup group = new DefaultActionGroup(); @@ -53,12 +54,12 @@ public abstract class QuickSwitchSchemeAction extends AnAction implements DumbAw showPopup(e, group); } - protected abstract void fillActions(Project project, DefaultActionGroup group, DataContext dataContext); + protected abstract void fillActions(Project project, @NotNull DefaultActionGroup group, @NotNull DataContext dataContext); private void showPopup(AnActionEvent e, DefaultActionGroup group) { if (!myShowPopupWithNoActions && group.getChildrenCount() == 0) return; final ListPopup popup = JBPopupFactory.getInstance() - .createActionGroupPopup(QuickSwitchSchemeAction.this.getPopupTitle(e), + .createActionGroupPopup(getPopupTitle(e), group, e.getDataContext(), getAidMethod(), true, myActionPlace); @@ -78,6 +79,7 @@ public abstract class QuickSwitchSchemeAction extends AnAction implements DumbAw return e.getPresentation().getText(); } + @Override public void update(AnActionEvent e) { super.update(e); e.getPresentation().setEnabled(e.getData(PlatformDataKeys.PROJECT) != null && isEnabled()); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeColorSchemeAction.java b/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeColorSchemeAction.java index 566d5883e48c..adb9db2b3ea6 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeColorSchemeAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeColorSchemeAction.java @@ -25,6 +25,7 @@ import com.intellij.openapi.editor.colors.impl.EditorColorsSchemeImpl; import com.intellij.openapi.editor.ex.EditorEx; import com.intellij.openapi.options.SharedScheme; import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -32,7 +33,7 @@ import java.util.Collection; * @author max */ public class QuickChangeColorSchemeAction extends QuickSwitchSchemeAction { - protected void fillActions(Project project, DefaultActionGroup group, DataContext dataContext) { + protected void fillActions(Project project, @NotNull DefaultActionGroup group, @NotNull DataContext dataContext) { final EditorColorsScheme[] schemes = EditorColorsManager.getInstance().getAllSchemes(); EditorColorsScheme current = EditorColorsManager.getInstance().getGlobalScheme(); for (final EditorColorsScheme scheme : schemes) { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeKeymapAction.java b/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeKeymapAction.java index d24e51b6e307..28a70b32a0be 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeKeymapAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeKeymapAction.java @@ -22,6 +22,7 @@ import com.intellij.openapi.keymap.ex.KeymapManagerEx; import com.intellij.openapi.keymap.impl.KeymapImpl; import com.intellij.openapi.options.SharedScheme; import com.intellij.openapi.project.Project; +import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -29,7 +30,7 @@ import java.util.Collection; * @author max */ public class QuickChangeKeymapAction extends QuickSwitchSchemeAction { - protected void fillActions(Project project, DefaultActionGroup group, DataContext dataContext) { + protected void fillActions(Project project, @NotNull DefaultActionGroup group, @NotNull DataContext dataContext) { final KeymapManagerEx manager = (KeymapManagerEx) KeymapManager.getInstance(); final Keymap current = manager.getActiveKeymap(); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeLookAndFeel.java b/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeLookAndFeel.java index 68d4376e4ef8..7d9a75c19ea5 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeLookAndFeel.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeLookAndFeel.java @@ -23,6 +23,7 @@ import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -30,7 +31,7 @@ import javax.swing.*; * @author max */ public class QuickChangeLookAndFeel extends QuickSwitchSchemeAction { - protected void fillActions(Project project, DefaultActionGroup group, DataContext dataContext) { + protected void fillActions(Project project, @NotNull DefaultActionGroup group, @NotNull DataContext dataContext) { final LafManager manager = LafManager.getInstance(); final UIManager.LookAndFeelInfo[] lfs = manager.getInstalledLookAndFeels(); final UIManager.LookAndFeelInfo current = manager.getCurrentLookAndFeel(); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeSchemesAction.java b/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeSchemesAction.java index 26d1e931da36..dd20f109158d 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeSchemesAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/QuickChangeSchemesAction.java @@ -19,12 +19,13 @@ import com.intellij.featureStatistics.FeatureUsageTracker; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; +import org.jetbrains.annotations.NotNull; /** * @author max */ public class QuickChangeSchemesAction extends QuickSwitchSchemeAction implements DumbAware { - protected void fillActions(Project project, DefaultActionGroup group, DataContext dataContext) { + protected void fillActions(Project project, @NotNull DefaultActionGroup group, @NotNull DataContext dataContext) { final AnAction[] actions = getGroup().getChildren(null); for (AnAction action : actions) { group.add(action); diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java index 8f8f0d2305ef..bde0f299af19 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java @@ -235,7 +235,7 @@ public class QuickListsManager implements ExportableApplicationComponent, NamedJ getTemplatePresentation().setText(myQuickList.getDisplayName(), false); } - protected void fillActions(Project project, DefaultActionGroup group, DataContext dataContext) { + protected void fillActions(Project project, @NotNull DefaultActionGroup group, @NotNull DataContext dataContext) { ActionManager actionManager = ActionManagerEx.getInstance(); for (String actionId : myQuickList.getActionIds()) { if (QuickList.SEPARATOR_ID.equals(actionId)) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/VcsQuickListPopupAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/VcsQuickListPopupAction.java index 48e9d47b9fd0..e9c627705bbc 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/VcsQuickListPopupAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/VcsQuickListPopupAction.java @@ -28,8 +28,8 @@ public class VcsQuickListPopupAction extends QuickSwitchSchemeAction implements } protected void fillActions(@Nullable final Project project, - final DefaultActionGroup group, - @Nullable final DataContext dataContext) { + @NotNull final DefaultActionGroup group, + @NotNull final DataContext dataContext) { if (project == null) { return; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/ConvertToJavaAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/ConvertToJavaAction.java index f134fa21b5ef..06e56b36d83c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/ConvertToJavaAction.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/ConvertToJavaAction.java @@ -22,6 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.actions.BaseRefactoringAction; +import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.GroovyFileType; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import org.jetbrains.plugins.groovy.refactoring.convertToJava.ConvertToJavaHandler; @@ -32,7 +33,7 @@ import org.jetbrains.plugins.groovy.refactoring.convertToJava.ConvertToJavaHandl public class ConvertToJavaAction extends BaseRefactoringAction { @Override - protected boolean isAvailableOnElementInEditorAndFile(PsiElement element, Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element, @NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { return isEnabledOnElements(new PsiElement[]{element}); } @@ -52,7 +53,7 @@ public class ConvertToJavaAction extends BaseRefactoringAction { } @Override - protected boolean isEnabledOnElements(PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull PsiElement[] elements) { for (PsiElement element : elements) { final PsiFile containingFile = element.getContainingFile(); @@ -63,7 +64,7 @@ public class ConvertToJavaAction extends BaseRefactoringAction { } @Override - protected RefactoringActionHandler getHandler(DataContext dataContext) { + protected RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new ConvertToJavaHandler(); } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/ExtractManagedDependenciesAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/ExtractManagedDependenciesAction.java index 2bcb7fc4d9f2..dcfa5c2a8b34 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/ExtractManagedDependenciesAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/ExtractManagedDependenciesAction.java @@ -54,7 +54,7 @@ public class ExtractManagedDependenciesAction extends BaseRefactoringAction { return true; } - protected boolean isEnabledOnElements(PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return false; } @@ -63,7 +63,7 @@ public class ExtractManagedDependenciesAction extends BaseRefactoringAction { return true; } - protected RefactoringActionHandler getHandler(DataContext dataContext) { + protected RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new MyRefactoringActionHandler(); } @@ -73,7 +73,7 @@ public class ExtractManagedDependenciesAction extends BaseRefactoringAction { } @Override - protected boolean isAvailableOnElementInEditorAndFile(PsiElement element, Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element, @NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { if (!super.isAvailableOnElementInEditorAndFile(element, editor, file, context)) return false; return findDependencyAndParent(file, editor) != null; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java index 32e68155c541..ec3f0310327e 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java @@ -54,7 +54,7 @@ public class IntroducePropertyAction extends BaseRefactoringAction { return true; } - protected boolean isEnabledOnElements(PsiElement[] elements) { + protected boolean isEnabledOnElements(@NotNull PsiElement[] elements) { return false; } @@ -63,7 +63,7 @@ public class IntroducePropertyAction extends BaseRefactoringAction { return true; } - protected RefactoringActionHandler getHandler(DataContext dataContext) { + protected RefactoringActionHandler getHandler(@NotNull DataContext dataContext) { return new MyRefactoringActionHandler(); } @@ -76,7 +76,7 @@ public class IntroducePropertyAction extends BaseRefactoringAction { } @Override - protected boolean isAvailableOnElementInEditorAndFile(PsiElement element, Editor editor, PsiFile file, DataContext context) { + protected boolean isAvailableOnElementInEditorAndFile(@NotNull PsiElement element, @NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext context) { if (!super.isAvailableOnElementInEditorAndFile(element, editor, file, context)) return false; return getSelectedElementAndTextRange(editor, file) != null; } From f8b820e9172da723d45138abb88797aedfc273f8 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 25 Jan 2013 16:48:25 +0400 Subject: [PATCH 3/3] typo --- .../lang-api/src/com/intellij/lang/annotation/Annotation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-api/src/com/intellij/lang/annotation/Annotation.java b/platform/lang-api/src/com/intellij/lang/annotation/Annotation.java index 58373cbc82ed..ceaf70e62f32 100644 --- a/platform/lang-api/src/com/intellij/lang/annotation/Annotation.java +++ b/platform/lang-api/src/com/intellij/lang/annotation/Annotation.java @@ -374,7 +374,7 @@ public final class Annotation implements Segment { } /** - * File level annoations are visualized differently than lesser range annotations by showing a title bar on top of the + * File level annotations are visualized differently than lesser range annotations by showing a title bar on top of the * editor rather than applying text attributes to the text range. * @return true if this particular annotation have been defined as file level. */ @@ -383,7 +383,7 @@ public final class Annotation implements Segment { } /** - * File level annoations are visualized differently than lesser range annotations by showing a title bar on top of the + * File level annotations are visualized differently than lesser range annotations by showing a title bar on top of the * editor rather than applying text attributes to the text range. * @param isFileLevelAnnotation true if this particular annotation should be visualized at file level. */