performance

2026-09-27 10:03:11 +07:00 · 2010-07-07 13:06:31 +04:00
parent 2379e0ad68
commit 69a331a389
222 changed files with 840 additions and 592 deletions
@@ -35,6 +35,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.ReadonlyStatusHandler;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

@@ -151,7 +152,7 @@ public class GenerateAntBuildAction extends CompileActionBase {
              generated = generateMultipleFileBuild(project, genOptions, filesToRefresh);
            }
            if (generated != null) {
-              _generated.addAll(Arrays.asList(generated));
+              ContainerUtil.addAll(_generated, generated);
            }
          }
          catch (IOException e) {
@@ -28,6 +28,7 @@ import com.intellij.openapi.roots.CompilerModuleExtension;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.util.Chunk;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.graph.CachingSemiGraph;
 import com.intellij.util.graph.Graph;
 import com.intellij.util.graph.GraphGenerator;
@@ -239,13 +240,13 @@ public class GenerationOptionsImpl extends GenerationOptions {
        final Collection<ModuleChunk> nodes = moduleChunkGraph.getNodes();
        final ModuleChunk[] moduleChunks = nodes.toArray(new ModuleChunk[nodes.size()]);
        for (ModuleChunk moduleChunk : moduleChunks) {
-            final Iterator<ModuleChunk> depsIterator = moduleChunkGraph.getIn(moduleChunk);
-            List<ModuleChunk> deps = new ArrayList<ModuleChunk>();
-            while (depsIterator.hasNext()) {
-                deps.add(depsIterator.next());
-            }
-            moduleChunk.setDependentChunks(deps.toArray(new ModuleChunk[deps.size()]));
-            myCustomCompilers.addAll(Arrays.asList(moduleChunk.getCustomCompilers()));
+          final Iterator<ModuleChunk> depsIterator = moduleChunkGraph.getIn(moduleChunk);
+          List<ModuleChunk> deps = new ArrayList<ModuleChunk>();
+          while (depsIterator.hasNext()) {
+            deps.add(depsIterator.next());
+          }
+          moduleChunk.setDependentChunks(deps.toArray(new ModuleChunk[deps.size()]));
+          ContainerUtil.addAll(myCustomCompilers, moduleChunk.getCustomCompilers());
        }
        Arrays.sort(moduleChunks, new ChunksComparator());
        if (generateSingleFile) {
@@ -273,7 +274,7 @@ public class GenerationOptionsImpl extends GenerationOptions {
        final Sdk[] projectJdks = ProjectJdkTable.getInstance().getAllJdks();
        myJdkUrls = new HashSet<String>();
        for (Sdk jdk : projectJdks) {
-            myJdkUrls.addAll(Arrays.asList(jdk.getRootProvider().getUrls(OrderRootType.CLASSES)));
+          ContainerUtil.addAll(myJdkUrls, jdk.getRootProvider().getUrls(OrderRootType.CLASSES));
        }
        return myJdkUrls;
    }
@@ -25,6 +25,7 @@ import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Processor;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.OrderedSet;
 import gnu.trove.TObjectHashingStrategy;

@@ -232,7 +233,7 @@ public class ModuleChunkClasspath extends Path {
    final Set<String> jdkUrls = options.getAllJdkUrls();

    final OrderedSet<String> urls = new OrderedSet<String>();
-    urls.addAll(Arrays.asList(extension.getOutputRootUrls(forTest)));
+    ContainerUtil.addAll(urls, extension.getOutputRootUrls(forTest));
    urls.removeAll(jdkUrls);
    return ArrayUtil.toStringArray(urls);
  }
@@ -1271,7 +1271,7 @@ public class CompileDriver {
    for (File outputDirectory : outputDirectories) {
      File[] files = outputDirectory.listFiles();
      if (files != null) {
-        filesToDelete.addAll(Arrays.asList(files));
+        ContainerUtil.addAll(filesToDelete, files);
      }
    }
    if (filesToDelete.size() > 0) {
@@ -28,6 +28,7 @@ import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.UserDataHolderBase;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.containers.ContainerUtil;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;

@@ -65,7 +66,7 @@ public class CompositeScope extends UserDataHolderBase implements CompileScope{
    for (CompileScope scope : myScopes) {
      final VirtualFile[] files = scope.getFiles(fileType, inSourceOnly);
      if (files.length > 0) {
-        allFiles.addAll(Arrays.asList(files));
+        ContainerUtil.addAll(allFiles, files);
      }
    }
    return VfsUtil.toVirtualFileArray(allFiles);
@@ -84,7 +85,7 @@ public class CompositeScope extends UserDataHolderBase implements CompileScope{
  public Module[] getAffectedModules() {
    Set<Module> modules = new HashSet<Module>();
    for (final CompileScope compileScope : myScopes) {
-      modules.addAll(Arrays.asList(compileScope.getAffectedModules()));
+      ContainerUtil.addAll(modules, compileScope.getAffectedModules());
    }
    return modules.toArray(new Module[modules.size()]);
  }
@@ -48,6 +48,7 @@ import com.intellij.openapi.vfs.newvfs.ManagingFS;
 import com.intellij.openapi.vfs.newvfs.NewVirtualFile;
 import com.intellij.openapi.vfs.newvfs.persistent.FSRecords;
 import com.intellij.openapi.vfs.newvfs.persistent.PersistentFS;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.SLRUCache;
 import com.intellij.util.indexing.FileBasedIndex;
 import com.intellij.util.indexing.IndexInfrastructure;
@@ -1069,7 +1070,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {

          {
            final Set<VirtualFile> newRoots = new HashSet<VirtualFile>();
-            newRoots.addAll(Arrays.asList(rootsAfter));
+            ContainerUtil.addAll(newRoots, rootsAfter);
            if (myRootsBefore != null) {
              newRoots.removeAll(Arrays.asList(myRootsBefore));
            }
@@ -1079,7 +1080,7 @@ public class TranslatingCompilerFilesMonitor implements ApplicationComponent {
          {
            final Set<VirtualFile> oldRoots = new HashSet<VirtualFile>();
            if (myRootsBefore != null) {
-              oldRoots.addAll(Arrays.asList(myRootsBefore));
+              ContainerUtil.addAll(oldRoots, myRootsBefore);
            }
            if (!oldRoots.isEmpty()) {
              oldRoots.removeAll(Arrays.asList(rootsAfter));
@@ -30,6 +30,7 @@ import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.util.*;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.OrderedSet;
 import gnu.trove.THashMap;
 import gnu.trove.TObjectHashingStrategy;
@@ -178,7 +179,7 @@ public class ModuleChunk extends Chunk<Module> {
    final Set<Module> modules = getNodes();
    Set<VirtualFile> roots = new HashSet<VirtualFile>();
    for (final Module module : modules) {
-      roots.addAll(Arrays.asList(myContext.getSourceRoots(module)));
+      ContainerUtil.addAll(roots, myContext.getSourceRoots(module));
    }
    return VfsUtil.toVirtualFileArray(roots);
  }
@@ -43,6 +43,7 @@ import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.PathsList;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

@@ -182,7 +183,7 @@ public class RmicCompiler implements ClassPostProcessingCompiler{
          }
          if (!dirItems.isEmpty()) {
            final RmicProcessingItem[] successfullyProcessed = invokeRmic(context, parserPool, pair.getFirst(), dirItems, pair.getSecond());
-            processed.addAll(Arrays.asList(successfullyProcessed));
+            ContainerUtil.addAll(processed, successfullyProcessed);
          }
          progressIndicator.setFraction(((double)processed.size()) / ((double)items.length));
        }
@@ -294,7 +295,7 @@ public class RmicCompiler implements ClassPostProcessingCompiler{

    commandLine.add("-verbose");

-    commandLine.addAll(Arrays.asList(RmicConfiguration.getSettings(module.getProject()).getOptions()));
+    ContainerUtil.addAll(commandLine, RmicConfiguration.getSettings(module.getProject()).getOptions());

    commandLine.add("-classpath");

@@ -25,6 +25,7 @@ import com.intellij.packaging.elements.ComplexPackagingElementType;
 import com.intellij.packaging.elements.CompositePackagingElement;
 import com.intellij.packaging.ui.ArtifactEditorContext;
 import com.intellij.util.Icons;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 import javax.swing.*;
@@ -65,8 +66,8 @@ public class LibraryElementType extends ComplexPackagingElementType<LibraryPacka

  private static List<Library> getAllLibraries(ArtifactEditorContext context) {
    List<Library> libraries = new ArrayList<Library>();
-    libraries.addAll(Arrays.asList(LibraryTablesRegistrar.getInstance().getLibraryTable().getLibraries()));
-    libraries.addAll(Arrays.asList(LibraryTablesRegistrar.getInstance().getLibraryTable(context.getProject()).getLibraries()));
+    ContainerUtil.addAll(libraries, LibraryTablesRegistrar.getInstance().getLibraryTable().getLibraries());
+    ContainerUtil.addAll(libraries, LibraryTablesRegistrar.getInstance().getLibraryTable(context.getProject()).getLibraries());
    return libraries;
  }

@@ -21,6 +21,7 @@ import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

@@ -44,7 +45,7 @@ public abstract class ChunkBuildExtension {
    List<String> allTargets = new ArrayList<String>();
    final ChunkBuildExtension[] extensions = Extensions.getRootArea().getExtensionPoint(EP_NAME).getExtensions();
    for (ChunkBuildExtension extension : extensions) {
-      allTargets.addAll(Arrays.asList(extension.getTargets(chunk)));
+      ContainerUtil.addAll(allTargets, extension.getTargets(chunk));
    }
    if (allTargets.isEmpty()) {
      allTargets.add(BuildProperties.getCompileTargetName(chunk.getName()));
@@ -68,4 +69,4 @@ public abstract class ChunkBuildExtension {
      extension.generateProperties(propertyFileGenerator, project, genOptions);
    }
  }
-}
+}
@@ -23,6 +23,7 @@ package com.intellij.debugger.ui.breakpoints;
 import com.intellij.debugger.DebuggerBundle;
 import com.intellij.debugger.DebuggerManagerEx;
 import com.intellij.openapi.project.Project;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.ItemRemovable;

 import javax.swing.table.AbstractTableModel;
@@ -46,7 +47,7 @@ public class BreakpointTableModel extends AbstractTableModel implements ItemRemo
  public final void setBreakpoints(Breakpoint[] breakpoints) {
    myBreakpoints.clear();
    if (breakpoints != null) {
-      myBreakpoints.addAll(Arrays.asList(breakpoints));
+      ContainerUtil.addAll(myBreakpoints, breakpoints);
    }
    fireTableDataChanged();
  }
@@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.ui.*;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Icons;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.Convertor;
 import com.intellij.util.ui.tree.TreeUtil;
 import org.jetbrains.annotations.NotNull;
@@ -468,7 +469,7 @@ public class BreakpointTree extends CheckboxTree {

  public void setBreakpoints(Breakpoint[] breakpoints) {
    myBreakpoints.clear();
-    myBreakpoints.addAll(Arrays.asList(breakpoints));
+    ContainerUtil.addAll(myBreakpoints, breakpoints);
    rebuildTree();
  }

@@ -26,6 +26,7 @@ import com.intellij.openapi.roots.ContentIterator;
 import com.intellij.openapi.util.MultiValuesMap;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.util.containers.ContainerUtil;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -84,7 +85,7 @@ public class EnableAutodetectionWorker {
    }

    if (moduleElements.isEmpty()) {
-      modulesToProcess.addAll(Arrays.asList(moduleManager.getModules()));
+      ContainerUtil.addAll(modulesToProcess, moduleManager.getModules());
    }
    if (newElement != null) {
      Set<String> toRemove = new THashSet<String>();
@@ -34,6 +34,7 @@ import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Processor;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -115,7 +116,7 @@ public class FacetLibrariesValidatorImpl extends FacetLibrariesValidator {
      rootModel.orderEntries().using(myContext.getModulesProvider()).recursively().librariesOnly().forEachLibrary(new Processor<Library>() {
        @Override
        public boolean process(Library library) {
-          roots.addAll(Arrays.asList(myContext.getLibrariesContainer().getLibraryFiles(library, OrderRootType.CLASSES)));
+          ContainerUtil.addAll(roots, myContext.getLibrariesContainer().getLibraryFiles(library, OrderRootType.CLASSES));
          return true;
        }
      });
@@ -34,6 +34,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.IdeBorderFactory;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
@@ -176,7 +177,7 @@ public class LibraryCompositionOptionsPanel {
    descriptor.setTitle(IdeBundle.message("file.chooser.select.paths.title"));
    descriptor.setDescription(IdeBundle.message("file.chooser.multiselect.description"));
    final VirtualFile[] files = FileChooser.chooseFiles(myAddJarsButton, descriptor, getBaseDirectory());
-    myAddedJars.addAll(Arrays.asList(files));
+    ContainerUtil.addAll(myAddedJars, files);
    updateAll();
  }

@@ -196,7 +197,7 @@ public class LibraryCompositionOptionsPanel {
    List<VirtualFile> roots = new ArrayList<VirtualFile>();
    roots.addAll(myAddedJars);
    for (Library library : myUsedLibraries) {
-      roots.addAll(Arrays.asList(myLibrariesContainer.getLibraryFiles(library, OrderRootType.CLASSES)));
+      ContainerUtil.addAll(roots, myLibrariesContainer.getLibraryFiles(library, OrderRootType.CLASSES));
    }
    RequiredLibrariesInfo.RequiredClassesNotFoundInfo info = new RequiredLibrariesInfo(myLibraryCompositionSettings.getLibraryInfos()).checkLibraries(
      VfsUtil.toVirtualFileArray(roots), false);
@@ -24,6 +24,7 @@ import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContaine
 import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainerFactory;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -121,7 +122,7 @@ public class LibraryCompositionSettings {
      List<VirtualFile> roots = new ArrayList<VirtualFile>();
      roots.addAll(myAddedJars);
      for (Library library : myUsedLibraries) {
-        roots.addAll(Arrays.asList(librariesContainer.getLibraryFiles(library, OrderRootType.CLASSES)));
+        ContainerUtil.addAll(roots, librariesContainer.getLibraryFiles(library, OrderRootType.CLASSES));
      }
      VirtualFile[] jars = VfsUtil.toVirtualFileArray(roots);
      RequiredLibrariesInfo.RequiredClassesNotFoundInfo info = requiredLibraries.checkLibraries(jars, all);
@@ -135,7 +136,7 @@ public class LibraryCompositionSettings {
          if (files.length != downloadingInfos.length) {
            return false;
          }
-          myAddedJars.addAll(Arrays.asList(files));
+          ContainerUtil.addAll(myAddedJars, files);
        }
      }
    }
@@ -55,6 +55,7 @@ import com.intellij.ui.*;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.util.EventDispatcher;
 import com.intellij.util.Icons;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.ItemRemovable;
 import com.intellij.util.ui.Table;
 import org.jetbrains.annotations.NotNull;
@@ -1091,7 +1092,7 @@ public class ClasspathPanel extends JPanel {
      final Set<VirtualFile> alreadyAdded = new HashSet<VirtualFile>();
      final Library[] libraries = myLibraryTable.getLibraries();
      for (Library library : libraries) {
-        alreadyAdded.addAll(Arrays.asList(library.getFiles(OrderRootType.CLASSES)));
+        ContainerUtil.addAll(alreadyAdded, library.getFiles(OrderRootType.CLASSES));
      }
      chosenFilesSet.removeAll(alreadyAdded);
      return VfsUtil.toVirtualFileArray(chosenFilesSet);
@@ -37,6 +37,7 @@ import com.intellij.ui.TabbedPaneWrapper;
 import com.intellij.ui.navigation.History;
 import com.intellij.ui.navigation.Place;
 import com.intellij.util.EventDispatcher;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -187,8 +188,8 @@ public abstract class ModuleEditor implements Place.Navigator, Disposable {

  private static ModuleConfigurationEditorProvider[] collectProviders(final Module module) {
    List<ModuleConfigurationEditorProvider> result = new ArrayList<ModuleConfigurationEditorProvider>();
-    result.addAll(Arrays.asList(module.getComponents(ModuleConfigurationEditorProvider.class)));
-    result.addAll(Arrays.asList(Extensions.getExtensions(ModuleConfigurationEditorProvider.EP_NAME, module)));
+    ContainerUtil.addAll(result, module.getComponents(ModuleConfigurationEditorProvider.class));
+    ContainerUtil.addAll(result, Extensions.getExtensions(ModuleConfigurationEditorProvider.EP_NAME, module));
    return result.toArray(new ModuleConfigurationEditorProvider[result.size()]);
  }

@@ -208,7 +209,7 @@ public abstract class ModuleEditor implements Place.Navigator, Disposable {

  private void processEditorsProvider(final ModuleConfigurationEditorProvider provider, final ModuleConfigurationState state) {
    final ModuleConfigurationEditor[] editors = provider.createEditors(state);
-    myEditors.addAll(Arrays.asList(editors));
+    ContainerUtil.addAll(myEditors, editors);
  }

  private JPanel createPanel() {
@@ -19,6 +19,7 @@ import com.intellij.openapi.roots.ui.configuration.artifacts.nodes.ComplexPackag
 import com.intellij.packaging.elements.ComplexPackagingElement;
 import com.intellij.packaging.elements.ComplexPackagingElementType;
 import com.intellij.packaging.elements.PackagingElementFactory;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 import java.util.*;
@@ -31,7 +32,7 @@ public class ComplexElementSubstitutionParameters {
  private final Set<ComplexPackagingElement<?>> mySubstituted = new HashSet<ComplexPackagingElement<?>>();

  public void setSubstituteAll() {
-    myTypesToSubstitute.addAll(Arrays.asList(PackagingElementFactory.getInstance().getComplexElementTypes()));
+    ContainerUtil.addAll(myTypesToSubstitute, PackagingElementFactory.getInstance().getComplexElementTypes());
    mySubstituted.clear();
  }

@@ -62,6 +62,7 @@ import com.intellij.ui.TreeSpeedSearch;
 import com.intellij.ui.treeStructure.Tree;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Icons;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -471,10 +472,11 @@ public class LibraryTableEditor implements Disposable, LibraryEditorListener {

    private void appendLibraryToModules(final ModuleStructureConfigurable rootConfigurable, final Library libraryToSelect) {
      final List<Module> modules = new ArrayList<Module>();
-      modules.addAll(Arrays.asList(rootConfigurable.getModules()));
+      ContainerUtil.addAll(modules, rootConfigurable.getModules());
      final ChooseModulesDialog dlg = new ChooseModulesDialog(myProject,
                                                              modules, ProjectBundle.message("choose.modules.dialog.title"),
-                                                              ProjectBundle.message("choose.modules.dialog.description", libraryToSelect.getName())); 
+                                                              ProjectBundle
+                                                                .message("choose.modules.dialog.description", libraryToSelect.getName()));
      dlg.show();
      if (dlg.isOK()) {
        final List<Module> choosenModules = dlg.getChosenElements();
@@ -596,12 +598,12 @@ public class LibraryTableEditor implements Disposable, LibraryEditorListener {
      final Library[] libraries = myTableModifiableModel.getLibraries();
      for (Library library : libraries) {
        final VirtualFile[] libraryFiles = getLibraryEditor(library).getFiles(rootType);
-        alreadyAdded.addAll(Arrays.asList(libraryFiles));
+        ContainerUtil.addAll(alreadyAdded, libraryFiles);
      }
    }
    else {
      final VirtualFile[] libraryFiles = getLibraryEditor(lib).getFiles(rootType);
-      alreadyAdded.addAll(Arrays.asList(libraryFiles));
+      ContainerUtil.addAll(alreadyAdded, libraryFiles);
    }
    chosenFilesSet.removeAll(alreadyAdded);
    return VfsUtil.toVirtualFileArray(chosenFilesSet);
@@ -63,6 +63,7 @@ import com.intellij.openapi.wm.WindowManager;
 import com.intellij.ui.navigation.Place;
 import com.intellij.util.Consumer;
 import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.tree.TreeUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -649,7 +650,7 @@ public class ModuleStructureConfigurable extends BaseStructureConfigurable imple
          result.add(new Separator(ProjectBundle.message("add.group.facet.separator")));
        }

-        result.addAll(Arrays.asList(facets));
+        ContainerUtil.addAll(result, facets);

        return result.toArray(new AnAction[result.size()]);
      }
@@ -30,6 +30,7 @@ import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.search.PackageScope;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 import java.util.Arrays;
@@ -111,7 +112,7 @@ public class JavaAnalysisScope extends AnalysisScope {
      final Set<PsiDirectory> dirs = new HashSet<PsiDirectory>();
      ApplicationManager.getApplication().runReadAction(new Runnable() {
        public void run() {
-          dirs.addAll(Arrays.asList(pack.getDirectories(GlobalSearchScope.projectScope(myElement.getProject()))));
+          ContainerUtil.addAll(dirs, pack.getDirectories(GlobalSearchScope.projectScope(myElement.getProject())));
        }
      });
      for (PsiDirectory dir : dirs) {
@@ -130,4 +131,4 @@ public class JavaAnalysisScope extends AnalysisScope {
    }
    return super.toSearchScope();
  }
-}
+}
@@ -18,6 +18,7 @@ package com.intellij.codeInsight;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiUtil;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.Nullable;

 import java.util.*;
@@ -151,7 +152,7 @@ public class ExpectedTypeUtil {
      List<PsiMethod> methods = new ArrayList<PsiMethod>();
      for (PsiClass aClass : myOccurrenceClasses) {
        final PsiMethod[] occMethod = aClass.findMethodsByName(name, true);
-        methods.addAll(Arrays.asList(occMethod));
+        ContainerUtil.addAll(methods, occMethod);
      }
      return methods.toArray(new PsiMethod[methods.size()]);
    }
@@ -20,6 +20,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiLiteralExpression;
 import com.intellij.util.ProcessingContext;
+import com.intellij.util.containers.ContainerUtil;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;

@@ -42,7 +43,7 @@ public abstract class ExpectedTypeBasedCompletionProvider extends CompletionProv
    final THashSet<ExpectedTypeInfo> infos = new THashSet<ExpectedTypeInfo>();
    ApplicationManager.getApplication().runReadAction(new Runnable() {
      public void run() {
-        infos.addAll(Arrays.asList(JavaSmartCompletionContributor.getExpectedTypes(params)));
+        ContainerUtil.addAll(infos, JavaSmartCompletionContributor.getExpectedTypes(params));
      }
    });
    addCompletions(params, result, infos);
@@ -56,6 +56,7 @@ import com.intellij.psi.xml.XmlTokenType;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.NullableFunction;
 import com.intellij.util.PairFunction;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NonNls;
@@ -267,7 +268,7 @@ public class JavaCompletionUtil {
        }
      }

-      result.addAll(Arrays.asList(getOverlappedNameVersions(prefix, suggestedNames, requiredSuffix)));
+      ContainerUtil.addAll(result, getOverlappedNameVersions(prefix, suggestedNames, requiredSuffix));


    }
@@ -369,7 +369,7 @@ public class JavaSmartCompletionContributor extends CompletionContributor {

        ApplicationManager.getApplication().runReadAction(new Runnable() {
          public void run() {
-            infos.addAll(Arrays.asList(getExpectedTypes(parameters)));
+            ContainerUtil.addAll(infos, getExpectedTypes(parameters));
            for (PsiType type : ExpectedTypesGetter.getExpectedTypes(identifierCopy, true)) {
              if (type instanceof PsiClassType) {
                final PsiClassType classType = (PsiClassType)type;
@@ -22,6 +22,7 @@ import com.intellij.psi.impl.source.jsp.jspJava.JspClassLevelDeclarationStatemen
 import com.intellij.psi.javadoc.PsiDocComment;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;

 import java.util.ArrayList;
@@ -105,7 +106,7 @@ scopes:
                }
              }
              if (!containModifierFlag) {
-                ret.addAll(Arrays.asList(keywords));
+                ContainerUtil.addAll(ret, keywords);
              }
            }
            break scopes;
@@ -28,6 +28,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager;
 import com.intellij.psi.util.MethodSignatureUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

@@ -51,7 +52,7 @@ public class AddMethodFix extends IntentionAndQuickFixAction {

  public AddMethodFix(@NonNls @NotNull String methodText, @NotNull PsiClass implClass, @NotNull String... exceptions) {
    this(createMethod(methodText, implClass), implClass);
-    myExceptions.addAll(Arrays.asList(exceptions));
+    ContainerUtil.addAll(myExceptions, exceptions);
  }

  private static PsiMethod createMethod(final String methodText, final PsiClass implClass) {
@@ -31,6 +31,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 public class AddReturnFix implements IntentionAction {
@@ -106,8 +107,8 @@ public class AddReturnFix implements IntentionAction {
      }
    }
    PsiParameter[] parameters = method.getParameterList().getParameters();
-    variables.addAll(Arrays.asList(parameters));
-    return (PsiVariable[]) variables.toArray(new PsiVariable[variables.size()]);
+    ContainerUtil.addAll(variables, parameters);
+    return (PsiVariable[])variables.toArray(new PsiVariable[variables.size()]);
  }

  public boolean startInWriteAction() {
@@ -583,7 +583,7 @@ public class CreateFromUsageUtils {
    if (expectedTypes.length == 0 && !typesList.isEmpty()) {
      List<ExpectedTypeInfo> union = new ArrayList<ExpectedTypeInfo>();
      for (ExpectedTypeInfo[] aTypesList : typesList) {
-        union.addAll(Arrays.asList((ExpectedTypeInfo[])aTypesList));
+        ContainerUtil.addAll(union, (ExpectedTypeInfo[])aTypesList);
      }
      expectedTypes = union.toArray(new ExpectedTypeInfo[union.size()]);
    }
@@ -633,7 +633,7 @@ public class CreateFromUsageUtils {
    if (expectedTypes.length == 0 && !typesList.isEmpty()) {
      List<ExpectedTypeInfo> union = new ArrayList<ExpectedTypeInfo>();
      for (ExpectedTypeInfo[] aTypesList : typesList) {
-        union.addAll(Arrays.asList((ExpectedTypeInfo[])aTypesList));
+        ContainerUtil.addAll(union, (ExpectedTypeInfo[])aTypesList);
      }
      expectedTypes = union.toArray(new ExpectedTypeInfo[union.size()]);
    }
@@ -26,6 +26,7 @@ import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.Nullable;

 import java.util.ArrayList;
@@ -86,7 +87,7 @@ public class GuessTypeParameters {

      List<PsiType> types = matchingTypeParameters(vals, params, info);
      if (!types.isEmpty()) {
-        types.addAll(Arrays.asList(ExpectedTypesProvider.processExpectedTypes(infos, new MyTypeVisitor(manager, scope), project)));
+        ContainerUtil.addAll(types, ExpectedTypesProvider.processExpectedTypes(infos, new MyTypeVisitor(manager, scope), project));
        builder.replaceElement(typeElement, new TypeExpression(project, types.toArray(new PsiType[types.size()])));
        return;
      }
@@ -126,12 +126,12 @@ public class GenerateConstructorHandler extends GenerateMembersHandlerBase {
      members = chooseMembers(allMembers, true, false, project);
      if (members == null) return null;
    }
-    if (baseConstructors != null){
+    if (baseConstructors != null) {
      ArrayList<ClassMember> array = new ArrayList<ClassMember>();
      for (PsiMethod baseConstructor : baseConstructors) {
        array.add(new PsiMethodMember(baseConstructor));
      }
-      array.addAll(Arrays.asList(members));
+      ContainerUtil.addAll(array, members);
      members = array.toArray(new ClassMember[array.size()]);
    }

@@ -276,4 +276,4 @@ public class GenerateConstructorHandler extends GenerateMembersHandlerBase {
    LOG.assertTrue(false);
    return null;
  }
-}
+}
@@ -28,6 +28,7 @@ import com.intellij.psi.util.MethodSignature;
 import com.intellij.psi.util.MethodSignatureUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.NonNls;

@@ -73,7 +74,7 @@ public class GenerateEqualsHelper implements Runnable {
    myCheckParameterWithInstanceof = useInstanceofToCheckParameterType;

    myNonNullSet = new HashSet<PsiField>();
-    myNonNullSet.addAll(Arrays.asList(nonNullFields));
+    ContainerUtil.addAll(myNonNullSet, nonNullFields);
    final PsiManager manager = PsiManager.getInstance(project);

    myFactory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
@@ -179,7 +180,7 @@ public class GenerateEqualsHelper implements Runnable {
      addClassInstance(buffer);

      ArrayList<PsiField> equalsFields = new ArrayList<PsiField>();
-      equalsFields.addAll(Arrays.asList(myEqualsFields));
+      ContainerUtil.addAll(equalsFields, myEqualsFields);
      Collections.sort(equalsFields, EqualsFieldsComparator.INSTANCE);

      for (PsiField field : equalsFields) {
@@ -38,6 +38,7 @@ import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -185,7 +186,7 @@ public abstract class GenerateMembersHandlerBase implements CodeInsightActionHan
    for (ClassMember member : members) {
      GenerationInfo[] prototypes = generateMemberPrototypes(aClass, member);
      if (prototypes != null) {
-        array.addAll(Arrays.asList(prototypes));
+        ContainerUtil.addAll(array, prototypes);
      }
    }
    return array;
@@ -248,7 +248,7 @@ public class OverrideImplementUtil {

    List<PsiMethod> results = new ArrayList<PsiMethod>();
    for (final MethodImplementor implementor : getImplementors()) {
-      results.addAll(Arrays.asList(implementor.createImplementationPrototypes(aClass, method)));
+      ContainerUtil.addAll(results, implementor.createImplementationPrototypes(aClass, method));
    }
    if (results.isEmpty()) {
      PsiMethod method1 = GenerateMembersUtil.substituteGenericMethod(method, substitutor);
@@ -41,6 +41,7 @@ import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.refactoring.util.RefactoringUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -167,7 +168,7 @@ public class CreateFieldFromParameterAction implements IntentionAction {

    if (isInteractive) {
      List<String> namesList = new ArrayList<String>();
-      namesList.addAll(Arrays.asList(names));
+      ContainerUtil.addAll(namesList, names);
      String defaultName = styleManager.propertyNameToVariableName(propertyName, kind);
      if (namesList.contains(defaultName)) {
        Collections.swap(namesList, 0, namesList.indexOf(defaultName));
@@ -23,6 +23,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -103,7 +104,7 @@ public class VariableOfTypeMacro implements Macro {
    }

    PsiExpression[] expressions = MacroUtil.getStandardExpressionsOfType(place, type);
-    array.addAll(Arrays.asList(expressions));
+    ContainerUtil.addAll(array, expressions);
    return array.toArray(new PsiElement[array.size()]);
  }
 }
@@ -19,6 +19,7 @@ import com.intellij.codeInsight.daemon.impl.analysis.HighlightControlFlowUtil;
 import com.intellij.codeInspection.reference.*;
 import com.intellij.psi.*;
 import com.intellij.psi.controlFlow.*;
+import com.intellij.util.containers.ContainerUtil;

 import java.util.*;

@@ -115,7 +116,7 @@ class CanBeFinalAnnotator extends RefGraphAnnotatorEx {
        PsiField[] psiFields = psiClass.getFields();

        HashSet<PsiVariable> allFields = new HashSet<PsiVariable>();
-        allFields.addAll(Arrays.asList(psiFields));
+        ContainerUtil.addAll(allFields, psiFields);
        ArrayList<PsiVariable> instanceInitializerInitializedFields = new ArrayList<PsiVariable>();
        boolean hasInitializers = false;
        for (PsiClassInitializer initializer : psiClass.getInitializers()) {
@@ -123,7 +124,8 @@ class CanBeFinalAnnotator extends RefGraphAnnotatorEx {
          hasInitializers = true;
          ControlFlow flow;
          try {
-            flow = ControlFlowFactory.getInstance(body.getProject()).getControlFlow(body, LocalsOrMyInstanceFieldsControlFlowPolicy.getInstance(), false);
+            flow = ControlFlowFactory.getInstance(body.getProject())
+              .getControlFlow(body, LocalsOrMyInstanceFieldsControlFlowPolicy.getInstance(), false);
          }
          catch (AnalysisCanceledException e) {
            flow = ControlFlow.EMPTY;
@@ -154,7 +156,8 @@ class CanBeFinalAnnotator extends RefGraphAnnotatorEx {
              hasInitializers = true;
              ControlFlow flow;
              try {
-                flow = ControlFlowFactory.getInstance(body.getProject()).getControlFlow(body, LocalsOrMyInstanceFieldsControlFlowPolicy.getInstance(), false);
+                flow = ControlFlowFactory.getInstance(body.getProject())
+                  .getControlFlow(body, LocalsOrMyInstanceFieldsControlFlowPolicy.getInstance(), false);
              }
              catch (AnalysisCanceledException e) {
                flow = ControlFlow.EMPTY;
@@ -58,6 +58,7 @@ import com.intellij.psi.util.PsiMethodUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.safeDelete.SafeDeleteHandler;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.text.CharArrayUtil;
 import org.jdom.Element;
@@ -105,7 +106,7 @@ public class UnusedDeclarationInspection extends FilteringInspectionTool {
  public final UnusedCodeExtension[] myExtensions;

  public UnusedDeclarationInspection() {
-    ADDITIONAL_ANNOTATIONS.addAll(Arrays.asList(ADDITIONAL_ANNOS));
+    ContainerUtil.addAll(ADDITIONAL_ANNOTATIONS, ADDITIONAL_ANNOS);
    myQuickFixActions = new QuickFixAction[]{new PermanentDeleteAction(), new CommentOutBin(), new MoveToEntries()};
    ExtensionPoint<UnusedCodeExtension> point = Extensions.getRootArea().getExtensionPoint(ExtensionPoints.DEAD_CODE_TOOL);
    final UnusedCodeExtension[] deadCodeAddins = point.getExtensions();
@@ -19,6 +19,7 @@ import com.intellij.codeInspection.InspectionManager;
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.codeInspection.ex.BaseLocalInspectionTool;
 import com.intellij.psi.*;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 import java.util.ArrayList;
@@ -36,7 +37,7 @@ public abstract class GenericsInspectionToolBase extends BaseLocalInspectionTool
    for (PsiClassInitializer initializer : initializers) {
      final ProblemDescriptor[] localDescriptions = getDescriptions(initializer, manager, isOnTheFly);
      if (localDescriptions != null) {
-        descriptors.addAll(Arrays.asList(localDescriptions));
+        ContainerUtil.addAll(descriptors, localDescriptions);
      }
    }
    if (descriptors.isEmpty()) return null;
@@ -55,6 +55,7 @@ import com.intellij.psi.search.scope.packageSet.NamedScope;
 import com.intellij.psi.search.scope.packageSet.PackageSetFactory;
 import com.intellij.psi.search.scope.packageSet.ParsingException;
 import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -69,11 +70,12 @@ public class UnusedLibrariesInspection extends DescriptorProviderInspection {
    final Project project = getContext().getProject();
    final ArrayList<VirtualFile> libraryRoots = new ArrayList<VirtualFile>();
    if (scope.getScopeType() == AnalysisScope.PROJECT) {
-      libraryRoots.addAll(Arrays.asList(LibraryUtil.getLibraryRoots(project, false, false)));
+      ContainerUtil.addAll(libraryRoots, LibraryUtil.getLibraryRoots(project, false, false));
    } else {
      final Set<Module> modules = new HashSet<Module>();
      scope.accept(new PsiRecursiveElementVisitor() {
-        @Override public void visitFile(PsiFile file) {
+        @Override
+        public void visitFile(PsiFile file) {
          if (!(file instanceof PsiCompiledElement)) {
            final VirtualFile virtualFile = file.getVirtualFile();
            if (virtualFile != null) {
@@ -85,7 +87,7 @@ public class UnusedLibrariesInspection extends DescriptorProviderInspection {
          }
        }
      });
-      libraryRoots.addAll(Arrays.asList(LibraryUtil.getLibraryRoots(modules.toArray(new Module[modules.size()]), false, false)));
+      ContainerUtil.addAll(libraryRoots, LibraryUtil.getLibraryRoots(modules.toArray(new Module[modules.size()]), false, false));
    }
    GlobalSearchScope searchScope;
    try {
@@ -244,4 +246,4 @@ public class UnusedLibrariesInspection extends DescriptorProviderInspection {
      });
    }
  }
-}
+}
@@ -31,6 +31,7 @@ import com.intellij.openapi.util.JDOMExternalizableStringList;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiModifierListOwner;
 import com.intellij.psi.util.PropertyUtil;
+import com.intellij.util.containers.ContainerUtil;
 import org.intellij.lang.annotations.Pattern;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -171,7 +172,7 @@ public class UnusedSymbolLocalInspection extends BaseJavaLocalInspectionTool imp
      for (Object extension : Extensions.getExtensions(ExtensionPoints.DEAD_CODE_TOOL)) {
        final String[] ignoredAnnotations = ((UnusedCodeExtension)extension).getIgnoreAnnotations();
        if (ignoredAnnotations != null) {
-          annotations.addAll(Arrays.asList(ignoredAnnotations));
+          ContainerUtil.addAll(annotations, ignoredAnnotations);
        }
      }
      ANNOTATIONS = annotations;
@@ -186,10 +186,10 @@ public class JavaFindUsagesHandler extends FindUsagesHandler{
          if (doSearch) {
            final List<PsiElement> elements = new ArrayList<PsiElement>();
            if (getter != null) {
-              elements.addAll(Arrays.asList(SuperMethodWarningUtil.checkSuperMethods(getter, ACTION_STRING)));
+              ContainerUtil.addAll(elements, SuperMethodWarningUtil.checkSuperMethods(getter, ACTION_STRING));
            }
            if (setter != null) {
-              elements.addAll(Arrays.asList(SuperMethodWarningUtil.checkSuperMethods(setter, ACTION_STRING)));
+              ContainerUtil.addAll(elements, SuperMethodWarningUtil.checkSuperMethods(setter, ACTION_STRING));
            }
            return elements.toArray(new PsiElement[elements.size()]);
          }
@@ -415,7 +415,7 @@ public class JavaFindUsagesHandler extends FindUsagesHandler{
    ApplicationManager.getApplication().runReadAction(new Runnable() {
      public void run() {
        PsiClass[] classes = JavaDirectoryService.getInstance().getClasses(dir);
-        array.addAll(Arrays.asList(classes));
+        ContainerUtil.addAll(array, classes);
        if (includeSubdirs) {
          PsiDirectory[] dirs = dir.getSubdirectories();
          for (PsiDirectory directory : dirs) {
@@ -25,6 +25,7 @@ import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Processor;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;

 import java.util.Arrays;
@@ -57,9 +58,9 @@ public final class CallerMethodsTreeStructure extends HierarchyTreeStructure {
    final PsiClassType originalType = JavaPsiFacade.getElementFactory(myProject).createType(originalClass);
    final Set<PsiMethod> methodsToFind = new HashSet<PsiMethod>();
    methodsToFind.add(method);
-    methodsToFind.addAll(Arrays.asList(method.findDeepestSuperMethods()));
+    ContainerUtil.addAll(methodsToFind, method.findDeepestSuperMethods());

-    final Map<PsiMember,CallHierarchyNodeDescriptor> methodToDescriptorMap = new HashMap<PsiMember, CallHierarchyNodeDescriptor>();
+    final Map<PsiMember, CallHierarchyNodeDescriptor> methodToDescriptorMap = new HashMap<PsiMember, CallHierarchyNodeDescriptor>();
    for (final PsiMethod methodToFind : methodsToFind) {
      MethodReferencesSearch.search(methodToFind, searchScope, true).forEach(new Processor<PsiReference>() {
        public boolean process(final PsiReference reference) {
@@ -73,7 +74,9 @@ public final class CallerMethodsTreeStructure extends HierarchyTreeStructure {
            }
            if (qualifier != null && !methodToFind.hasModifierProperty(PsiModifier.STATIC)) {
              final PsiType qualifierType = qualifier.getType();
-              if (qualifierType instanceof PsiClassType && !TypeConversionUtil.isAssignable(qualifierType, originalType) && methodToFind != method) {
+              if (qualifierType instanceof PsiClassType &&
+                  !TypeConversionUtil.isAssignable(qualifierType, originalType) &&
+                  methodToFind != method) {
                final PsiClass psiClass = ((PsiClassType)qualifierType).resolve();
                if (psiClass != null) {
                  final PsiMethod callee = psiClass.findMethodBySignature(methodToFind, true);
@@ -17,6 +17,7 @@ package com.intellij.ide.projectView;

 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
+import com.intellij.util.containers.ContainerUtil;

 import java.util.Arrays;
 import java.util.List;
@@ -30,19 +31,19 @@ public interface PsiClassChildrenSource {

  PsiClassChildrenSource METHODS = new PsiClassChildrenSource() {
    public void addChildren(PsiClass psiClass, List<PsiElement> children) {
-      children.addAll(Arrays.asList(psiClass.getMethods()));
+      ContainerUtil.addAll(children, psiClass.getMethods());
    }
  };

  PsiClassChildrenSource FIELDS = new PsiClassChildrenSource() {
    public void addChildren(PsiClass psiClass, List<PsiElement> children) {
-      children.addAll(Arrays.asList(psiClass.getFields()));
+      ContainerUtil.addAll(children, psiClass.getFields());
    }
  };

  PsiClassChildrenSource CLASSES = new PsiClassChildrenSource() {
    public void addChildren(PsiClass psiClass, List<PsiElement> children) {
-      children.addAll(Arrays.asList(psiClass.getInnerClasses()));
+      ContainerUtil.addAll(children, psiClass.getInnerClasses());
    }
  };

@@ -28,6 +28,7 @@ import com.intellij.psi.JavaDirectoryService;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiPackage;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 import java.lang.reflect.InvocationTargetException;
@@ -55,7 +56,7 @@ public class PackageViewProjectNode extends AbstractProjectNode {
    else {
      final List<VirtualFile> sourceRoots = new ArrayList<VirtualFile>();
      final ProjectRootManager projectRootManager = ProjectRootManager.getInstance(myProject);
-      sourceRoots.addAll(Arrays.asList(projectRootManager.getContentSourceRoots()));
+      ContainerUtil.addAll(sourceRoots, projectRootManager.getContentSourceRoots());

      final PsiManager psiManager = PsiManager.getInstance(myProject);
      final List<AbstractTreeNode> children = new ArrayList<AbstractTreeNode>();
@@ -18,6 +18,7 @@ package com.intellij.ide.structureView.impl.java;
 import com.intellij.ide.structureView.StructureViewTreeElement;
 import com.intellij.ide.structureView.impl.AddAllMembersProcessor;
 import com.intellij.psi.*;
+import com.intellij.util.containers.ContainerUtil;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;

@@ -41,10 +42,10 @@ public class JavaClassTreeElement extends JavaClassTreeElementBase<PsiClass> {

    List<PsiElement> children = Arrays.asList(aClass.getChildren());
    Collection<PsiElement> ownChildren = new THashSet<PsiElement>();
-    ownChildren.addAll(Arrays.asList(aClass.getFields()));
-    ownChildren.addAll(Arrays.asList(aClass.getMethods()));
-    ownChildren.addAll(Arrays.asList(aClass.getInnerClasses()));
-    ownChildren.addAll(Arrays.asList(aClass.getInitializers()));
+    ContainerUtil.addAll(ownChildren, aClass.getFields());
+    ContainerUtil.addAll(ownChildren, aClass.getMethods());
+    ContainerUtil.addAll(ownChildren, aClass.getInnerClasses());
+    ContainerUtil.addAll(ownChildren, aClass.getInitializers());
    Collection<PsiElement> inherited = new LinkedHashSet<PsiElement>(children);

    aClass.processDeclarations(new AddAllMembersProcessor(inherited, aClass), ResolveState.initial(), null, aClass);
@@ -31,6 +31,7 @@ import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.Nullable;

 import java.util.*;
@@ -59,12 +60,12 @@ public class TodoJavaTreeHelper extends TodoTreeHelper {
  public void addPackagesToChildren(final ArrayList<AbstractTreeNode> children, final Module module, final TodoTreeBuilder builder) {
    final PsiManager psiManager = PsiManager.getInstance(getProject());
    final List<VirtualFile> sourceRoots = new ArrayList<VirtualFile>();
-    if (module == null){
+    if (module == null) {
      final ProjectRootManager projectRootManager = ProjectRootManager.getInstance(getProject());
-      sourceRoots.addAll(Arrays.asList(projectRootManager.getContentSourceRoots()));
+      ContainerUtil.addAll(sourceRoots, projectRootManager.getContentSourceRoots());
    } else {
      ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(module);
-      sourceRoots.addAll(Arrays.asList(moduleRootManager.getSourceRoots()));
+      ContainerUtil.addAll(sourceRoots, moduleRootManager.getSourceRoots());
    }
    final Set<PsiPackage> topLevelPackages = new HashSet<PsiPackage>();
    for (final VirtualFile root : sourceRoots) {
@@ -187,4 +188,4 @@ public class TodoJavaTreeHelper extends TodoTreeHelper {
    }
    return isEmpty;
  }
-}
+}
@@ -26,6 +26,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PsiShortNamesCache;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;

 import java.util.*;
@@ -52,9 +53,9 @@ public class DefaultSymbolNavigationContributor implements ChooseByNameContribut
    PsiClass[] classes = cache.getClassesByName(name, scope);

    List<PsiMember> result = new ArrayList<PsiMember>();
-    result.addAll(Arrays.asList(methods));
-    result.addAll(Arrays.asList(fields));
-    result.addAll(Arrays.asList(classes));
+    ContainerUtil.addAll(result, methods);
+    ContainerUtil.addAll(result, fields);
+    ContainerUtil.addAll(result, classes);
    filterOutNonOpenable(result);
    PsiMember[] array = result.toArray(new PsiMember[result.size()]);
    Arrays.sort(array, MyComparator.INSTANCE);
@@ -28,6 +28,7 @@ import com.intellij.openapi.options.colors.AttributesDescriptor;
 import com.intellij.openapi.options.colors.ColorDescriptor;
 import com.intellij.openapi.options.colors.ColorSettingsPage;
 import com.intellij.pom.java.LanguageLevel;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

@@ -124,10 +125,13 @@ public class JavaColorSettingsPage implements ColorSettingsPage, InspectionColor
  @NotNull
  public AttributesDescriptor[] getAttributeDescriptors() {
    List<AttributesDescriptor> descriptors = new ArrayList<AttributesDescriptor>();
-    descriptors.addAll(Arrays.asList(ourDescriptors));
-    descriptors.add(new AttributesDescriptor(OptionsBundle.message("options.java.color.descriptor.full.coverage"), CodeInsightColors.LINE_FULL_COVERAGE));
-    descriptors.add(new AttributesDescriptor(OptionsBundle.message("options.java.color.descriptor.partial.coverage"), CodeInsightColors.LINE_PARTIAL_COVERAGE));
-    descriptors.add(new AttributesDescriptor(OptionsBundle.message("options.java.color.descriptor.none.coverage"), CodeInsightColors.LINE_NONE_COVERAGE));
+    ContainerUtil.addAll(descriptors, ourDescriptors);
+    descriptors.add(
+      new AttributesDescriptor(OptionsBundle.message("options.java.color.descriptor.full.coverage"), CodeInsightColors.LINE_FULL_COVERAGE));
+    descriptors.add(new AttributesDescriptor(OptionsBundle.message("options.java.color.descriptor.partial.coverage"),
+                                             CodeInsightColors.LINE_PARTIAL_COVERAGE));
+    descriptors.add(
+      new AttributesDescriptor(OptionsBundle.message("options.java.color.descriptor.none.coverage"), CodeInsightColors.LINE_NONE_COVERAGE));
    return descriptors.toArray(new AttributesDescriptor[descriptors.size()]);
  }

@@ -25,6 +25,7 @@ import com.intellij.psi.impl.file.PsiPackageImpl;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.NonClasspathDirectoryScope;
 import com.intellij.util.Processor;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 import java.util.*;
@@ -86,7 +87,7 @@ public abstract class NonClasspathClassFinder extends PsiElementFinder {
            if (!file.isDirectory()) {
              final PsiFile psi = PsiManager.getInstance(myProject).findFile(file);
              if (psi instanceof PsiClassOwner) {
-                result.addAll(Arrays.asList(((PsiClassOwner)psi).getClasses()));
+                ContainerUtil.addAll(result, ((PsiClassOwner)psi).getClasses());
              }
            }
          }
@@ -22,6 +22,7 @@ import com.intellij.psi.PsiMethod;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PsiShortNamesCache;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NonNls;
@@ -188,7 +189,7 @@ public class CompositeShortNamesCache extends PsiShortNamesCache {
      if (myAllItems == null) {
        myAllItems = new THashSet<T>(Arrays.asList(mySingleItem));
      }
-      myAllItems.addAll(Arrays.asList(items));
+      ContainerUtil.addAll(myAllItems, items);
    }

    public T[] getResult() {
@@ -202,4 +203,4 @@ public class CompositeShortNamesCache extends PsiShortNamesCache {
  public String toString() {
    return "Composite cache: " + myCaches;
  }
-}
+}
@@ -60,6 +60,7 @@ import com.intellij.util.ConcurrencyUtil;
 import com.intellij.util.Processor;
 import com.intellij.util.SmartList;
 import com.intellij.util.containers.ConcurrentHashMap;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.messages.MessageBus;
 import org.jetbrains.annotations.NotNull;
@@ -100,7 +101,7 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx implements Disposable {

    List<PsiElementFinder> elementFinders = new ArrayList<PsiElementFinder>();
    elementFinders.add(new PsiElementFinderImpl());
-    elementFinders.addAll(Arrays.asList(myProject.getExtensions(PsiElementFinder.EP_NAME)));
+    ContainerUtil.addAll(elementFinders, myProject.getExtensions(PsiElementFinder.EP_NAME));
    myElementFinders = elementFinders.toArray(new PsiElementFinder[elementFinders.size()]);

    myPackagePrefixIndex = new PackagePrefixIndex(myProject);
@@ -109,7 +110,8 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx implements Disposable {

    if (isProjectDefault) {
      myShortNamesCache = new EmptyShortNamesCacheImpl();
-    } else {
+    }
+    else {
      myShortNamesCache = new PsiShortNamesCacheImpl((PsiManagerEx)PsiManager.getInstance(project));
      for (final PsiShortNamesCache cache : project.getExtensions(PsiShortNamesCache.EP_NAME)) {
        _registerShortNamesCache(cache);
@@ -118,11 +120,12 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx implements Disposable {

    myFileManager = new JavaFileManagerImpl(psiManager, projectRootManagerEx, psiManager.getFileManager(), bus);

-    final PsiModificationTrackerImpl modificationTracker = (PsiModificationTrackerImpl) psiManager.getModificationTracker();
+    final PsiModificationTrackerImpl modificationTracker = (PsiModificationTrackerImpl)psiManager.getModificationTracker();
    psiManager.addTreeChangePreprocessor(new JavaCodeBlockModificationListener(modificationTracker));

    bus.connect().subscribe(ProjectTopics.MODIFICATION_TRACKER, new PsiModificationTracker.Listener() {
      private long lastTimeSeen = -1L;
+
      public void modificationCountChanged() {
        final long now = modificationTracker.getJavaStructureModificationCount();
        if (lastTimeSeen != now) {
@@ -224,7 +227,7 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx implements Disposable {
    List<PsiClass> classes = new SmartList<PsiClass>();
    for (PsiElementFinder finder : myElementFinders) {
      PsiClass[] finderClasses = finder.findClasses(qualifiedName, scope);
-      classes.addAll(Arrays.asList(finderClasses));
+      ContainerUtil.addAll(classes, finderClasses);
    }

    return classes.toArray(new PsiClass[classes.size()]);
@@ -322,7 +325,7 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx implements Disposable {
      PsiClass[] classes = finder.getClasses(psiPackage, scope);
      if (classes.length == 0) continue;
      if (result == null) result = new ArrayList<PsiClass>();
-      result.addAll(Arrays.asList(classes));
+      ContainerUtil.addAll(result, classes);
    }

    return result == null ? PsiClass.EMPTY_ARRAY : result.toArray(new PsiClass[result.size()]);
@@ -341,7 +344,7 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx implements Disposable {
    List<PsiPackage> result = new ArrayList<PsiPackage>();
    for (PsiElementFinder finder : myElementFinders) {
      PsiPackage[] packages = finder.getSubPackages(psiPackage, scope);
-      result.addAll(Arrays.asList(packages));
+      ContainerUtil.addAll(result, packages);
    }

    return result.toArray(new PsiPackage[result.size()]);
@@ -38,6 +38,7 @@ import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 import java.util.ArrayList;
@@ -65,7 +66,7 @@ public class JavaDirectoryServiceImpl extends JavaDirectoryService {
        PsiClass[] psiClasses = ((PsiClassOwner)file).getClasses();
        if (psiClasses.length == 0) continue;
        if (classes == null) classes = new ArrayList<PsiClass>();
-        classes.addAll(Arrays.asList(psiClasses));
+        ContainerUtil.addAll(classes, psiClasses);
      }
    }
    return classes == null ? PsiClass.EMPTY_ARRAY : classes.toArray(new PsiClass[classes.size()]);
@@ -38,6 +38,7 @@ import com.intellij.psi.search.LocalSearchScope;
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.ContainerUtil;
 import gnu.trove.THashMap;
 import gnu.trove.THashSet;
 import gnu.trove.TObjectIntHashMap;
@@ -645,9 +646,9 @@ public class ImportHelper{
      final PsiElement child = stack.removeFirst();
      if (child instanceof PsiImportList) continue;
      if (child instanceof PsiLiteralExpression) continue;
-      stack.addAll(Arrays.asList(child.getChildren()));
+      ContainerUtil.addAll(stack, child.getChildren());

-      for(final PsiReference reference : child.getReferences()){
+      for (final PsiReference reference : child.getReferences()) {
        if (!(reference instanceof PsiJavaReference)) continue;
        final PsiJavaReference javaReference = (PsiJavaReference)reference;
        if (javaReference instanceof JavaClassReference && ((JavaClassReference)javaReference).getContextReference() != null) continue;
@@ -674,8 +675,8 @@ public class ImportHelper{
        if (!(currentFileResolveScope instanceof PsiImportStatementBase)) continue;
        if (context != null &&
            (!currentFileResolveScope.isValid() ||
-            currentFileResolveScope instanceof JspxImportStatement &&
-            context != ((JspxImportStatement)currentFileResolveScope).getDeclarationFile())) {
+             currentFileResolveScope instanceof JspxImportStatement &&
+             context != ((JspxImportStatement)currentFileResolveScope).getDeclarationFile())) {
          continue;
        }

@@ -37,6 +37,7 @@ import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;
 import gnu.trove.THashSet;
 import gnu.trove.TObjectHashingStrategy;
@@ -135,7 +136,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
    if (JspPsiUtil.isInJspFile(file)) {
      // remove only duplicate imports
      redundants = new THashSet<PsiImportStatementBase>(TObjectHashingStrategy.IDENTITY);
-      redundants.addAll(Arrays.asList(imports));
+      ContainerUtil.addAll(redundants, imports);
      redundants.removeAll(allImports);
      for (PsiImportStatementBase importStatement : imports) {
        if (importStatement instanceof JspxImportStatement && ((JspxImportStatement)importStatement).isForeignFileImport()) {
@@ -231,7 +232,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
    if (propertyName != null) {
      String[] namesByName = getSuggestionsByName(propertyName, kind, false);
      sortVariableNameSuggestions(namesByName, kind, propertyName, null);
-      names.addAll(Arrays.asList(namesByName));
+      ContainerUtil.addAll(names, namesByName);
    }

    final NamesByExprInfo namesByExpr;
@@ -240,7 +241,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
      if (namesByExpr.propertyName != null) {
        sortVariableNameSuggestions(namesByExpr.names, kind, namesByExpr.propertyName, null);
      }
-      names.addAll(Arrays.asList(namesByExpr.names));
+      ContainerUtil.addAll(names, namesByExpr.names);
    }
    else {
      namesByExpr = null;
@@ -249,7 +250,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
    if (type != null) {
      String[] namesByType = suggestVariableNameByType(type, kind);
      sortVariableNameSuggestions(namesByType, kind, null, type);
-      names.addAll(Arrays.asList(namesByType));
+      ContainerUtil.addAll(names, namesByType);
    }

    final String _propertyName;
@@ -327,7 +328,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {

    String typeName = normalizeTypeName(getTypeName(type));
    if (typeName != null) {
-      suggestions.addAll(Arrays.asList(getSuggestionsByName(typeName, variableKind, type instanceof PsiArrayType)));
+      ContainerUtil.addAll(suggestions, getSuggestionsByName(typeName, variableKind, type instanceof PsiArrayType));
    }

    return ArrayUtil.toStringArray(suggestions);
@@ -352,7 +353,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
    String baseName = normalizeTypeName(getTypeName(type));
    if (baseName != null) {
      fullNameBuilder.append(baseName);
-      suggestions.addAll(Arrays.asList(getSuggestionsByName(fullNameBuilder.toString(), variableKind, false)));
+      ContainerUtil.addAll(suggestions, getSuggestionsByName(fullNameBuilder.toString(), variableKind, false));
    }
  }

@@ -411,7 +412,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
            }
            String typeName = normalizeTypeName(getTypeName(componentType));
            if (typeName != null) {
-              suggestions.addAll(Arrays.asList(getSuggestionsByName(typeName, variableKind, true)));
+              ContainerUtil.addAll(suggestions, getSuggestionsByName(typeName, variableKind, true));
            }
          }
        }
@@ -561,10 +562,10 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
    }

    LinkedHashSet<String> names = new LinkedHashSet<String>();
-    names.addAll(Arrays.asList(names1.names));
-    names.addAll(Arrays.asList(names2.names));
+    ContainerUtil.addAll(names, names1.names);
+    ContainerUtil.addAll(names, names2.names);
    if (names3 != null) {
-      names.addAll(Arrays.asList(names3));
+      ContainerUtil.addAll(names, names3);
    }
    String[] namesArray = ArrayUtil.toStringArray(names);
    String propertyName = names1.propertyName != null ? names1.propertyName : names2.propertyName;
@@ -23,6 +23,7 @@ import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.javadoc.JavadocTagInfo;
 import com.intellij.psi.javadoc.PsiDocTagValue;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.ContainerUtil;

 import java.util.ArrayList;
 import java.util.Arrays;
@@ -47,7 +48,7 @@ class ParamDocTagInfo implements JavadocTagInfo {

      if ((PsiTypeParameterListOwner)context instanceof PsiMethod) {
        PsiMethod method = (PsiMethod)context;
-        result.addAll(Arrays.asList(method.getParameterList().getParameters()));
+        ContainerUtil.addAll(result, method.getParameterList().getParameters());
      }

      return result.toArray(new PsiNamedElement[result.size()]);
@@ -36,6 +36,7 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.CharTable;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.SmartList;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -257,8 +258,8 @@ public class PsiDocMethodOrFieldRef extends CompositePsiElement implements PsiDo
      final List<PsiModifierListOwner> vars = new ArrayList<PsiModifierListOwner>();
      final PsiElement scope = getScope();
      if (scope != null) {
-        vars.addAll(Arrays.asList(getAllMethods(scope, PsiDocMethodOrFieldRef.this)));
-        vars.addAll(Arrays.asList(getAllVariables(scope, PsiDocMethodOrFieldRef.this)));
+        ContainerUtil.addAll(vars, getAllMethods(scope, PsiDocMethodOrFieldRef.this));
+        ContainerUtil.addAll(vars, getAllVariables(scope, PsiDocMethodOrFieldRef.this));
      }
      return vars.toArray(new PsiModifierListOwner[vars.size()]);
    }
@@ -23,6 +23,7 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.util.ProcessingContext;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 import java.util.*;
@@ -109,7 +110,7 @@ public class FilePathReferenceProvider extends PsiReferenceProvider {
    List<Module> modules = new ArrayList<Module>();
    modules.add(thisModule);
    ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(thisModule);
-    modules.addAll(Arrays.asList(moduleRootManager.getDependencies()));
+    ContainerUtil.addAll(modules, moduleRootManager.getDependencies());

    List<PsiFileSystemItem> result = new ArrayList<PsiFileSystemItem>();
    final PsiManager psiManager = PsiManager.getInstance(thisModule.getProject());
@@ -95,11 +95,11 @@ public class JavaClassListReferenceProvider extends JavaClassReferenceProvider {
          }
        }
        String s = str.substring(start, end + 1);
-        results.addAll(Arrays.asList(new JavaClassReferenceSet(s, position, offsetInPosition + start, false, this){
-          public boolean isSoft(){
+        ContainerUtil.addAll(results, new JavaClassReferenceSet(s, position, offsetInPosition + start, false, this) {
+          public boolean isSoft() {
            return true;
          }
-        }.getAllReferences()));
+        }.getAllReferences());
        ProgressManager.checkCanceled();
      }
    }
@@ -275,7 +275,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer
      }
    }
    else {
-      list.addAll(Arrays.asList(classes));
+      ContainerUtil.addAll(list, classes);
    }
    return list.toArray();
  }
@@ -23,6 +23,7 @@ import com.intellij.psi.PsiAnnotation;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiModifierList;
 import com.intellij.psi.impl.light.LightModifierList;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 import java.util.ArrayList;
@@ -41,7 +42,7 @@ public class PsiCompositeModifierList extends LightModifierList {
  public PsiAnnotation[] getAnnotations() {
    List<PsiAnnotation> annotations = new ArrayList<PsiAnnotation>();
    for (PsiModifierList list : mySublists) {
-      annotations.addAll(Arrays.asList(list.getAnnotations()));
+      ContainerUtil.addAll(annotations, list.getAnnotations());
    }
    return annotations.toArray(new PsiAnnotation[annotations.size()]);
  }
@@ -68,4 +69,4 @@ public class PsiCompositeModifierList extends LightModifierList {
    }
    return false;
  }
-}
+}
@@ -38,6 +38,7 @@ import com.intellij.refactoring.util.usageInfo.NoConstructorClassUsageInfo;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.VisibilityUtil;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.Nullable;
@@ -662,7 +663,7 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
    LOG.assertTrue(toInsertParams || toInsertThrows);
    if (toInsertParams) {
      List<PsiParameter> newParameters = new ArrayList<PsiParameter>();
-      newParameters.addAll(Arrays.asList(caller.getParameterList().getParameters()));
+      ContainerUtil.addAll(newParameters, caller.getParameterList().getParameters());
      final JavaParameterInfo[] primaryNewParms = changeInfo.getNewParameters();
      PsiSubstitutor substitutor =
        baseMethod == null ? PsiSubstitutor.EMPTY : ChangeSignatureProcessor.calculateSubstitutor(caller, baseMethod);
@@ -678,7 +679,7 @@ public class JavaChangeSignatureUsageProcessor implements ChangeSignatureUsagePr
    if (toInsertThrows) {
      List<PsiJavaCodeReferenceElement> newThrowns = new ArrayList<PsiJavaCodeReferenceElement>();
      final PsiReferenceList throwsList = caller.getThrowsList();
-      newThrowns.addAll(Arrays.asList(throwsList.getReferenceElements()));
+      ContainerUtil.addAll(newThrowns, throwsList.getReferenceElements());
      final ThrownExceptionInfo[] primaryNewExns = changeInfo.getNewExceptions();
      for (ThrownExceptionInfo thrownExceptionInfo : primaryNewExns) {
        if (thrownExceptionInfo.getOldIndex() < 0) {
@@ -35,6 +35,7 @@ import com.intellij.refactoring.util.usageInfo.DefaultConstructorImplicitUsageIn
 import com.intellij.refactoring.util.usageInfo.NoConstructorClassUsageInfo;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.usageView.UsageViewUtil;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;

 import java.util.ArrayList;
@@ -101,7 +102,7 @@ class JavaChangeSignatureUsageSearcher {
    final PsiParameter[] parameters = method.getParameterList().getParameters();
    final Set<PsiParameter> deletedOrRenamedParameters = new HashSet<PsiParameter>();
    if (isOriginal) {
-      deletedOrRenamedParameters.addAll(Arrays.asList(parameters));
+      ContainerUtil.addAll(deletedOrRenamedParameters, parameters);
      for (ParameterInfo parameterInfo : myChangeInfo.getNewParameters()) {
        if (parameterInfo.getOldIndex() >= 0 && parameterInfo.getOldIndex() < parameters.length) {
          final PsiParameter parameter = parameters[parameterInfo.getOldIndex()];
@@ -51,6 +51,7 @@ import com.intellij.usageView.UsageInfo;
 import com.intellij.usageView.UsageViewDescriptor;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.VisibilityUtil;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -110,7 +111,7 @@ public class ExtractClassProcessor extends FixableUsagesRefactoringProcessor {
    delegateFieldName = calculateDelegateFieldName();
    requiresBackpointer = new BackpointerUsageVisitor(fields, innerClasses, methods, sourceClass).backpointerRequired();
    if (requiresBackpointer) {
-      typeParams.addAll(Arrays.asList(sourceClass.getTypeParameters()));
+      ContainerUtil.addAll(typeParams, sourceClass.getTypeParameters());
    }
    else {
      final Set<PsiTypeParameter> typeParamSet = new HashSet<PsiTypeParameter>();
@@ -44,6 +44,7 @@ import com.intellij.usageView.UsageInfo;
 import com.intellij.usageView.UsageViewDescriptor;
 import com.intellij.usageView.UsageViewUtil;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;

@@ -200,7 +201,7 @@ public abstract class MakeMethodOrClassStaticProcessor<T extends PsiTypeParamete
  protected UsageInfo[] findUsages() {
    ArrayList<UsageInfo> result = new ArrayList<UsageInfo>();

-    result.addAll(Arrays.asList(MakeStaticUtil.findClassRefsInMember(myMember, true)));
+    ContainerUtil.addAll(result, MakeStaticUtil.findClassRefsInMember(myMember, true));

    if (mySettings.isReplaceUsages()) {
      findExternalUsages(result);
@@ -37,6 +37,7 @@ import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.makeStatic.MakeStaticHandler;
 import com.intellij.refactoring.move.MoveInstanceMembersUtil;
 import com.intellij.refactoring.util.CommonRefactoringUtil;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -131,8 +132,8 @@ public class MoveInstanceMethodHandler implements RefactoringActionHandler {
  @Nullable
  private static String collectSuitableVariables(final PsiMethod method, final List<PsiVariable> suitableVariables) {
    final List<PsiVariable> allVariables = new ArrayList<PsiVariable>();
-    allVariables.addAll(Arrays.asList(method.getParameterList().getParameters()));
-    allVariables.addAll(Arrays.asList(method.getContainingClass().getFields()));
+    ContainerUtil.addAll(allVariables, method.getParameterList().getParameters());
+    ContainerUtil.addAll(allVariables, method.getContainingClass().getFields());
    boolean classTypesFound = false;
    boolean resolvableClassesFound = false;
    boolean classesInProjectFound = false;
@@ -45,6 +45,7 @@ import com.intellij.usageView.UsageViewDescriptor;
 import com.intellij.usageView.UsageViewUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.VisibilityUtil;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
@@ -80,7 +81,7 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
    myOptions = dialog;
    PsiMember[] members = dialog.getSelectedMembers();
    myMembersToMove.clear();
-    myMembersToMove.addAll(Arrays.asList(members));
+    ContainerUtil.addAll(myMembersToMove, members);

    setCommandName(members);

@@ -13,6 +13,7 @@ import com.intellij.psi.util.InheritanceUtil;
 import com.intellij.psi.util.MethodSignatureUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.typeMigration.usageInfo.TypeMigrationUsageInfo;
+import com.intellij.util.containers.ContainerUtil;

 import java.util.*;

@@ -153,7 +154,7 @@ public class ClassTypeArgumentMigrationProcessor {
    private final Set<PsiTypeParameter> myTypeParams = new HashSet<PsiTypeParameter>();

    private TypeParameterSearcher(final PsiTypeParameter[] set) {
-      myTypeParams.addAll(Arrays.asList(set));
+      ContainerUtil.addAll(myTypeParams, set);
    }

    public Boolean visitType(final PsiType type) {
@@ -6,6 +6,7 @@ import com.intellij.psi.*;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.refactoring.typeMigration.rules.*;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;

@@ -29,7 +30,7 @@ public class TypeMigrationRules {
  public TypeMigrationRules(final PsiType root) {
    myRootType = root;
    myConversionRules.add(new RootTypeConversionRule());
-    myConversionRules.addAll(Arrays.asList(Extensions.getExtensions(TypeConversionRule.EP_NAME)));
+    ContainerUtil.addAll(myConversionRules, Extensions.getExtensions(TypeConversionRule.EP_NAME));
  }

  public void setMigrationRootType(PsiType migrationRootType) {
@@ -1,5 +1,6 @@
 package com.intellij.psi.impl.compiled;

+import com.intellij.util.containers.ContainerUtil;
 import junit.framework.TestCase;

 import java.util.*;
@@ -123,7 +124,7 @@ public class ClassFileStubBuilderTest extends TestCase {

  private static boolean isInner(String name, String... files) {
    Set<String> all = new HashSet<String>();
-    all.addAll(Arrays.asList(files));
+    ContainerUtil.addAll(all, files);
    all.add(name);
    return ClassFileStubBuilder.isInner(name, new DirectoryMock(all));
  }
@@ -140,4 +141,4 @@ public class ClassFileStubBuilderTest extends TestCase {
      return myFiles.contains(name);
    }
  }
-}
+}
@@ -9,6 +9,7 @@ import com.intellij.psi.PsiMethod;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.refactoring.inheritanceToDelegation.InheritanceToDelegationProcessor;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.ContainerUtil;

 import java.util.ArrayList;
 import java.util.Arrays;
@@ -167,7 +168,7 @@ public class InheritanceToDelegationTest extends MultiFileTestCase {
        final List<PsiMethod> methodsList = new ArrayList<PsiMethod>();
        for (String name : methodNames) {
          final PsiMethod[] methodsByName = baseClass.findMethodsByName(name, false);
-          methodsList.addAll(Arrays.asList(methodsByName));
+          ContainerUtil.addAll(methodsList, methodsByName);
        }
        delegatedMethods = methodsList.toArray(new PsiMethod[methodsList.size()]);

@@ -16,6 +16,7 @@ import com.intellij.openapi.util.EmptyRunnable;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.*;
 import com.intellij.testFramework.IdeaTestCase;
+import com.intellij.util.containers.ContainerUtil;

 import java.io.File;
 import java.io.IOException;
@@ -516,9 +517,9 @@ public class DirectoryIndexImplTest extends IdeaTestCase {
    VirtualFile[] actualDirs = myIndex.getDirectoriesByPackageName(packageName, true).toArray(VirtualFile.EMPTY_ARRAY);
    assertNotNull(actualDirs);
    HashSet<VirtualFile> set1 = new HashSet<VirtualFile>();
-    set1.addAll(Arrays.asList(expectedDirs));
+    ContainerUtil.addAll(set1, expectedDirs);
    HashSet<VirtualFile> set2 = new HashSet<VirtualFile>();
-    set2.addAll(Arrays.asList(actualDirs));
+    ContainerUtil.addAll(set2, actualDirs);
    assertEquals(set1, set2);
  }
 }
@@ -29,6 +29,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.TableUtil;
 import com.intellij.ui.UIBundle;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.ItemRemovable;
 import com.intellij.util.ui.Table;
 import com.intellij.util.ui.UIUtil;
@@ -177,7 +178,7 @@ public class ClassFilterEditor extends JPanel {
    public final void setFilters(ClassFilter[] filters) {
      myFilters.clear();
      if (filters != null) {
-        myFilters.addAll(Arrays.asList(filters));
+        ContainerUtil.addAll(myFilters, filters);
      }
      fireTableDataChanged();
    }
@@ -25,6 +25,7 @@ import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.lang.UrlClassLoader;
 import com.intellij.util.text.StringTokenizer;
 import org.jetbrains.annotations.NonNls;
@@ -167,7 +168,7 @@ public class ClassloaderUtil {
    final ClassLoader loader = ClassloaderUtil.class.getClassLoader();
    if (loader instanceof URLClassLoader) {
      URLClassLoader urlClassLoader = (URLClassLoader)loader;
-      aClasspathElements.addAll(Arrays.asList(urlClassLoader.getURLs()));
+      ContainerUtil.addAll(aClasspathElements, urlClassLoader.getURLs());
    }
    else {
      try {
@@ -27,6 +27,7 @@ import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Processor;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.text.StringTokenizer;
 import org.jetbrains.annotations.NonNls;
@@ -113,17 +114,17 @@ public class LibraryUtil {
          final Library library = ((LibraryOrderEntry)entry).getLibrary();
          if (library != null) {
            VirtualFile[] files = includeSourceFiles ? library.getFiles(OrderRootType.SOURCES) : null;
-            if (files == null || files.length == 0){
+            if (files == null || files.length == 0) {
              files = library.getFiles(OrderRootType.CLASSES);
            }
-            roots.addAll(Arrays.asList(files));
+            ContainerUtil.addAll(roots, files);
          }
-        } else if (includeJdk && entry instanceof JdkOrderEntry){
+        } else if (includeJdk && entry instanceof JdkOrderEntry) {
          VirtualFile[] files = includeSourceFiles ? entry.getFiles(OrderRootType.SOURCES) : null;
-          if (files == null || files.length == 0){
+          if (files == null || files.length == 0) {
            files = entry.getFiles(OrderRootType.CLASSES);
          }
-          roots.addAll(Arrays.asList(files));
+          ContainerUtil.addAll(roots, files);
        }
      }
    }
@@ -156,4 +157,4 @@ public class LibraryUtil {
    }
    return null;
  }
-}
+}
@@ -21,6 +21,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -60,7 +61,7 @@ public class LocalSearchScope extends SearchScope {
    for (final PsiElement element : scope) {
      LOG.assertTrue(element.getContainingFile() != null);
      if (element instanceof PsiFile) {
-        localScope.addAll(Arrays.asList(((PsiFile)element).getPsiRoots()));
+        ContainerUtil.addAll(localScope, ((PsiFile)element).getPsiRoots());
      }
      else {
        localScope.add(element);
@@ -25,6 +25,7 @@ import com.intellij.psi.search.PsiElementProcessor;
 import com.intellij.psi.stubs.StubBase;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.SmartList;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -608,7 +609,7 @@ public class PsiTreeUtil {
    }

    ArrayList<PsiElement> filteredElements = new ArrayList<PsiElement>();
-    filteredElements.addAll(Arrays.asList(elements));
+    ContainerUtil.addAll(filteredElements, elements);

    int previousSize;
    do {
@@ -626,7 +627,8 @@ public class PsiTreeUtil {
          }
        }
      }
-    } while (filteredElements.size() != previousSize);
+    }
+    while (filteredElements.size() != previousSize);

    if (LOG.isDebugEnabled()) {
      for (PsiElement element : filteredElements) {
@@ -28,6 +28,7 @@ import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.codeInsight.hint.HintManager;
+import com.intellij.util.containers.ContainerUtil;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -178,7 +179,7 @@ public class CommonRefactoringUtil {

    final ReadonlyStatusHandler.OperationStatus status = ReadonlyStatusHandler.getInstance(project)
      .ensureFilesWritable(VfsUtil.toVirtualFileArray(readonly));
-    failed.addAll(Arrays.asList(status.getReadonlyFiles()));
+    ContainerUtil.addAll(failed, status.getReadonlyFiles());
    if (notifyOnFail && (!failed.isEmpty() || seenNonWritablePsiFilesWithoutVirtualFile && readonly.isEmpty())) {
      StringBuilder message = new StringBuilder(messagePrefix);
      message.append('\n');
@@ -25,6 +25,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.impl.source.codeStyle.CodeStyleSchemeImpl;
 import com.intellij.psi.impl.source.codeStyle.CodeStyleSchemesImpl;
 import com.intellij.util.EventDispatcher;
+import com.intellij.util.containers.ContainerUtil;

 import java.util.*;

@@ -99,7 +100,7 @@ public class CodeStyleSchemesModel {
    CodeStyleScheme[] allSchemes = CodeStyleSchemes.getInstance().getSchemes();
    mySettingsToClone.clear();
    mySchemes.clear();
-    mySchemes.addAll(Arrays.asList(allSchemes));
+    ContainerUtil.addAll(mySchemes, allSchemes);
    myGlobalSelected = CodeStyleSchemes.getInstance().getCurrentScheme();

    CodeStyleSettings perProjectSettings = getProjectSettings().PER_PROJECT_SETTINGS;
@@ -121,8 +121,8 @@ public class CompletionData {
    });
  }

-  public void addKeywordVariants(Set<CompletionVariant> set, PsiElement position, final PsiFile file){
-    set.addAll(Arrays.asList(findVariants(position, file)));
+  public void addKeywordVariants(Set<CompletionVariant> set, PsiElement position, final PsiFile file) {
+    ContainerUtil.addAll(set, findVariants(position, file));
  }

  public void completeKeywordsBySet(final Set<LookupElement> set, Set<CompletionVariant> variants, final PsiElement position,
@@ -45,6 +45,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.source.SourceTreeToPsiMap;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.xml.util.XmlStringUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -435,7 +436,7 @@ public class HighlightInfo {
        if (localInspectionTool instanceof CustomSuppressableInspectionTool) {
          final IntentionAction[] suppressActions = ((CustomSuppressableInspectionTool)localInspectionTool).getSuppressActions(element);
          if (suppressActions != null) {
-            newOptions.addAll(Arrays.asList(suppressActions));
+            ContainerUtil.addAll(newOptions, suppressActions);
          }
        }
      }
@@ -26,6 +26,7 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Key;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NonNls;
@@ -348,7 +349,7 @@ public class LookupItem<T> extends MutableLookupElement<T> implements Comparable
  }

  public LookupItem<T> addLookupStrings(@NonNls final String... additionalLookupStrings) {
-    myAllLookupStrings.addAll(Arrays.asList(additionalLookupStrings));
+    ContainerUtil.addAll(myAllLookupStrings, additionalLookupStrings);
    return this;
  }

@@ -28,6 +28,7 @@ import com.intellij.openapi.help.HelpManager;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.ScrollPaneFactory;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.Table;

 import javax.swing.*;
@@ -228,8 +229,8 @@ class EditVariableDialog extends DialogWrapper {

    if (additionalMacros!=null) {
      ArrayList<Macro> list = new ArrayList<Macro>(macros.length + additionalMacros.size());
-      list.addAll( Arrays.asList(macros) );
-      list.addAll( additionalMacros );
+      ContainerUtil.addAll(list, macros);
+      list.addAll(additionalMacros);
      macros = list.toArray(new Macro[0]);
    }

@@ -31,6 +31,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vcs.FileStatus;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.HashSet;
 import gnu.trove.THashMap;
@@ -137,7 +138,7 @@ public abstract class DescriptorProviderInspection extends InspectionTool implem
        localQuickFixes = new HashSet<QuickFix>();
        getQuickFixActions().put(refEntity, localQuickFixes);
      }
-      localQuickFixes.addAll(Arrays.asList(fixes));
+      ContainerUtil.addAll(localQuickFixes, fixes);
    }
  }

@@ -454,7 +455,7 @@ public abstract class DescriptorProviderInspection extends InspectionTool implem
        final Set<CommonProblemDescriptor> allAvailable = new HashSet<CommonProblemDescriptor>();
        for (CommonProblemDescriptor[] descriptors : myOldProblemElements.values()) {
          if (descriptors != null) {
-            allAvailable.addAll(Arrays.asList(descriptors));
+            ContainerUtil.addAll(allAvailable, descriptors);
          }
        }
        final boolean old = contains(descriptor, allAvailable);
@@ -28,6 +28,7 @@ import com.intellij.openapi.util.Factory;
 import com.intellij.profile.codeInspection.ui.InspectionToolsConfigurable;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -62,8 +63,8 @@ public class InspectionToolRegistrar {
  public void ensureInitialized() {
    if (!myInspectionComponentsLoaded.getAndSet(true)) {
      Set<InspectionToolProvider> providers = new THashSet<InspectionToolProvider>();
-      providers.addAll(Arrays.asList(ApplicationManager.getApplication().getComponents(InspectionToolProvider.class)));
-      providers.addAll(Arrays.asList(Extensions.getExtensions(InspectionToolProvider.EXTENSION_POINT_NAME)));
+      ContainerUtil.addAll(providers, ApplicationManager.getApplication().getComponents(InspectionToolProvider.class));
+      ContainerUtil.addAll(providers, Extensions.getExtensions(InspectionToolProvider.EXTENSION_POINT_NAME));
      registerTools(providers.toArray(new InspectionToolProvider[providers.size()]));
      for (InspectionToolsFactory factory : Extensions.getExtensions(InspectionToolsFactory.EXTENSION_POINT_NAME)) {
        for (final InspectionProfileEntry profileEntry : factory.createTools()) {
@@ -71,7 +72,8 @@ public class InspectionToolRegistrar {
            public InspectionTool create() {
              if (profileEntry instanceof LocalInspectionTool) {
                return new LocalInspectionToolWrapper((LocalInspectionTool)profileEntry);
-              } else if (profileEntry instanceof GlobalInspectionTool) {
+              }
+              else if (profileEntry instanceof GlobalInspectionTool) {
                return new GlobalInspectionToolWrapper((GlobalInspectionTool)profileEntry);
              }
              return (InspectionTool)profileEntry;
@@ -34,6 +34,7 @@ import com.intellij.codeInspection.ui.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.ui.tree.TreeUtil;
 import org.jetbrains.annotations.Nullable;
@@ -78,7 +79,7 @@ public class OfflineInspectionRVContentProvider extends InspectionRVContentProvi
            if (descriptor != null) {
              final QuickFix[] fixes = descriptor.getFixes();
              if (fixes != null) {
-                quickFixes.addAll(Arrays.asList(fixes));
+                ContainerUtil.addAll(quickFixes, fixes);
              }
            }
          }
@@ -49,6 +49,7 @@ import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
 import com.intellij.ui.content.*;
 import com.intellij.util.EventDispatcher;
 import com.intellij.util.concurrency.Semaphore;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -93,7 +94,7 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
            Set<String> currentWindows = new HashSet<String>();
            String[] toolWindowIds = toolWindowManager.getToolWindowIds();

-            currentWindows.addAll(Arrays.asList(toolWindowIds));
+            ContainerUtil.addAll(currentWindows, toolWindowIds);
            myToolwindowIdZbuffer.retainAll(currentWindows);

            final String activeToolWindowId = toolWindowManager.getActiveToolWindowId();
@@ -41,6 +41,7 @@ import com.intellij.ui.tabs.TabInfo;
 import com.intellij.ui.tabs.TabsListener;
 import com.intellij.ui.tabs.UiDecorator;
 import com.intellij.ui.tabs.impl.JBTabsImpl;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.AbstractLayoutManager;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -1137,7 +1138,7 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
    ArrayList<AnAction> result = new ArrayList<AnAction>();
    if (myLeftToolbarActions != null) {
      AnAction[] kids = myLeftToolbarActions.getChildren(null);
-      result.addAll(Arrays.asList(kids));
+      ContainerUtil.addAll(result, kids);
    }
    return result;
  }
@@ -54,6 +54,7 @@ import com.intellij.ui.NonFocusableCheckBox;
 import com.intellij.ui.components.JBList;
 import com.intellij.ui.components.panels.NonOpaquePanel;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;

@@ -576,8 +577,10 @@ public class EditorSearchComponent extends JPanel implements DataProvider {
      copyFrom(ActionManager.getInstance().getAction(IdeActions.ACTION_PREVIOUS_OCCURENCE));

      ArrayList<Shortcut> shortcuts = new ArrayList<Shortcut>();
-      shortcuts.addAll(Arrays.asList(ActionManager.getInstance().getAction(IdeActions.ACTION_FIND_PREVIOUS).getShortcutSet().getShortcuts()));
-      shortcuts.addAll(Arrays.asList(ActionManager.getInstance().getAction(IdeActions.ACTION_EDITOR_MOVE_CARET_UP).getShortcutSet().getShortcuts()));
+      ContainerUtil
+        .addAll(shortcuts, ActionManager.getInstance().getAction(IdeActions.ACTION_FIND_PREVIOUS).getShortcutSet().getShortcuts());
+      ContainerUtil
+        .addAll(shortcuts, ActionManager.getInstance().getAction(IdeActions.ACTION_EDITOR_MOVE_CARET_UP).getShortcutSet().getShortcuts());
      shortcuts.add(new KeyboardShortcut(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_DOWN_MASK), null));

      registerCustomShortcutSet(
@@ -602,8 +605,9 @@ public class EditorSearchComponent extends JPanel implements DataProvider {
    public NextOccurenceAction() {
      copyFrom(ActionManager.getInstance().getAction(IdeActions.ACTION_NEXT_OCCURENCE));
      ArrayList<Shortcut> shortcuts = new ArrayList<Shortcut>();
-      shortcuts.addAll(Arrays.asList(ActionManager.getInstance().getAction(IdeActions.ACTION_FIND_NEXT).getShortcutSet().getShortcuts()));
-      shortcuts.addAll(Arrays.asList(ActionManager.getInstance().getAction(IdeActions.ACTION_EDITOR_MOVE_CARET_DOWN).getShortcutSet().getShortcuts()));
+      ContainerUtil.addAll(shortcuts, ActionManager.getInstance().getAction(IdeActions.ACTION_FIND_NEXT).getShortcutSet().getShortcuts());
+      ContainerUtil
+        .addAll(shortcuts, ActionManager.getInstance().getAction(IdeActions.ACTION_EDITOR_MOVE_CARET_DOWN).getShortcutSet().getShortcuts());
      shortcuts.add(new KeyboardShortcut(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), null));

      registerCustomShortcutSet(
@@ -627,9 +631,9 @@ public class EditorSearchComponent extends JPanel implements DataProvider {
      getTemplatePresentation().setText("Search History");

      ArrayList<Shortcut> shortcuts = new ArrayList<Shortcut>();
-      shortcuts.addAll(Arrays.asList(ActionManager.getInstance().getAction(IdeActions.ACTION_FIND).getShortcutSet().getShortcuts()));
+      ContainerUtil.addAll(shortcuts, ActionManager.getInstance().getAction(IdeActions.ACTION_FIND).getShortcutSet().getShortcuts());
      shortcuts.add(new KeyboardShortcut(KeyStroke.getKeyStroke(KeyEvent.VK_H, KeyEvent.CTRL_DOWN_MASK), null));
-      shortcuts.addAll(Arrays.asList(ActionManager.getInstance().getAction("IncrementalSearch").getShortcutSet().getShortcuts()));
+      ContainerUtil.addAll(shortcuts, ActionManager.getInstance().getAction("IncrementalSearch").getShortcutSet().getShortcuts());

      registerCustomShortcutSet(
        new CustomShortcutSet(shortcuts.toArray(new Shortcut[shortcuts.size()])),
@@ -70,6 +70,7 @@ import com.intellij.util.CommonProcessors;
 import com.intellij.util.Function;
 import com.intellij.util.PatternUtil;
 import com.intellij.util.Processor;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.indexing.FileBasedIndex;
 import gnu.trove.THashSet;
 import gnu.trove.TIntHashSet;
@@ -562,7 +563,7 @@ public class FindInProjectUtil {
    // in case our word splitting is incorrect
    PsiFile[] allWordsFiles =
      cacheManager.getFilesWithWord(findModel.getStringToFind(), UsageSearchContext.ANY, scope, findModel.isCaseSensitive());
-    resultFiles.addAll(Arrays.asList(allWordsFiles));
+    ContainerUtil.addAll(resultFiles, allWordsFiles);

    filterMaskedFiles(resultFiles, fileMaskRegExp);

@@ -37,6 +37,7 @@ import com.intellij.openapi.ui.popup.JBPopupListener;
 import com.intellij.openapi.ui.popup.LightweightWindowEvent;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiFile;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 import javax.swing.*;
@@ -195,7 +196,7 @@ public class GotoFileAction extends GotoActionBase implements DumbAware {
     */
    private ElementsChooser<FileType> createFileTypeChooser(final GotoFileModel gotoFileModel) {
      List<FileType> elements = new ArrayList<FileType>();
-      elements.addAll(Arrays.asList(FileTypeManager.getInstance().getRegisteredFileTypes()));
+      ContainerUtil.addAll(elements, FileTypeManager.getInstance().getRegisteredFileTypes());
      Collections.sort(elements, FileTypeComparator.INSTANCE);
      final ElementsChooser<FileType> chooser = new ElementsChooser<FileType>(elements, true) {
        @Override
@@ -304,4 +305,4 @@ public class GotoFileAction extends GotoActionBase implements DumbAware {
      }
    }
  }
-}
+}
@@ -187,8 +187,8 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable {
    List<FileTemplateTab> allTabs = new ArrayList<FileTemplateTab>(Arrays.asList(myTemplatesList, myIncludesList, myCodeTemplatesList));

    final Set<FileTemplateGroupDescriptorFactory> factories = new THashSet<FileTemplateGroupDescriptorFactory>();
-    factories.addAll(Arrays.asList(ApplicationManager.getApplication().getComponents(FileTemplateGroupDescriptorFactory.class)));
-    factories.addAll(Arrays.asList(Extensions.getExtensions(FileTemplateGroupDescriptorFactory.EXTENSION_POINT_NAME)));
+    ContainerUtil.addAll(factories, ApplicationManager.getApplication().getComponents(FileTemplateGroupDescriptorFactory.class));
+    ContainerUtil.addAll(factories, Extensions.getExtensions(FileTemplateGroupDescriptorFactory.EXTENSION_POINT_NAME));

    if (!factories.isEmpty()) {
      myJ2eeTemplatesList = new FileTemplateTabAsTree(J2EE_TITLE) {
@@ -197,11 +197,12 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable {
        }

        protected FileTemplateNode initModel() {
-          SortedSet<FileTemplateGroupDescriptor> categories = new TreeSet<FileTemplateGroupDescriptor>(new Comparator<FileTemplateGroupDescriptor>() {
-            public int compare(FileTemplateGroupDescriptor o1, FileTemplateGroupDescriptor o2) {
-              return o1.getTitle().compareTo(o2.getTitle());
-            }
-          });
+          SortedSet<FileTemplateGroupDescriptor> categories =
+            new TreeSet<FileTemplateGroupDescriptor>(new Comparator<FileTemplateGroupDescriptor>() {
+              public int compare(FileTemplateGroupDescriptor o1, FileTemplateGroupDescriptor o2) {
+                return o1.getTitle().compareTo(o2.getTitle());
+              }
+            });


          for (FileTemplateGroupDescriptorFactory templateGroupFactory : factories) {
@@ -209,11 +210,12 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable {
          }

          //noinspection HardCodedStringLiteral
-          return new FileTemplateNode("ROOT", null, ContainerUtil.map2List(categories, new Function<FileTemplateGroupDescriptor, FileTemplateNode>() {
-            public FileTemplateNode fun(FileTemplateGroupDescriptor s) {
-              return new FileTemplateNode(s);
-            }
-          }));
+          return new FileTemplateNode("ROOT", null,
+                                      ContainerUtil.map2List(categories, new Function<FileTemplateGroupDescriptor, FileTemplateNode>() {
+                                        public FileTemplateNode fun(FileTemplateGroupDescriptor s) {
+                                          return new FileTemplateNode(s);
+                                        }
+                                      }));
        }
      };
      allTabs.add(myJ2eeTemplatesList);
@@ -561,27 +563,27 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable {
    // Apply templates
    ArrayList<FileTemplate> newModifiedItems = new ArrayList<FileTemplate>();
    FileTemplate[] templates = myTemplatesList.getTemplates();
-    newModifiedItems.addAll(Arrays.asList(templates));
+    ContainerUtil.addAll(newModifiedItems, templates);
    FileTemplateManager templatesManager = FileTemplateManager.getInstance();
    apply(newModifiedItems, myTemplatesList.savedTemplates, TEMPLATE_ID, templatesManager.getAllTemplates());

    // Apply patterns
    newModifiedItems = new ArrayList<FileTemplate>();
    templates = myIncludesList.getTemplates();
-    newModifiedItems.addAll(Arrays.asList(templates));
+    ContainerUtil.addAll(newModifiedItems, templates);
    apply(newModifiedItems, myIncludesList.savedTemplates, PATTERN_ID, templatesManager.getAllPatterns());

    //Apply code templates
    newModifiedItems = new ArrayList<FileTemplate>();
    templates = myCodeTemplatesList.getTemplates();
-    newModifiedItems.addAll(Arrays.asList(templates));
+    ContainerUtil.addAll(newModifiedItems, templates);
    apply(newModifiedItems, myCodeTemplatesList.savedTemplates, CODE_ID, templatesManager.getAllCodeTemplates());

    //Apply J2EE templates
    if (myJ2eeTemplatesList != null) {
      newModifiedItems = new ArrayList<FileTemplate>();
      templates = myJ2eeTemplatesList.getTemplates();
-      newModifiedItems.addAll(Arrays.asList(templates));
+      ContainerUtil.addAll(newModifiedItems, templates);
      apply(newModifiedItems, myJ2eeTemplatesList.savedTemplates, J2EE_ID, templatesManager.getAllJ2eeTemplates());
    }

@@ -34,6 +34,7 @@ import com.intellij.usages.UsageTarget;
 import com.intellij.usages.UsageView;
 import com.intellij.usages.rules.UsageInFile;
 import com.intellij.usages.rules.UsageInFiles;
+import com.intellij.util.containers.ContainerUtil;

 import java.util.ArrayList;
 import java.util.Arrays;
@@ -105,7 +106,7 @@ public class VirtualFileArrayRule implements GetDataRule {

        if (usage instanceof UsageInFiles) {
          UsageInFiles usageInFiles = (UsageInFiles)usage;
-          result.addAll(Arrays.asList(usageInFiles.getFiles()));
+          ContainerUtil.addAll(result, usageInFiles.getFiles());
        }
      }
    }
@@ -115,7 +116,7 @@ public class VirtualFileArrayRule implements GetDataRule {
        if (!usageTarget.isValid()) continue;
        VirtualFile[] files = usageTarget.getFiles();
        if (files != null) {
-          result.addAll(Arrays.asList(files));
+          ContainerUtil.addAll(result, files);
        }
      }
    }
@@ -173,7 +174,7 @@ public class VirtualFileArrayRule implements GetDataRule {
  private static Object getFilesFromModules(Module[] selectedModules) {
    ArrayList<VirtualFile> result = new ArrayList<VirtualFile>();
    for (Module selectedModule : selectedModules) {
-      result.addAll(Arrays.asList(ModuleRootManager.getInstance(selectedModule).getContentRoots()));
+      ContainerUtil.addAll(result, ModuleRootManager.getInstance(selectedModule).getContentRoots());
    }
    return VfsUtil.toVirtualFileArray(result);
  }
@@ -46,6 +46,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiUtilBase;
 import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.util.PathUtil;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -371,13 +372,13 @@ public class NavBarModel {
    if (!(object instanceof Project) && rootElement instanceof Module && ((Module)rootElement).isDisposed()) return result;
    final PsiManager psiManager = PsiManager.getInstance(myProject);
    if (object instanceof Project) {
-      result.addAll(Arrays.asList(ApplicationManager.getApplication().runReadAction(
-          new Computable<Module[]>() {
-            public Module[] compute() {
-              return ModuleManager.getInstance((Project)object).getModules();
-            }
+      ContainerUtil.addAll(result, ApplicationManager.getApplication().runReadAction(
+        new Computable<Module[]>() {
+          public Module[] compute() {
+            return ModuleManager.getInstance((Project)object).getModules();
          }
-      )));
+        }
+      ));
    }
    else if (object instanceof Module) {
      Module module = (Module)object;
@@ -41,6 +41,7 @@ import com.intellij.psi.search.scope.packageSet.PackageSet;
 import com.intellij.ui.PopupHandler;
 import com.intellij.util.Alarm;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

@@ -151,8 +152,8 @@ public class ScopeViewPane extends AbstractProjectViewPane {
    if (!(element instanceof PsiElement)) return;

    List<NamedScope> allScopes = new ArrayList<NamedScope>();
-    allScopes.addAll(Arrays.asList(myDependencyValidationManager.getScopes()));
-    allScopes.addAll(Arrays.asList(myNamedScopeManager.getScopes()));
+    ContainerUtil.addAll(allScopes, myDependencyValidationManager.getScopes());
+    ContainerUtil.addAll(allScopes, myNamedScopeManager.getScopes());
    for (int i = 0; i < allScopes.size(); i++) {
      final NamedScope scope = allScopes.get(i);
      String name = scope.getName();
@@ -25,6 +25,7 @@ import com.intellij.openapi.util.Iconable;
 import com.intellij.pom.Navigatable;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -102,7 +103,7 @@ public abstract class PsiTreeElementBase <T extends PsiElement> implements Struc
    for (StructureViewExtension extension : structureViewFactory.getAllExtensions(aClass)) {
      StructureViewTreeElement[] children = extension.getChildren(element);
      if (children != null) {
-        result.addAll(Arrays.asList(children));
+        ContainerUtil.addAll(result, children);
      }
    }
    return result.toArray(new StructureViewTreeElement[result.size()]);
@@ -30,6 +30,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.Nullable;

 import java.util.*;
@@ -55,14 +56,14 @@ public class TodoTreeHelper {
    final PsiManager psiManager = PsiManager.getInstance(myProject);
    final List<VirtualFile> roots = new ArrayList<VirtualFile>();
    final List<VirtualFile> sourceRoots = new ArrayList<VirtualFile>();
-    if (module == null){
+    if (module == null) {
      final ProjectRootManager projectRootManager = ProjectRootManager.getInstance(myProject);
-      roots.addAll(Arrays.asList(projectRootManager.getContentRoots()));
-      sourceRoots.addAll(Arrays.asList(projectRootManager.getContentSourceRoots()));
+      ContainerUtil.addAll(roots, projectRootManager.getContentRoots());
+      ContainerUtil.addAll(sourceRoots, projectRootManager.getContentSourceRoots());
    } else {
      ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(module);
-      roots.addAll(Arrays.asList(moduleRootManager.getContentRoots()));
-      sourceRoots.addAll(Arrays.asList(moduleRootManager.getSourceRoots()));
+      ContainerUtil.addAll(roots, moduleRootManager.getContentRoots());
+      ContainerUtil.addAll(sourceRoots, moduleRootManager.getSourceRoots());
    }
    roots.removeAll(sourceRoots);
    for (VirtualFile dir : roots) {
@@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.ContainerUtil;

 import javax.swing.*;
 import java.util.*;
@@ -51,7 +52,7 @@ public abstract class ContributorsBasedGotoByModel implements ChooseByNameModel
    Set<String> names = new HashSet<String>();
    for (ChooseByNameContributor contributor : myContributors) {
      try {
-        names.addAll(Arrays.asList(contributor.getNames(myProject, checkBoxState)));
+        ContainerUtil.addAll(names, contributor.getNames(myProject, checkBoxState));
      }
      catch(ProcessCanceledException ex) {
        // index corruption detected, ignore
@@ -127,4 +128,4 @@ public abstract class ContributorsBasedGotoByModel implements ChooseByNameModel
  protected boolean acceptItem(NavigationItem item) {
    return true;
  }
-}
+}
@@ -24,6 +24,7 @@ import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

 import java.util.Arrays;
@@ -41,7 +42,7 @@ public class JdkScope extends GlobalSearchScope {
    super(project);
    myIndex = ProjectRootManager.getInstance(project).getFileIndex();
    myJdkName = jdk.getJdkName();
-    myEntries.addAll(Arrays.asList(jdk.getFiles(OrderRootType.CLASSES)));
+    ContainerUtil.addAll(myEntries, jdk.getFiles(OrderRootType.CLASSES));
  }

  public int hashCode() {
--- a/Show More
+++ b/Show More