From 28311298500db71d40baa2710457ec496ab3d9d2 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 2 Apr 2014 17:36:02 +0400 Subject: [PATCH] notnull --- .../src/com/intellij/ide/todo/TodoView.java | 5 +++-- .../openapi/roots/impl/DirectoryIndexImpl.java | 2 +- .../roots/impl/ProjectRootManagerComponent.java | 6 +++--- .../intellij/psi/impl/file/impl/PsiVFSListener.java | 2 +- .../intellij/openapi/fileTypes/FileTypeEvent.java | 6 ++++-- .../intellij/openapi/fileTypes/FileTypeListener.java | 12 +++++++----- .../fileEditor/impl/FileEditorManagerImpl.java | 2 +- .../fileEditor/impl/text/TextEditorComponent.java | 2 +- .../maddyhome/idea/copyright/util/FileTypeUtil.java | 4 ++-- 9 files changed, 23 insertions(+), 18 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java index 9122e9445cfc..10ca2f1ddb85 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoView.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -43,6 +43,7 @@ import com.intellij.ui.content.ContentManager; import com.intellij.util.messages.MessageBusConnection; import org.jdom.Element; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import javax.swing.tree.DefaultTreeModel; @@ -300,7 +301,7 @@ public class TodoView implements PersistentStateComponent, Disposable { private final class MyFileTypeListener extends FileTypeListener.Adapter { @Override - public void fileTypesChanged(FileTypeEvent e){ + public void fileTypesChanged(@NotNull FileTypeEvent e){ // this invokeLater guaranties that this code will be invoked after // PSI gets the same event. DumbService.getInstance(myProject).smartInvokeLater(new Runnable() { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java index f2bd4da6b9b2..f3c7665c2dc2 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java @@ -149,7 +149,7 @@ public class DirectoryIndexImpl extends DirectoryIndex { private void subscribeToFileChanges() { myConnection.subscribe(FileTypeManager.TOPIC, new FileTypeListener.Adapter() { @Override - public void fileTypesChanged(FileTypeEvent event) { + public void fileTypesChanged(@NotNull FileTypeEvent event) { doInitialize(); } }); diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerComponent.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerComponent.java index e68b898a0ec5..d8805664d381 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerComponent.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerComponent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -75,12 +75,12 @@ public class ProjectRootManagerComponent extends ProjectRootManagerImpl { myConnection = project.getMessageBus().connect(project); myConnection.subscribe(FileTypeManager.TOPIC, new FileTypeListener() { @Override - public void beforeFileTypesChanged(FileTypeEvent event) { + public void beforeFileTypesChanged(@NotNull FileTypeEvent event) { beforeRootsChange(true); } @Override - public void fileTypesChanged(FileTypeEvent event) { + public void fileTypesChanged(@NotNull FileTypeEvent event) { rootsChanged(true); } }); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java b/platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java index 64d535c2a5ae..c606c77da854 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/file/impl/PsiVFSListener.java @@ -72,7 +72,7 @@ public class PsiVFSListener extends VirtualFileAdapter { myConnection.subscribe(ProjectTopics.PROJECT_ROOTS, new MyModuleRootListener()); myConnection.subscribe(FileTypeManager.TOPIC, new FileTypeListener.Adapter() { @Override - public void fileTypesChanged(FileTypeEvent e) { + public void fileTypesChanged(@NotNull FileTypeEvent e) { myFileManager.processFileTypesChanged(); } }); diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeEvent.java b/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeEvent.java index 8e238e79244a..558dc65f8ea5 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeEvent.java +++ b/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -15,10 +15,12 @@ */ package com.intellij.openapi.fileTypes; +import org.jetbrains.annotations.NotNull; + import java.util.EventObject; public class FileTypeEvent extends EventObject { - public FileTypeEvent(Object source) { + public FileTypeEvent(@NotNull Object source) { super(source); } } diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeListener.java b/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeListener.java index 346908ea258f..1592abde4823 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeListener.java +++ b/platform/platform-api/src/com/intellij/openapi/fileTypes/FileTypeListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -15,14 +15,16 @@ */ package com.intellij.openapi.fileTypes; +import org.jetbrains.annotations.NotNull; + import java.util.EventListener; public interface FileTypeListener extends EventListener { class Adapter implements FileTypeListener { - @Override public void beforeFileTypesChanged(FileTypeEvent event) { } - @Override public void fileTypesChanged(FileTypeEvent event) { } + @Override public void beforeFileTypesChanged(@NotNull FileTypeEvent event) { } + @Override public void fileTypesChanged(@NotNull FileTypeEvent event) { } } - void beforeFileTypesChanged(FileTypeEvent event); - void fileTypesChanged(FileTypeEvent event); + void beforeFileTypesChanged(@NotNull FileTypeEvent event); + void fileTypesChanged(@NotNull FileTypeEvent event); } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java index d49016ecc855..116fce93527a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java @@ -1772,7 +1772,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec */ private final class MyFileTypeListener extends FileTypeListener.Adapter { @Override - public void fileTypesChanged(final FileTypeEvent event) { + public void fileTypesChanged(@NotNull final FileTypeEvent event) { assertDispatchThread(); final VirtualFile[] openFiles = getOpenFiles(); for (int i = openFiles.length - 1; i >= 0; i--) { diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java index 6287c298c8cc..288227eb51bd 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java @@ -342,7 +342,7 @@ class TextEditorComponent extends JBLoadingPanel implements DataProvider { */ private final class MyFileTypeListener extends FileTypeListener.Adapter { @Override - public void fileTypesChanged(final FileTypeEvent event) { + public void fileTypesChanged(@NotNull final FileTypeEvent event) { assertThread(); // File can be invalid after file type changing. The editor should be removed // by the FileEditorManager if it's invalid. diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java index 70667407f0a3..b885101bde75 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -42,7 +42,7 @@ public class FileTypeUtil { createMappings(); bus.connect().subscribe(FileTypeManager.TOPIC, new FileTypeListener.Adapter() { @Override - public void fileTypesChanged(FileTypeEvent event) { + public void fileTypesChanged(@NotNull FileTypeEvent event) { types = null; } });