From 40f94c58dba4d178fdd609ae0fbda70fddf08845 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 15 Mar 2012 17:03:14 +0400 Subject: [PATCH] notnull --- .../intellij/codeInsight/daemon/impl/DaemonListeners.java | 2 +- .../com/intellij/codeInsight/daemon/impl/EditorTracker.java | 4 ++-- .../codeInsight/intention/impl/IntentionHintComponent.java | 2 +- .../intellij/codeInsight/lookup/impl/LookupManagerImpl.java | 2 +- .../codeInsight/template/impl/TemplateManagerImpl.java | 2 +- .../changeSignature/ChangeSignatureGestureDetector.java | 4 ++-- .../intellij/openapi/editor/event/EditorFactoryAdapter.java | 6 ++++-- .../openapi/editor/event/EditorFactoryListener.java | 6 ++++-- .../intellij/openapi/vfs/encoding/EncodingManagerImpl.java | 2 +- .../intellij/openapi/vcs/impl/LineStatusTrackerManager.java | 4 ++-- .../intelliLang/inject/quickedit/QuickEditAction.java | 4 ++-- 11 files changed, 21 insertions(+), 17 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java index f91690134a2e..728c07dcac87 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java @@ -161,7 +161,7 @@ class DaemonListeners implements Disposable { EditorFactoryListener editorFactoryListener = new EditorFactoryAdapter() { @Override - public void editorCreated(EditorFactoryEvent event) { + public void editorCreated(@NotNull EditorFactoryEvent event) { Editor editor = event.getEditor(); Document document = editor.getDocument(); Project editorProject = editor.getProject(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/EditorTracker.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/EditorTracker.java index 59ded408fb52..2e2407476f10 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/EditorTracker.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/EditorTracker.java @@ -228,7 +228,7 @@ public class EditorTracker extends AbstractProjectComponent { private final Map myExecuteOnEditorRelease = new HashMap(); @Override - public void editorCreated(EditorFactoryEvent event) { + public void editorCreated(@NotNull EditorFactoryEvent event) { final Editor editor = event.getEditor(); if (editor.getProject() != null && editor.getProject() != myProject) return; PsiFile psiFile = PsiDocumentManager.getInstance(myProject).getPsiFile(editor.getDocument()); @@ -267,7 +267,7 @@ public class EditorTracker extends AbstractProjectComponent { } @Override - public void editorReleased(EditorFactoryEvent event) { + public void editorReleased(@NotNull EditorFactoryEvent event) { final Editor editor = event.getEditor(); if (editor.getProject() != null && editor.getProject() != myProject) return; unregisterEditor(editor); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java index c54b5a8d1fa8..fc1a2811b841 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java @@ -363,7 +363,7 @@ public class IntentionHintComponent extends JPanel implements Disposable, Scroll // dispose myself when editor closed EditorFactory.getInstance().addEditorFactoryListener(new EditorFactoryAdapter() { @Override - public void editorReleased(EditorFactoryEvent event) { + public void editorReleased(@NotNull EditorFactoryEvent event) { if (event.getEditor() == myEditor) { hide(); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java index 41beb94ba8c8..fff9ed1e854e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupManagerImpl.java @@ -95,7 +95,7 @@ public class LookupManagerImpl extends LookupManager { final EditorFactoryAdapter myEditorFactoryListener = new EditorFactoryAdapter() { - public void editorReleased(EditorFactoryEvent event) { + public void editorReleased(@NotNull EditorFactoryEvent event) { if (event.getEditor() == myActiveLookupEditor) { hideActiveLookup(); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java index 0dc5bfd329b9..a6490bdbf1a6 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateManagerImpl.java @@ -69,7 +69,7 @@ public class TemplateManagerImpl extends TemplateManager implements ProjectCompo public void projectOpened() { final EditorFactoryListener myEditorFactoryListener = new EditorFactoryAdapter() { - public void editorReleased(EditorFactoryEvent event) { + public void editorReleased(@NotNull EditorFactoryEvent event) { Editor editor = event.getEditor(); if (editor.getProject() != null && editor.getProject() != myProject) return; if (myProject.isDisposed() || !myProject.isOpen()) return; diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java index 0873fa711ad1..681884ea408a 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java @@ -214,7 +214,7 @@ public class ChangeSignatureGestureDetector extends PsiTreeChangeAdapter impleme } @Override - public void editorCreated(EditorFactoryEvent event) { + public void editorCreated(@NotNull EditorFactoryEvent event) { final Editor editor = event.getEditor(); if (editor.getProject() != myProject) return; addDocListener(editor.getDocument()); @@ -233,7 +233,7 @@ public class ChangeSignatureGestureDetector extends PsiTreeChangeAdapter impleme } @Override - public void editorReleased(EditorFactoryEvent event) { + public void editorReleased(@NotNull EditorFactoryEvent event) { final EditorEx editor = (EditorEx)event.getEditor(); final Document document = editor.getDocument(); diff --git a/platform/platform-api/src/com/intellij/openapi/editor/event/EditorFactoryAdapter.java b/platform/platform-api/src/com/intellij/openapi/editor/event/EditorFactoryAdapter.java index 1bda220ef7ef..79c53b939203 100644 --- a/platform/platform-api/src/com/intellij/openapi/editor/event/EditorFactoryAdapter.java +++ b/platform/platform-api/src/com/intellij/openapi/editor/event/EditorFactoryAdapter.java @@ -15,13 +15,15 @@ */ package com.intellij.openapi.editor.event; +import org.jetbrains.annotations.NotNull; + /** * @author max */ public abstract class EditorFactoryAdapter implements EditorFactoryListener { - public void editorCreated(EditorFactoryEvent event) { + public void editorCreated(@NotNull EditorFactoryEvent event) { } - public void editorReleased(EditorFactoryEvent event) { + public void editorReleased(@NotNull EditorFactoryEvent event) { } } diff --git a/platform/platform-api/src/com/intellij/openapi/editor/event/EditorFactoryListener.java b/platform/platform-api/src/com/intellij/openapi/editor/event/EditorFactoryListener.java index 3985caa368eb..faf45bdb8ae4 100644 --- a/platform/platform-api/src/com/intellij/openapi/editor/event/EditorFactoryListener.java +++ b/platform/platform-api/src/com/intellij/openapi/editor/event/EditorFactoryListener.java @@ -15,13 +15,15 @@ */ package com.intellij.openapi.editor.event; +import org.jetbrains.annotations.NotNull; + import java.util.EventListener; /** * @see {@link com.intellij.openapi.editor.EditorFactory#addEditorFactoryListener(com.intellij.openapi.editor.event.EditorFactoryListener)} */ public interface EditorFactoryListener extends EventListener { - void editorCreated(EditorFactoryEvent event); - void editorReleased(EditorFactoryEvent event); + void editorCreated(@NotNull EditorFactoryEvent event); + void editorReleased(@NotNull EditorFactoryEvent event); } diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java index 4e440a6ab117..5b7d4cbfadf3 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/encoding/EncodingManagerImpl.java @@ -105,7 +105,7 @@ public class EncodingManagerImpl extends EncodingManager implements PersistentSt }, this); editorFactory.addEditorFactoryListener(new EditorFactoryAdapter() { @Override - public void editorCreated(EditorFactoryEvent event) { + public void editorCreated(@NotNull EditorFactoryEvent event) { queueUpdateEncodingFromContent(event.getEditor().getDocument()); } }, this); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.java index 03ef2c454139..94731987f913 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/LineStatusTrackerManager.java @@ -382,7 +382,7 @@ public class LineStatusTrackerManager implements ProjectComponent, LineStatusTra } private class MyEditorFactoryListener extends EditorFactoryAdapter { - public void editorCreated(EditorFactoryEvent event) { + public void editorCreated(@NotNull EditorFactoryEvent event) { // note that in case of lazy loading of configurables, this event can happen // outside of EDT, so the EDT check mustn't be done here Editor editor = event.getEditor(); @@ -400,7 +400,7 @@ public class LineStatusTrackerManager implements ProjectComponent, LineStatusTra }.callMe(); } - public void editorReleased(EditorFactoryEvent event) { + public void editorReleased(@NotNull EditorFactoryEvent event) { final Editor editor = event.getEditor(); if (editor.getProject() != null && editor.getProject() != myProject) return; final Document doc = editor.getDocument(); diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java index d28ceda75809..48d6aaf37d54 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditAction.java @@ -203,7 +203,7 @@ public class QuickEditAction implements IntentionAction, LowPriorityAction { }); EditorFactory.getInstance().addEditorFactoryListener(new EditorFactoryAdapter() { @Override - public void editorCreated(EditorFactoryEvent event) { + public void editorCreated(@NotNull EditorFactoryEvent event) { if (event.getEditor().getDocument() == myNewDocument) { new AnAction() { @Override @@ -221,7 +221,7 @@ public class QuickEditAction implements IntentionAction, LowPriorityAction { } @Override - public void editorReleased(EditorFactoryEvent event) { + public void editorReleased(@NotNull EditorFactoryEvent event) { if (event.getEditor().getDocument() == myNewDocument) { Disposer.dispose(MyHandler.this); myReleased = true;