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

Do not use FileWatcher when asked to refresh synchronously a single file. FileWatcher native stuff is asynchronous by definition.

Browse Source
This commit is contained in:
Maxim Shafirov
2005-01-19 22:16:46 +03:00
parent 95113e2fee
commit 1c3d92ca57
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java
+9 -4
View File
@@ -367,7 +367,7 @@ public class LocalFileSystemImpl extends LocalFileSystem implements ApplicationC
getManager().addEventToFireByRefresh(action, asynchronous, modalityState);
}
else {
refresh(rootFile, true, false, worker, modalityState);
refresh(rootFile, true, false, worker, modalityState, asynchronous);
}
}
}
@@ -401,8 +401,13 @@ public class LocalFileSystemImpl extends LocalFileSystem implements ApplicationC
return mySynchronizeQueueAlarm;
}
void refresh(VirtualFile file, boolean recursive, boolean storeStatus, WorkerThread worker, ModalityState modalityState) {
if (!FileWatcher.isAvailable()) {
void refresh(VirtualFile file,
boolean recursive,
boolean storeStatus,
WorkerThread worker,
ModalityState modalityState,
boolean asynchronous) {
if (!FileWatcher.isAvailable() || !recursive && !asynchronous) { // We're unable to definitely refresh syncronously by means of file watcher.
((VirtualFileImpl)file).refreshInternal(recursive, worker, modalityState);
}
else {
@@ -438,7 +443,7 @@ public class LocalFileSystemImpl extends LocalFileSystem implements ApplicationC
for (int i = 0; i < children.length; i++) {
VirtualFile child = children[i];
if (status == DIRTY_STATUS && !((VirtualFileImpl)child).getPhysicalFile().exists()) continue; // should be already handled above (see SCR6145)
refresh(child, recursive, false, worker, modalityState);
refresh(child, recursive, false, worker, modalityState, asynchronous);
}
}
}
source/com/intellij/openapi/vfs/impl/local/VirtualFileImpl.java
+1 -1
View File
@@ -559,7 +559,7 @@ public class VirtualFileImpl extends VirtualFile {
myFileSystem.getManager().addEventToFireByRefresh(runnable, asynchronous, modalityState);
}
else {
myFileSystem.refresh(VirtualFileImpl.this, recursive, true, worker, modalityState);
myFileSystem.refresh(VirtualFileImpl.this, recursive, true, worker, modalityState, asynchronous);
}
}
};