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

remove refresh() with modality state from VirtualFile API

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-08-19 20:48:32 +04:00
parent 532435decc
commit f942dfe973
4 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
-8
View File
@@ -15,7 +15,6 @@
*/
package com.intellij.openapi.vfs;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
@@ -574,13 +573,6 @@ public abstract class VirtualFile extends UserDataHolderBase implements Modifica
*/
public abstract void refresh(boolean asynchronous, boolean recursive, Runnable postRunnable);
public void refresh(boolean asynchronous, boolean recursive, Runnable postRunnable, ModalityState modalityState) {
if (modalityState != ModalityState.NON_MODAL) {
LOG.error("Refresh with non-modal modality state is not implemented for file: " + this);
}
refresh(asynchronous, recursive, postRunnable);
}
public String getPresentableName() {
return getName();
}
platform/platform-api/src/com/intellij/openapi/vfs/newvfs/NewVirtualFile.java
-6
View File
@@ -20,7 +20,6 @@
package com.intellij.openapi.vfs.newvfs;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.ThrowableComputable;
@@ -104,11 +103,6 @@ public abstract class NewVirtualFile extends VirtualFile implements VirtualFileW
RefreshQueue.getInstance().refresh(asynchronous, recursive, postRunnable, this);
}
@Override
public void refresh(boolean asynchronous, boolean recursive, Runnable postRunnable, ModalityState modalityState) {
RefreshQueue.getInstance().refresh(asynchronous, recursive, postRunnable, modalityState, this);
}
public long getModificationStamp() {
return myModificationStamp;
}
platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeImpl.java
+7 -4
View File
@@ -39,6 +39,7 @@ import com.intellij.openapi.vfs.JarFileSystem;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.newvfs.NewVirtualFile;
import com.intellij.openapi.vfs.newvfs.RefreshQueue;
import com.intellij.ui.PopupHandler;
import com.intellij.ui.SimpleTextAttributes;
import com.intellij.ui.TreeSpeedSearch;
@@ -483,10 +484,12 @@ public class FileSystemTreeImpl implements FileSystemTree {
}
if (myTreeBuilder.getTreeStructure().isToBuildChildrenInBackground(virtualFile)) {
virtualFile.refresh(true, false, null, ModalityState.stateForComponent(myTree));
} else {
virtualFile.refresh(false, false, null, ModalityState.stateForComponent(myTree));
boolean async = myTreeBuilder.getTreeStructure().isToBuildChildrenInBackground(virtualFile);
if (virtualFile instanceof NewVirtualFile) {
RefreshQueue.getInstance().refresh(async, false, null, ModalityState.stateForComponent(myTree), virtualFile);
}
else {
virtualFile.refresh(async, false);
}
}
}
platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java
+2 -2
View File
@@ -329,10 +329,10 @@ public final class LocalFileSystemImpl extends LocalFileSystemBase implements Ap
if (existingFile != null) {
if (!isAlreadyWatched(result)) {
final ModalityState modalityState = ModalityState.current();
existingFile.refresh(true, toWatchRecursively, null, modalityState);
RefreshQueue.getInstance().refresh(true, toWatchRecursively, null, modalityState, existingFile);
if (existingFile.isDirectory() && !toWatchRecursively && existingFile instanceof NewVirtualFile) {
for (VirtualFile child : ((NewVirtualFile)existingFile).getCachedChildren()) {
child.refresh(true, false, null, modalityState);
RefreshQueue.getInstance().refresh(true, false, null, modalityState, child);
}
}
}