From bd5f93c5f0fab2a4a9994ea436c01e847c06443a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 3 Apr 2014 16:50:08 +0200 Subject: [PATCH] Cleanup (formatting) --- .../vfs/impl/VirtualFilePointerManagerImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java index f33434def549..20bba47f98f4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java @@ -159,7 +159,7 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp @NotNull private VirtualFilePointer create(@Nullable VirtualFile file, @NotNull String url, - @NotNull final Disposable parentDisposable, + @NotNull Disposable parentDisposable, @Nullable VirtualFilePointerListener listener) { String protocol; VirtualFileSystem fileSystem; @@ -171,11 +171,13 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp protocol = null; fileSystem = file.getFileSystem(); } + if (fileSystem == TEMP_FILE_SYSTEM) { // for tests, recreate always VirtualFile found = file == null ? VirtualFileManager.getInstance().findFileByUrl(url) : file; return new IdentityVirtualFilePointer(found, url); } + if (fileSystem != LOCAL_FILE_SYSTEM && fileSystem != JAR_FILE_SYSTEM) { // we are unable to track alien file systems for now VirtualFile found = fileSystem == null ? null : file != null ? file : VirtualFileManager.getInstance().findFileByUrl(url); @@ -190,14 +192,11 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp url = VirtualFileManager.constructUrl(protocol, path); } else { - path = file.getPath(); - // url has come from VirtualFile.getUrl() and is good enough + path = file.getPath(); // url has come from VirtualFile.getUrl() and is good enough } VirtualFilePointerImpl pointer = getOrCreate(parentDisposable, listener, path, Pair.create(file, url)); - DelegatingDisposable.registerDisposable(parentDisposable, pointer); - return pointer; } @@ -310,13 +309,14 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp } } - private final Set myStoredPointers = ContainerUtil.newIdentityTroveSet(); + private final Set myStoredPointers = ContainerUtil.newIdentityTroveSet(); + @TestOnly public void storePointers() { - //assert myStoredPointers.isEmpty() : myStoredPointers; myStoredPointers.clear(); addAllPointers(myStoredPointers); } + @TestOnly public void assertPointersAreDisposed() { List pointers = new ArrayList(); @@ -422,7 +422,7 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp final VFileMoveEvent moveEvent = (VFileMoveEvent)event; VirtualFile eventFile = moveEvent.getFile(); addPointersUnder(moveEvent.getNewParent().getPath() + "/" + eventFile.getName(), toFireEvents); - + List nodes = new ArrayList(); addPointersUnder(eventFile.getPath(), nodes); for (FilePointerPartNode pair : nodes) {