From f005dddeae13bdf37ed5e9ebe325828011ac0e66 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 2 Oct 2014 13:37:29 +0400 Subject: [PATCH] notnull --- java/java-impl/src/com/intellij/spi/SPIFileType.java | 2 +- .../file/exclude/EnforcedPlainTextFileTypeFactory.java | 2 +- .../fileTypes/ex/FileTypeIdentifiableByVirtualFile.java | 5 +++-- .../com/intellij/util/indexing/FileTypeIndexTest.java | 4 ++-- .../lang/properties/editor/ResourceBundleFileType.java | 2 +- .../plugins/terminal/vfs/TerminalSessionFileType.java | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/java/java-impl/src/com/intellij/spi/SPIFileType.java b/java/java-impl/src/com/intellij/spi/SPIFileType.java index 215ca3b30f99..edad9dd8fb82 100644 --- a/java/java-impl/src/com/intellij/spi/SPIFileType.java +++ b/java/java-impl/src/com/intellij/spi/SPIFileType.java @@ -42,7 +42,7 @@ public class SPIFileType extends LanguageFileType implements FileTypeIdentifiabl } @Override - public boolean isMyFileType(VirtualFile file) { + public boolean isMyFileType(@NotNull VirtualFile file) { VirtualFile parent = file.getParent(); if (parent != null && Comparing.equal("services", parent.getNameSequence())) { final VirtualFile gParent = parent.getParent(); diff --git a/platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeFactory.java b/platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeFactory.java index b0c58d302009..2729a15e40db 100644 --- a/platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeFactory.java +++ b/platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeFactory.java @@ -50,7 +50,7 @@ public class EnforcedPlainTextFileTypeFactory extends FileTypeFactory { myFileType = new FileTypeIdentifiableByVirtualFile() { @Override - public boolean isMyFileType(VirtualFile file) { + public boolean isMyFileType(@NotNull VirtualFile file) { if (isMarkedAsPlainText(file)) { return true; } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeIdentifiableByVirtualFile.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeIdentifiableByVirtualFile.java index 0ca4102d5f12..d75cdcf1a16e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeIdentifiableByVirtualFile.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeIdentifiableByVirtualFile.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. @@ -24,7 +24,8 @@ package com.intellij.openapi.fileTypes.ex; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; public interface FileTypeIdentifiableByVirtualFile extends FileType { - boolean isMyFileType(VirtualFile file); + boolean isMyFileType(@NotNull VirtualFile file); } \ No newline at end of file diff --git a/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java b/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java index 7456fa6eae3c..424346127e4a 100644 --- a/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.java +++ b/platform/platform-tests/testSrc/com/intellij/util/indexing/FileTypeIndexTest.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 FileTypeIndexTest extends LightPlatformCodeInsightFixtureTestCase { static void addAndRemoveFileType() { FileType foo = new FakeFileType() { @Override - public boolean isMyFileType(VirtualFile file) { + public boolean isMyFileType(@NotNull VirtualFile file) { return true; } diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleFileType.java b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleFileType.java index 17a80f527b9b..031ffff861ff 100644 --- a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleFileType.java +++ b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleFileType.java @@ -34,7 +34,7 @@ class ResourceBundleFileType extends FakeFileType { return PropertiesBundle.message("resourcebundle.fake.file.type.description"); } - public boolean isMyFileType(VirtualFile file) { + public boolean isMyFileType(@NotNull VirtualFile file) { return file instanceof ResourceBundleAsVirtualFile; } diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/vfs/TerminalSessionFileType.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/vfs/TerminalSessionFileType.java index bb545a18504c..b9087fa706fe 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/vfs/TerminalSessionFileType.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/vfs/TerminalSessionFileType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 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. @@ -36,7 +36,7 @@ public class TerminalSessionFileType extends FakeFileType { return getName() + " Fake File Type"; } - public boolean isMyFileType(VirtualFile file) { + public boolean isMyFileType(@NotNull VirtualFile file) { return file instanceof TerminalSessionVirtualFileImpl; } }