From 6d2f5f5e35a914f0f5cf3127e1bf5aa19dbbf335 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 30 Mar 2015 15:10:17 +0300 Subject: [PATCH] notnull --- .../intellij/openapi/vfs/LocalFileSystem.java | 27 ++----------------- .../openapi/vfs/ex/temp/TempFileSystem.java | 3 ++- .../vfs/impl/local/LocalFileSystemImpl.java | 1 + .../vfs/impl/win32/Win32LocalFileSystem.java | 3 ++- .../intellij/mock/MockLocalFileSystem.java | 3 ++- 5 files changed, 9 insertions(+), 28 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/LocalFileSystem.java b/platform/platform-api/src/com/intellij/openapi/vfs/LocalFileSystem.java index 78d375d20a99..871202e1f258 100644 --- a/platform/platform-api/src/com/intellij/openapi/vfs/LocalFileSystem.java +++ b/platform/platform-api/src/com/intellij/openapi/vfs/LocalFileSystem.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 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. @@ -44,30 +44,6 @@ public abstract class LocalFileSystem extends NewVirtualFileSystem { return LocalFileSystemHolder.ourInstance; } - /** - * Checks whether given file is a symbolic link. - * - * @param file a file to check. - * @return true if the file is a symbolic link, false otherwise - * @since 11.0 - */ - @Override - public boolean isSymLink(@NotNull final VirtualFile file) { - return false; - } - - /** - * Checks whether given file is a special file. - * - * @param file a file to check. - * @return true if the file exists and is a special one, false otherwise - * @since 11.0 - */ - @Override - public boolean isSpecialFile(@NotNull final VirtualFile file) { - return false; - } - @Nullable public abstract VirtualFile findFileByIoFile(@NotNull File file); @@ -141,6 +117,7 @@ public abstract class LocalFileSystem extends NewVirtualFileSystem { return result.size() == 1 ? result.iterator().next() : null; } + @NotNull public abstract Set replaceWatchedRoots(@NotNull final Collection watchRequests, @Nullable final Collection recursiveRoots, @Nullable final Collection flatRoots); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/ex/temp/TempFileSystem.java b/platform/platform-impl/src/com/intellij/openapi/vfs/ex/temp/TempFileSystem.java index 33ecf625c05d..ee76887c9c5f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/ex/temp/TempFileSystem.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/ex/temp/TempFileSystem.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 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. @@ -378,6 +378,7 @@ public class TempFileSystem extends LocalFileSystemBase { throw new IncorrectOperationException(); } + @NotNull @Override public Set replaceWatchedRoots(@NotNull Collection watchRequests, @Nullable Collection recursiveRoots, diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java index 132d61496687..7f64dbda914d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java @@ -386,6 +386,7 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap }); } + @NotNull @Override public Set replaceWatchedRoots(@NotNull final Collection watchRequests, @Nullable final Collection _recursiveRoots, diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java index 3bbba55e0992..b850cfdedb36 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2015 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. @@ -73,6 +73,7 @@ public class Win32LocalFileSystem extends LocalFileSystemBase { throw new UnsupportedOperationException(); } + @NotNull @Override public Set replaceWatchedRoots(@NotNull Collection watchRequests, @Nullable Collection recursiveRoots, diff --git a/platform/testFramework/src/com/intellij/mock/MockLocalFileSystem.java b/platform/testFramework/src/com/intellij/mock/MockLocalFileSystem.java index 23a371a12f0e..1c62d742ddc5 100644 --- a/platform/testFramework/src/com/intellij/mock/MockLocalFileSystem.java +++ b/platform/testFramework/src/com/intellij/mock/MockLocalFileSystem.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 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. @@ -92,6 +92,7 @@ public class MockLocalFileSystem extends LocalFileSystem { throw new UnsupportedOperationException("Not implemented in " + getClass().getName()); } + @NotNull @Override public Set replaceWatchedRoots(@NotNull Collection watchRequests, @Nullable Collection recursiveRoots,