From 4af1c4b7ed0f3ca9d9a71c0f1018e54901b4a67f Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 16 Dec 2013 16:54:43 +0400 Subject: [PATCH] notnull --- .../editorActions/smartEnter/SmartEnterAction.java | 6 +++--- .../openapi/editor/actionSystem/EditorAction.java | 7 ++++--- .../openapi/editor/actions/InactiveEditorAction.java | 3 ++- .../editor/actions/TextComponentEditorAction.java | 9 +++++---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterAction.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterAction.java index 4968512eeb26..dd974d735d84 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,6 @@ import com.intellij.lang.Language; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.IdeActions; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.actionSystem.EditorAction; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; @@ -32,6 +31,7 @@ import com.intellij.openapi.editor.actionSystem.EditorWriteActionHandler; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiUtilBase; +import org.jetbrains.annotations.NotNull; import java.util.List; @@ -44,7 +44,7 @@ public class SmartEnterAction extends EditorAction { } @Override - protected Editor getEditor(final DataContext dataContext) { + protected Editor getEditor(@NotNull final DataContext dataContext) { final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor == null) return null; Project project = editor.getProject(); diff --git a/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorAction.java b/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorAction.java index 333316779758..ff0920f418ea 100644 --- a/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorAction.java +++ b/platform/platform-api/src/com/intellij/openapi/editor/actionSystem/EditorAction.java @@ -51,8 +51,9 @@ public abstract class EditorAction extends AnAction implements DumbAware { if (!myHandlersLoaded) { myHandlersLoaded = true; final String id = ActionManager.getInstance().getId(this); - for (int i = Extensions.getExtensions(EditorActionHandlerBean.EP_NAME).length - 1; i >= 0; i--) { - final EditorActionHandlerBean handlerBean = Extensions.getExtensions(EditorActionHandlerBean.EP_NAME)[i]; + EditorActionHandlerBean[] extensions = Extensions.getExtensions(EditorActionHandlerBean.EP_NAME); + for (int i = extensions.length - 1; i >= 0; i--) { + final EditorActionHandlerBean handlerBean = extensions[i]; if (handlerBean.action.equals(id)) { myHandler = handlerBean.getHandler(myHandler); } @@ -68,7 +69,7 @@ public abstract class EditorAction extends AnAction implements DumbAware { } @Nullable - protected Editor getEditor(final DataContext dataContext) { + protected Editor getEditor(@NotNull DataContext dataContext) { return CommonDataKeys.EDITOR.getData(dataContext); } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/InactiveEditorAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/InactiveEditorAction.java index 7a0460e6eec5..96690b5bbbde 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/InactiveEditorAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/InactiveEditorAction.java @@ -24,6 +24,7 @@ import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.actionSystem.EditorAction; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public class InactiveEditorAction extends EditorAction { @@ -33,7 +34,7 @@ public class InactiveEditorAction extends EditorAction { @Override @Nullable - protected Editor getEditor(final DataContext dataContext) { + protected Editor getEditor(@NotNull final DataContext dataContext) { return CommonDataKeys.EDITOR_EVEN_IF_INACTIVE.getData(dataContext); } } \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextComponentEditorAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextComponentEditorAction.java index b71f37632ce6..4f76b927f5d4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextComponentEditorAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TextComponentEditorAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.actionSystem.EditorAction; import com.intellij.openapi.editor.actionSystem.EditorActionHandler; import com.intellij.openapi.editor.textarea.TextComponentEditor; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.text.JTextComponent; @@ -30,18 +31,18 @@ import javax.swing.text.JTextComponent; * @author yole */ public abstract class TextComponentEditorAction extends EditorAction { - protected TextComponentEditorAction(final EditorActionHandler defaultHandler) { + protected TextComponentEditorAction(@NotNull EditorActionHandler defaultHandler) { super(defaultHandler); } @Override @Nullable - protected Editor getEditor(final DataContext dataContext) { + protected Editor getEditor(@NotNull final DataContext dataContext) { return getEditorFromContext(dataContext); } @Nullable - public static Editor getEditorFromContext(final DataContext dataContext) { + public static Editor getEditorFromContext(@NotNull DataContext dataContext) { final Editor editor = CommonDataKeys.EDITOR.getData(dataContext); if (editor != null) return editor; final Object data = PlatformDataKeys.CONTEXT_COMPONENT.getData(dataContext);