From ff5308496da185888e23a7009089dee90da05d38 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Sun, 7 Jun 2020 01:48:29 +0300 Subject: [PATCH] cleanup: push down internal method down into impl GitOrigin-RevId: ee84a1d40268a721c22c9b7efd5839165aed6d87 --- .../openapi/vfs/pointers/VirtualFilePointer.java | 9 ++------- .../intellij/openapi/vfs/impl/FilePointerPartNode.java | 2 +- .../openapi/vfs/impl/VirtualFilePointerImpl.java | 3 +-- .../openapi/vfs/impl/VirtualFilePointersTreeTest.java | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/platform/core-api/src/com/intellij/openapi/vfs/pointers/VirtualFilePointer.java b/platform/core-api/src/com/intellij/openapi/vfs/pointers/VirtualFilePointer.java index e53efe85ff78..e8effa17c23f 100644 --- a/platform/core-api/src/com/intellij/openapi/vfs/pointers/VirtualFilePointer.java +++ b/platform/core-api/src/com/intellij/openapi/vfs/pointers/VirtualFilePointer.java @@ -34,13 +34,8 @@ public interface VirtualFilePointer { @NotNull String getPresentableUrl(); - boolean isValid(); - /** - * @return true if {@link VirtualFilePointerListener#validityChanged(VirtualFilePointer[])} - * should fired for every change beneath this directory (Used for jar directories in libraries) + * @return true if the file exists */ - default boolean isRecursive() { - return false; - } + boolean isValid(); } diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/FilePointerPartNode.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/FilePointerPartNode.java index 4e56b8e1b084..f82d0684d86c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/FilePointerPartNode.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/FilePointerPartNode.java @@ -227,7 +227,7 @@ class FilePointerPartNode { private boolean hasRecursiveDirectoryPointer() { if (leaves == null) return false; if (leaves instanceof VirtualFilePointer) { - return ((VirtualFilePointer)leaves).isRecursive(); + return ((VirtualFilePointerImpl)leaves).isRecursive(); } VirtualFilePointerImpl[] leaves = (VirtualFilePointerImpl[])this.leaves; for (VirtualFilePointerImpl leaf : leaves) { diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java index f9f9952a61ee..07d8a8fb9f4c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java @@ -129,8 +129,7 @@ class VirtualFilePointerImpl extends TraceableDisposable implements VirtualFileP return node.incrementUsageCount(delta); } - @Override - public boolean isRecursive() { + boolean isRecursive() { return recursive; } } diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointersTreeTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointersTreeTest.java index 15fa24665abc..8deaa0febcbb 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointersTreeTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointersTreeTest.java @@ -75,7 +75,7 @@ public class VirtualFilePointersTreeTest extends HeavyPlatformTestCase { VirtualFile parent = createChildDirectory(root, "parent"); VirtualFileSystemEntry dir = (VirtualFileSystemEntry)createChildDirectory(parent, "dir"); assertPointersUnder(dir, "inner"); - assertTrue(innerPointer.isRecursive()); + assertTrue(((VirtualFilePointerImpl)innerPointer).isRecursive()); } public void testUrlsHavingOnlyStartingSlashInCommon() {