From bc162bf6be2d930ea388c7acabc838522ad8a8d3 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 15 Jun 2017 19:53:47 +0300 Subject: [PATCH] cleanup --- .../openapi/vfs/impl/VirtualFileManagerImpl.java | 7 +------ .../openapi/vfs/local/CoreLocalVirtualFile.java | 11 ++++------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFileManagerImpl.java b/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFileManagerImpl.java index 92ec34acea4d..e05d8fbe0f09 100644 --- a/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFileManagerImpl.java +++ b/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFileManagerImpl.java @@ -178,12 +178,7 @@ public class VirtualFileManagerImpl extends VirtualFileManagerEx { @Override public void addVirtualFileManagerListener(@NotNull final VirtualFileManagerListener listener, @NotNull Disposable parentDisposable) { addVirtualFileManagerListener(listener); - Disposer.register(parentDisposable, new Disposable() { - @Override - public void dispose() { - removeVirtualFileManagerListener(listener); - } - }); + Disposer.register(parentDisposable, () -> removeVirtualFileManagerListener(listener)); } @Override diff --git a/platform/core-impl/src/com/intellij/openapi/vfs/local/CoreLocalVirtualFile.java b/platform/core-impl/src/com/intellij/openapi/vfs/local/CoreLocalVirtualFile.java index dc2b22d33775..93949c17ab3b 100644 --- a/platform/core-impl/src/com/intellij/openapi/vfs/local/CoreLocalVirtualFile.java +++ b/platform/core-impl/src/com/intellij/openapi/vfs/local/CoreLocalVirtualFile.java @@ -22,8 +22,6 @@ import com.intellij.openapi.vfs.VirtualFileSystem; import org.jetbrains.annotations.NotNull; import java.io.*; -import java.util.ArrayList; -import java.util.List; /** * @author yole @@ -87,16 +85,15 @@ public class CoreLocalVirtualFile extends VirtualFile { public VirtualFile[] getChildren() { VirtualFile[] answer = myChildren; if (answer == null) { - List result = new ArrayList<>(); final File[] files = myIoFile.listFiles(); - if (files == null) { + if (files == null || files.length == 0) { answer = EMPTY_ARRAY; } else { - for (File file : files) { - result.add(new CoreLocalVirtualFile(myFileSystem, file)); + answer = new VirtualFile[files.length]; + for (int i = 0; i < files.length; i++) { + answer[i] = new CoreLocalVirtualFile(myFileSystem, files[i]); } - answer = result.toArray(new VirtualFile[result.size()]); } myChildren = answer; }