From 1e7e11bd20e3144d07fb297c807dda210888c796 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 20 Jan 2014 13:54:07 +0400 Subject: [PATCH] replaced with reparseFiles --- .../src/com/intellij/util/FileContentUtilCore.java | 13 ++++++------- .../openapi/vfs/impl/http/VirtualFileImpl.java | 9 ++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/platform/core-api/src/com/intellij/util/FileContentUtilCore.java b/platform/core-api/src/com/intellij/util/FileContentUtilCore.java index 93833db7002c..54a26f62c31c 100644 --- a/platform/core-api/src/com/intellij/util/FileContentUtilCore.java +++ b/platform/core-api/src/com/intellij/util/FileContentUtilCore.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,10 +27,7 @@ import gnu.trove.THashSet; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Set; +import java.util.*; /** * @author peter @@ -38,12 +35,14 @@ import java.util.Set; public class FileContentUtilCore { @NonNls public static final String FORCE_RELOAD_REQUESTOR = "FileContentUtilCore.saveOrReload"; + public static void reparseFiles(@NotNull VirtualFile... files) { + reparseFiles(Arrays.asList(files)); + } public static void reparseFiles(@NotNull final Collection files) { ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { // files must be processed under one write action to prevent firing event for invalid files. - final Set events = new THashSet(); for (VirtualFile file : files) { saveOrReload(file, events); @@ -57,7 +56,7 @@ public class FileContentUtilCore { }); } - private static void saveOrReload(VirtualFile file, Collection events) { + private static void saveOrReload(VirtualFile file, @NotNull Collection events) { if (file == null || file.isDirectory() || !file.isValid()) { return; } diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/VirtualFileImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/VirtualFileImpl.java index 82fd22cd03f7..3c354bc30fe2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/VirtualFileImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/http/VirtualFileImpl.java @@ -19,11 +19,9 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.openapi.vfs.VirtualFileSystem; -import com.intellij.openapi.vfs.newvfs.BulkFileListener; -import com.intellij.openapi.vfs.newvfs.events.VFilePropertyChangeEvent; import com.intellij.util.ArrayUtil; +import com.intellij.util.FileContentUtilCore; import com.intellij.util.UriUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,7 +29,6 @@ import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.Collections; class VirtualFileImpl extends HttpVirtualFile { private final HttpFileSystemBase myFileSystem; @@ -55,9 +52,7 @@ class VirtualFileImpl extends HttpVirtualFile { VirtualFileImpl file = VirtualFileImpl.this; FileDocumentManager.getInstance().reloadFiles(file); if (!localFile.getFileType().equals(myInitialFileType)) { - VFilePropertyChangeEvent event = new VFilePropertyChangeEvent(this, file, PROP_NAME, file.getName(), file.getName(), false); - BulkFileListener publisher = ApplicationManager.getApplication().getMessageBus().syncPublisher(VirtualFileManager.VFS_CHANGES); - publisher.after(Collections.singletonList(event)); + FileContentUtilCore.reparseFiles(file); } } });