From f942dfe973e46154b44263268fb45e739390c293 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 19 Aug 2011 16:07:46 +0400
Subject: [PATCH] remove refresh() with modality state from VirtualFile API

---
 .../src/com/intellij/openapi/vfs/VirtualFile.java     |  8 --------
 .../intellij/openapi/vfs/newvfs/NewVirtualFile.java   |  6 ------
 .../openapi/fileChooser/ex/FileSystemTreeImpl.java    | 11 +++++++----
 .../openapi/vfs/impl/local/LocalFileSystemImpl.java   |  4 ++--
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
index e8869e898dad..3f00356c99b6 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
@@ -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();
   }
diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/NewVirtualFile.java b/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/NewVirtualFile.java
index c372fa34c9a4..e9a7650accdd 100644
--- a/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/NewVirtualFile.java
+++ b/platform/platform-api/src/com/intellij/openapi/vfs/newvfs/NewVirtualFile.java
@@ -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;
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeImpl.java
index e38139bdc83b..6a00226b34a4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileSystemTreeImpl.java
@@ -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);
           }
         }
       }
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java
index 9ea6b7cecd96..6d45f014f470 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemImpl.java
@@ -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);
             }
           }
         }