MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-02-19 14:21:10 +04:00
parent f6795f26e0
commit 656d39f4d2
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java
+6 -7
View File
@@ -40,7 +40,6 @@ import org.jetbrains.annotations.TestOnly;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.*;
public final class LocalFileSystemImpl extends LocalFileSystemBase implements ApplicationComponent {
@@ -141,7 +140,7 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap
}
@TestOnly
public void cleanupForNextTest(@NotNull Set<VirtualFile> survivors) throws IOException {
public void cleanupForNextTest() {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
@@ -195,7 +194,7 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap
}
}
if (currentNode.watchRequest.isToWatchRecursively() && currentNode.nodes.size() > 0) {
if (currentNode.watchRequest.isToWatchRecursively() && !currentNode.nodes.isEmpty()) {
// since we are watching this node recursively, we can remove it's children
visitTree(currentNode, new Consumer<TreeNode>() {
@Override
@@ -388,12 +387,10 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap
if (rootPaths.isEmpty() || !myWatcher.isOperational()) {
return Collections.emptySet();
}
else if (watchRecursively) {
if (watchRecursively) {
return replaceWatchedRoots(Collections.<WatchRequest>emptySet(), rootPaths, null);
}
else {
return replaceWatchedRoots(Collections.<WatchRequest>emptySet(), null, rootPaths);
}
return replaceWatchedRoots(Collections.<WatchRequest>emptySet(), null, rootPaths);
}
@Override
@@ -401,6 +398,7 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap
if (watchRequests.isEmpty()) return;
ApplicationManager.getApplication().runReadAction(new Runnable() {
@Override
public void run() {
synchronized (myLock) {
final boolean update = doRemoveWatchedRoots(watchRequests);
@@ -429,6 +427,7 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap
final Set<VirtualFile> filesToSync = new HashSet<VirtualFile>();
ApplicationManager.getApplication().runReadAction(new Runnable() {
@Override
public void run() {
synchronized (myLock) {
final boolean update = doAddRootsToWatch(recursiveRoots, flatRoots, result, filesToSync) ||
platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
+3 -8
View File
@@ -338,14 +338,9 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
((PsiManagerEx)PsiManager.getInstance(project)).getFileManager().cleanupForNextTest();
}
try {
LocalFileSystemImpl localFileSystem = (LocalFileSystemImpl)LocalFileSystem.getInstance();
if (localFileSystem != null) {
localFileSystem.cleanupForNextTest(eternallyLivingFiles());
}
}
catch (IOException e) {
// ignore
LocalFileSystemImpl localFileSystem = (LocalFileSystemImpl)LocalFileSystem.getInstance();
if (localFileSystem != null) {
localFileSystem.cleanupForNextTest();
}
LocalHistoryImpl.getInstanceImpl().cleanupForNextTest();