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

EA-36386 (missing watch root disk isn't so catastrophic)

Browse Source
This commit is contained in:
Roman Shevchenko
2012-06-08 20:31:54 +04:00
parent f793b78688
commit fcacee79e7
1 changed files with 22 additions and 5 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
+22 -5
View File
@@ -40,6 +40,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.*;
@@ -55,14 +56,17 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap
private String myFSRootPath;
private boolean myDominated;
public WatchRequestImpl(String rootPath, final boolean toWatchRecursively) {
public WatchRequestImpl(String rootPath, final boolean toWatchRecursively) throws FileNotFoundException {
final int index = rootPath.indexOf(JarFileSystem.JAR_SEPARATOR);
if (index >= 0) rootPath = rootPath.substring(0, index);
File rootFile = new File(FileUtil.toSystemDependentName(rootPath));
if (index > 0 || !rootFile.isDirectory()) {
rootFile = rootFile.getParentFile();
assert rootFile != null : rootPath;
final File parentFile = rootFile.getParentFile();
if (parentFile == null) {
throw new FileNotFoundException(rootPath);
}
rootFile = parentFile;
}
myFSRootPath = rootFile.getAbsolutePath();
@@ -437,7 +441,8 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap
boolean update = false;
for (String root : recursiveRoots) {
final WatchRequestImpl request = new WatchRequestImpl(root, true);
final WatchRequestImpl request = watch(root, true);
if (request == null) continue;
final boolean alreadyWatched = isAlreadyWatched(request);
request.myDominated = alreadyWatched;
@@ -448,7 +453,8 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap
}
for (String root : flatRoots) {
final WatchRequestImpl request = new WatchRequestImpl(root, false);
final WatchRequestImpl request = watch(root, false);
if (request == null) continue;
final boolean alreadyWatched = isAlreadyWatched(request);
if (!alreadyWatched) {
@@ -468,6 +474,17 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap
return update;
}
@Nullable
private static WatchRequestImpl watch(final String root, final boolean recursively) {
try {
return new WatchRequestImpl(root, recursively);
}
catch (FileNotFoundException e) {
LOG.warn(e);
return null;
}
}
private void syncFiles(@NotNull final Set<VirtualFile> filesToSync) {
if (filesToSync.isEmpty() || ApplicationManager.getApplication().isUnitTestMode()) return;