Pointless array creation eliminated

This commit is contained in:
Roman Shevchenko
2012-09-06 20:11:05 +04:00
parent 7c81bbd0b9
commit 9cdde38e96
6 changed files with 11 additions and 17 deletions
@@ -950,7 +950,7 @@ public class CompileDriver {
outputsToRefresh.add(generated.getSecond());
}
RefreshQueue.getInstance().refresh(false, true, null, VfsUtilCore.toVirtualFileArray(outputsToRefresh));
RefreshQueue.getInstance().refresh(false, true, null, outputsToRefresh);
if (progressIndicator.isCanceled()) {
return ExitStatus.CANCELLED;
}
@@ -124,7 +124,7 @@ public class CompilerUtil {
}
}
if (!filesToRefresh.isEmpty()) {
RefreshQueue.getInstance().refresh(false, true, null, VfsUtil.toVirtualFileArray(filesToRefresh));
RefreshQueue.getInstance().refresh(false, true, null, filesToRefresh);
}
}
@@ -95,9 +95,7 @@ public class JarFileSystemImpl extends JarFileSystem implements ApplicationCompo
((NewVirtualFile)root).markDirtyRecursively();
}
}
VirtualFile[] roots = VfsUtilCore.toVirtualFileArray(rootsToRefresh);
RefreshQueue.getInstance().refresh(false, true, null, roots);
RefreshQueue.getInstance().refresh(false, true, null, rootsToRefresh);
}
};
if (app.isUnitTestMode()) {
@@ -42,7 +42,6 @@ import org.jetbrains.annotations.Nullable;
import java.io.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Locale;
@@ -265,7 +264,7 @@ public abstract class LocalFileSystemBase extends LocalFileSystem {
}
}
RefreshQueue.getInstance().refresh(async, recursive, onFinish, VfsUtilCore.toVirtualFileArray(filesToRefresh));
RefreshQueue.getInstance().refresh(async, recursive, onFinish, filesToRefresh);
}
finally {
if (fireCommonRefreshSession) manager.fireAfterRefreshFinish(false);
@@ -279,15 +278,7 @@ public abstract class LocalFileSystemBase extends LocalFileSystem {
@Override
public void refreshFiles(@NotNull Iterable<VirtualFile> files, boolean async, boolean recursive, @Nullable Runnable onFinish) {
final Collection<VirtualFile> collection;
if (files instanceof Collection) {
collection = (Collection<VirtualFile>)files;
}
else {
collection = new ArrayList<VirtualFile>();
ContainerUtil.addAll(collection, files);
}
RefreshQueue.getInstance().refresh(async, recursive, onFinish, VfsUtilCore.toVirtualFileArray(collection));
RefreshQueue.getInstance().refresh(async, recursive, onFinish, ContainerUtil.toCollection(files));
}
@Override
@@ -1698,4 +1698,9 @@ public class ContainerUtil extends ContainerUtilRt {
public static <T> T[] toArray(@NotNull Collection<T> c, @NotNull T[] sample) {
return ContainerUtilRt.toArray(c, sample);
}
@NotNull
public static <T> Collection<T> toCollection(@NotNull Iterable<T> iterable) {
return iterable instanceof Collection ? (Collection<T>)iterable : newArrayList(iterable);
}
}
@@ -203,7 +203,7 @@ public class VcsUtil {
}
private static void refreshFiles(final List<VirtualFile> filesToRefresh, final Runnable runnable) {
RefreshQueue.getInstance().refresh(true, true, runnable, VfsUtil.toVirtualFileArray(filesToRefresh));
RefreshQueue.getInstance().refresh(true, true, runnable, filesToRefresh);
}
private static List<VirtualFile> collectFilesToRefresh(final File[] roots) {