diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildAction.java index 6cc8ac059f34..291e06e25725 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildAction.java @@ -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) { diff --git a/java/compiler/impl/src/com/intellij/compiler/ant/GenerationOptionsImpl.java b/java/compiler/impl/src/com/intellij/compiler/ant/GenerationOptionsImpl.java index eb3d82ea1e22..bfa9141e1ced 100644 --- a/java/compiler/impl/src/com/intellij/compiler/ant/GenerationOptionsImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/ant/GenerationOptionsImpl.java @@ -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 nodes = moduleChunkGraph.getNodes(); final ModuleChunk[] moduleChunks = nodes.toArray(new ModuleChunk[nodes.size()]); for (ModuleChunk moduleChunk : moduleChunks) { - final Iterator depsIterator = moduleChunkGraph.getIn(moduleChunk); - List deps = new ArrayList(); - while (depsIterator.hasNext()) { - deps.add(depsIterator.next()); - } - moduleChunk.setDependentChunks(deps.toArray(new ModuleChunk[deps.size()])); - myCustomCompilers.addAll(Arrays.asList(moduleChunk.getCustomCompilers())); + final Iterator depsIterator = moduleChunkGraph.getIn(moduleChunk); + List deps = new ArrayList(); + 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(); for (Sdk jdk : projectJdks) { - myJdkUrls.addAll(Arrays.asList(jdk.getRootProvider().getUrls(OrderRootType.CLASSES))); + ContainerUtil.addAll(myJdkUrls, jdk.getRootProvider().getUrls(OrderRootType.CLASSES)); } return myJdkUrls; } diff --git a/java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkClasspath.java b/java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkClasspath.java index 203d7b0e9f9b..9f477c12ebf8 100644 --- a/java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkClasspath.java +++ b/java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkClasspath.java @@ -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 jdkUrls = options.getAllJdkUrls(); final OrderedSet urls = new OrderedSet(); - urls.addAll(Arrays.asList(extension.getOutputRootUrls(forTest))); + ContainerUtil.addAll(urls, extension.getOutputRootUrls(forTest)); urls.removeAll(jdkUrls); return ArrayUtil.toStringArray(urls); } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java index a5794bcb8a06..6f6208583b93 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java @@ -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) { diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompositeScope.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompositeScope.java index 2b8195fbe556..0c9c73a09761 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompositeScope.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompositeScope.java @@ -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 modules = new HashSet(); for (final CompileScope compileScope : myScopes) { - modules.addAll(Arrays.asList(compileScope.getAffectedModules())); + ContainerUtil.addAll(modules, compileScope.getAffectedModules()); } return modules.toArray(new Module[modules.size()]); } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java b/java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java index a98dadb7d29d..f8d1381f2188 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/TranslatingCompilerFilesMonitor.java @@ -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 newRoots = new HashSet(); - 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 oldRoots = new HashSet(); if (myRootsBefore != null) { - oldRoots.addAll(Arrays.asList(myRootsBefore)); + ContainerUtil.addAll(oldRoots, myRootsBefore); } if (!oldRoots.isEmpty()) { oldRoots.removeAll(Arrays.asList(rootsAfter)); diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/ModuleChunk.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/ModuleChunk.java index d507c2b13dfb..956a744f58ca 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/ModuleChunk.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/ModuleChunk.java @@ -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 { final Set modules = getNodes(); Set roots = new HashSet(); for (final Module module : modules) { - roots.addAll(Arrays.asList(myContext.getSourceRoots(module))); + ContainerUtil.addAll(roots, myContext.getSourceRoots(module)); } return VfsUtil.toVirtualFileArray(roots); } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java b/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java index 7b25a94add96..2589933927ff 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java @@ -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"); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java index 01a8b9d93ea1..33860fbdef9a 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java @@ -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 getAllLibraries(ArtifactEditorContext context) { List libraries = new ArrayList(); - 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; } diff --git a/java/compiler/openapi/src/com/intellij/compiler/ant/ChunkBuildExtension.java b/java/compiler/openapi/src/com/intellij/compiler/ant/ChunkBuildExtension.java index ec48ecd1c038..d9ad4e52143d 100644 --- a/java/compiler/openapi/src/com/intellij/compiler/ant/ChunkBuildExtension.java +++ b/java/compiler/openapi/src/com/intellij/compiler/ant/ChunkBuildExtension.java @@ -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 allTargets = new ArrayList(); 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); } } -} \ No newline at end of file +} diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointTableModel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointTableModel.java index 544aed0ebd5b..b38a84bc96a6 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointTableModel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointTableModel.java @@ -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(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointTree.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointTree.java index c68625244d33..397f6c37355c 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointTree.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointTree.java @@ -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(); } diff --git a/java/idea-ui/src/com/intellij/facet/impl/autodetecting/EnableAutodetectionWorker.java b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/EnableAutodetectionWorker.java index cf6117ba10a3..4e89eadb1cbd 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/autodetecting/EnableAutodetectionWorker.java +++ b/java/idea-ui/src/com/intellij/facet/impl/autodetecting/EnableAutodetectionWorker.java @@ -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 toRemove = new THashSet(); diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java index 9db56d737dab..a579c34bc5d3 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java @@ -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() { @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; } }); diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionOptionsPanel.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionOptionsPanel.java index d8ac377ce2d6..c83ffa19e9c6 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionOptionsPanel.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionOptionsPanel.java @@ -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 roots = new ArrayList(); 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); diff --git a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionSettings.java b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionSettings.java index 43ab025dce27..4e9968ec4f11 100644 --- a/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionSettings.java +++ b/java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionSettings.java @@ -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 roots = new ArrayList(); 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); } } } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java index f04f3ebc259e..755b11bb7da2 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java @@ -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 alreadyAdded = new HashSet(); 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); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java index 583d151dcb2f..fe641f733c88 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java @@ -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 result = new ArrayList(); - 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() { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ComplexElementSubstitutionParameters.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ComplexElementSubstitutionParameters.java index bbb0f2b401dc..1845308c5e1a 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ComplexElementSubstitutionParameters.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ComplexElementSubstitutionParameters.java @@ -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> mySubstituted = new HashSet>(); public void setSubstituteAll() { - myTypesToSubstitute.addAll(Arrays.asList(PackagingElementFactory.getInstance().getComplexElementTypes())); + ContainerUtil.addAll(myTypesToSubstitute, PackagingElementFactory.getInstance().getComplexElementTypes()); mySubstituted.clear(); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableEditor.java index 5b5f7c5a3397..3fc1a0f5433b 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableEditor.java @@ -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 modules = new ArrayList(); - 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 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); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java index bc784b5e00a8..bdf4e13ad907 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java @@ -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()]); } diff --git a/java/java-impl/src/com/intellij/analysis/JavaAnalysisScope.java b/java/java-impl/src/com/intellij/analysis/JavaAnalysisScope.java index 04dd2497913b..1aa965646899 100644 --- a/java/java-impl/src/com/intellij/analysis/JavaAnalysisScope.java +++ b/java/java-impl/src/com/intellij/analysis/JavaAnalysisScope.java @@ -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 dirs = new HashSet(); 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(); } -} \ No newline at end of file +} diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java index 3c2e3b9abbf2..3a8eeb35f779 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java @@ -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 methods = new ArrayList(); 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()]); } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ExpectedTypeBasedCompletionProvider.java b/java/java-impl/src/com/intellij/codeInsight/completion/ExpectedTypeBasedCompletionProvider.java index 65478857ce33..0553bc974459 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/ExpectedTypeBasedCompletionProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/ExpectedTypeBasedCompletionProvider.java @@ -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 infos = new THashSet(); 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); diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java index 4eb8e5f27a30..9e7513d06e6a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java @@ -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)); } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java index 672df85106a1..e1c7d5cbba5d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java @@ -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; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java b/java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java index 4250ef5f1c45..15a704e21bb4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java @@ -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; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java index 867393fa645b..93ebf645028d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java @@ -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) { diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java index 701c0d85b446..c78bbb66b579 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java @@ -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() { diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java index 17b11aebe4db..2b6497b47f4d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java @@ -583,7 +583,7 @@ public class CreateFromUsageUtils { if (expectedTypes.length == 0 && !typesList.isEmpty()) { List union = new ArrayList(); 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 union = new ArrayList(); for (ExpectedTypeInfo[] aTypesList : typesList) { - union.addAll(Arrays.asList((ExpectedTypeInfo[])aTypesList)); + ContainerUtil.addAll(union, (ExpectedTypeInfo[])aTypesList); } expectedTypes = union.toArray(new ExpectedTypeInfo[union.size()]); } diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java index 4d2493a05803..10bf173c30e7 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java @@ -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 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; } diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java index 4bde9f7011e5..efbaf7021f02 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java @@ -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 array = new ArrayList(); 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; } -} \ No newline at end of file +} diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java index dd5d4493bf95..485370e2aa16 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java @@ -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(); - 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 equalsFields = new ArrayList(); - equalsFields.addAll(Arrays.asList(myEqualsFields)); + ContainerUtil.addAll(equalsFields, myEqualsFields); Collections.sort(equalsFields, EqualsFieldsComparator.INSTANCE); for (PsiField field : equalsFields) { diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java index 9d9da0b92338..8f0077d61741 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java @@ -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; diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java index 46d63d90538d..628e28c8bfdd 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java @@ -248,7 +248,7 @@ public class OverrideImplementUtil { List results = new ArrayList(); 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); diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java index 2556bc2b1d9e..ba20d25c2517 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java @@ -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 namesList = new ArrayList(); - 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)); diff --git a/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java index a9ba2a0d4e15..a35e0729bc12 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java @@ -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()]); } } diff --git a/java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalAnnotator.java b/java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalAnnotator.java index bb820f68ed2e..1d044ef57c48 100644 --- a/java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalAnnotator.java +++ b/java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalAnnotator.java @@ -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 allFields = new HashSet(); - allFields.addAll(Arrays.asList(psiFields)); + ContainerUtil.addAll(allFields, psiFields); ArrayList instanceInitializerInitializedFields = new ArrayList(); 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; diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java index 29e43e5ec01d..6f6d27acc0aa 100644 --- a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java @@ -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 point = Extensions.getRootArea().getExtensionPoint(ExtensionPoints.DEAD_CODE_TOOL); final UnusedCodeExtension[] deadCodeAddins = point.getExtensions(); diff --git a/java/java-impl/src/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java b/java/java-impl/src/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java index d17847b12353..a6d43911c176 100644 --- a/java/java-impl/src/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java +++ b/java/java-impl/src/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java @@ -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; diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedLibraries/UnusedLibrariesInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedLibraries/UnusedLibrariesInspection.java index 00f0f49ea195..dd37141af7d2 100644 --- a/java/java-impl/src/com/intellij/codeInspection/unusedLibraries/UnusedLibrariesInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/unusedLibraries/UnusedLibrariesInspection.java @@ -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 libraryRoots = new ArrayList(); 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 modules = new HashSet(); 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 { }); } } -} \ No newline at end of file +} diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java index 1cec76994013..cc4be90a44aa 100644 --- a/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java @@ -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; diff --git a/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java b/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java index 90ee10cf58a3..be32c0d6304f 100644 --- a/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java +++ b/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java @@ -186,10 +186,10 @@ public class JavaFindUsagesHandler extends FindUsagesHandler{ if (doSearch) { final List elements = new ArrayList(); 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) { diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallerMethodsTreeStructure.java b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallerMethodsTreeStructure.java index 8db99a3526b9..92f02bd561b1 100644 --- a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallerMethodsTreeStructure.java +++ b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallerMethodsTreeStructure.java @@ -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 methodsToFind = new HashSet(); methodsToFind.add(method); - methodsToFind.addAll(Arrays.asList(method.findDeepestSuperMethods())); + ContainerUtil.addAll(methodsToFind, method.findDeepestSuperMethods()); - final Map methodToDescriptorMap = new HashMap(); + final Map methodToDescriptorMap = new HashMap(); for (final PsiMethod methodToFind : methodsToFind) { MethodReferencesSearch.search(methodToFind, searchScope, true).forEach(new Processor() { 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); diff --git a/java/java-impl/src/com/intellij/ide/projectView/PsiClassChildrenSource.java b/java/java-impl/src/com/intellij/ide/projectView/PsiClassChildrenSource.java index fc22d4ee89f5..88b660cc3346 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/PsiClassChildrenSource.java +++ b/java/java-impl/src/com/intellij/ide/projectView/PsiClassChildrenSource.java @@ -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 children) { - children.addAll(Arrays.asList(psiClass.getMethods())); + ContainerUtil.addAll(children, psiClass.getMethods()); } }; PsiClassChildrenSource FIELDS = new PsiClassChildrenSource() { public void addChildren(PsiClass psiClass, List children) { - children.addAll(Arrays.asList(psiClass.getFields())); + ContainerUtil.addAll(children, psiClass.getFields()); } }; PsiClassChildrenSource CLASSES = new PsiClassChildrenSource() { public void addChildren(PsiClass psiClass, List children) { - children.addAll(Arrays.asList(psiClass.getInnerClasses())); + ContainerUtil.addAll(children, psiClass.getInnerClasses()); } }; diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewProjectNode.java b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewProjectNode.java index 2c882b11ad42..f96b1ec5772c 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewProjectNode.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewProjectNode.java @@ -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 sourceRoots = new ArrayList(); 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 children = new ArrayList(); diff --git a/java/java-impl/src/com/intellij/ide/structureView/impl/java/JavaClassTreeElement.java b/java/java-impl/src/com/intellij/ide/structureView/impl/java/JavaClassTreeElement.java index bf0c6916beca..b97433a98ca3 100644 --- a/java/java-impl/src/com/intellij/ide/structureView/impl/java/JavaClassTreeElement.java +++ b/java/java-impl/src/com/intellij/ide/structureView/impl/java/JavaClassTreeElement.java @@ -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 { List children = Arrays.asList(aClass.getChildren()); Collection ownChildren = new THashSet(); - 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 inherited = new LinkedHashSet(children); aClass.processDeclarations(new AddAllMembersProcessor(inherited, aClass), ResolveState.initial(), null, aClass); diff --git a/java/java-impl/src/com/intellij/ide/todo/nodes/TodoJavaTreeHelper.java b/java/java-impl/src/com/intellij/ide/todo/nodes/TodoJavaTreeHelper.java index 82dc5ca09ee9..940fe5796060 100644 --- a/java/java-impl/src/com/intellij/ide/todo/nodes/TodoJavaTreeHelper.java +++ b/java/java-impl/src/com/intellij/ide/todo/nodes/TodoJavaTreeHelper.java @@ -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 children, final Module module, final TodoTreeBuilder builder) { final PsiManager psiManager = PsiManager.getInstance(getProject()); final List sourceRoots = new ArrayList(); - 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 topLevelPackages = new HashSet(); for (final VirtualFile root : sourceRoots) { @@ -187,4 +188,4 @@ public class TodoJavaTreeHelper extends TodoTreeHelper { } return isEmpty; } -} \ No newline at end of file +} diff --git a/java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultSymbolNavigationContributor.java b/java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultSymbolNavigationContributor.java index beba42382ee0..5e9a65aef891 100644 --- a/java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultSymbolNavigationContributor.java +++ b/java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultSymbolNavigationContributor.java @@ -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 result = new ArrayList(); - 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); diff --git a/java/java-impl/src/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java b/java/java-impl/src/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java index d1dfb59d57af..0d385daa40b1 100644 --- a/java/java-impl/src/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java +++ b/java/java-impl/src/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java @@ -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 descriptors = new ArrayList(); - 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()]); } diff --git a/java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java b/java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java index 8e2b5cddb810..70574ed584f9 100644 --- a/java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java +++ b/java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java @@ -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()); } } } diff --git a/java/java-impl/src/com/intellij/psi/impl/CompositeShortNamesCache.java b/java/java-impl/src/com/intellij/psi/impl/CompositeShortNamesCache.java index 2b1c1fee6ac6..40c5af792b87 100644 --- a/java/java-impl/src/com/intellij/psi/impl/CompositeShortNamesCache.java +++ b/java/java-impl/src/com/intellij/psi/impl/CompositeShortNamesCache.java @@ -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(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; } -} \ No newline at end of file +} diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java b/java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java index b08d11e023e5..19e95aa46b7b 100644 --- a/java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java @@ -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 elementFinders = new ArrayList(); 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 classes = new SmartList(); 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(); - 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 result = new ArrayList(); 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()]); diff --git a/java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java b/java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java index 9ad79c328ef7..100037aa9bc8 100644 --- a/java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java @@ -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(); - classes.addAll(Arrays.asList(psiClasses)); + ContainerUtil.addAll(classes, psiClasses); } } return classes == null ? PsiClass.EMPTY_ARRAY : classes.toArray(new PsiClass[classes.size()]); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java index e262972b78ba..e92b5e4830b6 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java @@ -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; } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java index 59576163721d..34d4227181b3 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java @@ -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(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 names = new LinkedHashSet(); - 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; diff --git a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/ParamDocTagInfo.java b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/ParamDocTagInfo.java index 4bd8be483631..d7cb5d811554 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/ParamDocTagInfo.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/ParamDocTagInfo.java @@ -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()]); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java index b6902af7d931..5dc1fc850453 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java @@ -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 vars = new ArrayList(); 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()]); } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FilePathReferenceProvider.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FilePathReferenceProvider.java index 8e4d9613e170..20a161681a0b 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FilePathReferenceProvider.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FilePathReferenceProvider.java @@ -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 modules = new ArrayList(); modules.add(thisModule); ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(thisModule); - modules.addAll(Arrays.asList(moduleRootManager.getDependencies())); + ContainerUtil.addAll(modules, moduleRootManager.getDependencies()); List result = new ArrayList(); final PsiManager psiManager = PsiManager.getInstance(thisModule.getProject()); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassListReferenceProvider.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassListReferenceProvider.java index d2ab61beac96..e32df206a0ba 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassListReferenceProvider.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassListReferenceProvider.java @@ -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(); } } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java index 8e8890f27c51..972167c8716c 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java @@ -275,7 +275,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer } } else { - list.addAll(Arrays.asList(classes)); + ContainerUtil.addAll(list, classes); } return list.toArray(); } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCompositeModifierList.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCompositeModifierList.java index a53b0ccdfd29..dc40a808c615 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCompositeModifierList.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCompositeModifierList.java @@ -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 annotations = new ArrayList(); 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; } -} \ No newline at end of file +} diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java index e0e6f39cf913..cd8ff0b67273 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java @@ -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 newParameters = new ArrayList(); - 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 newThrowns = new ArrayList(); 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) { diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageSearcher.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageSearcher.java index 0ec986ef9178..e4fa01f147d3 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageSearcher.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageSearcher.java @@ -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 deletedOrRenamedParameters = new HashSet(); 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()]; diff --git a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java index 912b44ab088a..3fc2c91f2998 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java @@ -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 typeParamSet = new HashSet(); diff --git a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java index 5c5036683675..8251c894ac99 100644 --- a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java @@ -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 result = new ArrayList(); - result.addAll(Arrays.asList(MakeStaticUtil.findClassRefsInMember(myMember, true))); + ContainerUtil.addAll(result, MakeStaticUtil.findClassRefsInMember(myMember, true)); if (mySettings.isReplaceUsages()) { findExternalUsages(result); diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java index 1430da9bea02..ed51d5326147 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodHandler.java @@ -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 suitableVariables) { final List allVariables = new ArrayList(); - 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; diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java index 2852d5b6144c..6ddce912fa95 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java @@ -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); diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/ClassTypeArgumentMigrationProcessor.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/ClassTypeArgumentMigrationProcessor.java index 9f78f9d47e37..2bbdaaf7862d 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/ClassTypeArgumentMigrationProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/ClassTypeArgumentMigrationProcessor.java @@ -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 myTypeParams = new HashSet(); private TypeParameterSearcher(final PsiTypeParameter[] set) { - myTypeParams.addAll(Arrays.asList(set)); + ContainerUtil.addAll(myTypeParams, set); } public Boolean visitType(final PsiType type) { diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationRules.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationRules.java index da6f08d8bd3b..ebe534526fb3 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationRules.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationRules.java @@ -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) { diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/compiled/ClassFileStubBuilderTest.java b/java/java-tests/testSrc/com/intellij/psi/impl/compiled/ClassFileStubBuilderTest.java index b5e9fa54880f..04f3686b1f35 100644 --- a/java/java-tests/testSrc/com/intellij/psi/impl/compiled/ClassFileStubBuilderTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/impl/compiled/ClassFileStubBuilderTest.java @@ -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 all = new HashSet(); - 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); } } -} \ No newline at end of file +} diff --git a/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java b/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java index 9d93d39a8288..8553a9634ff5 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java @@ -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 methodsList = new ArrayList(); 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()]); diff --git a/java/java-tests/testSrc/com/intellij/roots/DirectoryIndexImplTest.java b/java/java-tests/testSrc/com/intellij/roots/DirectoryIndexImplTest.java index a7dc32a7cfaa..7c5fdc002d4b 100644 --- a/java/java-tests/testSrc/com/intellij/roots/DirectoryIndexImplTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/DirectoryIndexImplTest.java @@ -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 set1 = new HashSet(); - set1.addAll(Arrays.asList(expectedDirs)); + ContainerUtil.addAll(set1, expectedDirs); HashSet set2 = new HashSet(); - set2.addAll(Arrays.asList(actualDirs)); + ContainerUtil.addAll(set2, actualDirs); assertEquals(set1, set2); } } diff --git a/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java b/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java index cb964f5b21c3..6c93c225d4a2 100644 --- a/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java +++ b/java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java @@ -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(); } diff --git a/platform/bootstrap/src/com/intellij/ide/ClassloaderUtil.java b/platform/bootstrap/src/com/intellij/ide/ClassloaderUtil.java index ca799298e995..ed2577ac1e1c 100644 --- a/platform/bootstrap/src/com/intellij/ide/ClassloaderUtil.java +++ b/platform/bootstrap/src/com/intellij/ide/ClassloaderUtil.java @@ -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 { diff --git a/platform/lang-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java b/platform/lang-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java index 7cccb7aa5a32..bf62371697fa 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java @@ -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; } -} \ No newline at end of file +} diff --git a/platform/lang-api/src/com/intellij/psi/search/LocalSearchScope.java b/platform/lang-api/src/com/intellij/psi/search/LocalSearchScope.java index 79436963175e..dc86c0ce2677 100644 --- a/platform/lang-api/src/com/intellij/psi/search/LocalSearchScope.java +++ b/platform/lang-api/src/com/intellij/psi/search/LocalSearchScope.java @@ -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); diff --git a/platform/lang-api/src/com/intellij/psi/util/PsiTreeUtil.java b/platform/lang-api/src/com/intellij/psi/util/PsiTreeUtil.java index 1a839157ef20..fa6182e6679f 100644 --- a/platform/lang-api/src/com/intellij/psi/util/PsiTreeUtil.java +++ b/platform/lang-api/src/com/intellij/psi/util/PsiTreeUtil.java @@ -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 filteredElements = new ArrayList(); - 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) { diff --git a/platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java b/platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java index 6e9dd404fb05..056f2b950963 100644 --- a/platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java +++ b/platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java @@ -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'); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesModel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesModel.java index d4c77c9d89d7..bd2dc717e7e6 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesModel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesModel.java @@ -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; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionData.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionData.java index 01513ecbabce..fc8e266060f6 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionData.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionData.java @@ -121,8 +121,8 @@ public class CompletionData { }); } - public void addKeywordVariants(Set set, PsiElement position, final PsiFile file){ - set.addAll(Arrays.asList(findVariants(position, file))); + public void addKeywordVariants(Set set, PsiElement position, final PsiFile file) { + ContainerUtil.addAll(set, findVariants(position, file)); } public void completeKeywordsBySet(final Set set, Set variants, final PsiElement position, diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java index 62d4b1760b1e..b2135c4244c8 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java @@ -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); } } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupItem.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupItem.java index 821337b7d68c..2d4a3ba141f4 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupItem.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupItem.java @@ -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 extends MutableLookupElement implements Comparable } public LookupItem addLookupStrings(@NonNls final String... additionalLookupStrings) { - myAllLookupStrings.addAll(Arrays.asList(additionalLookupStrings)); + ContainerUtil.addAll(myAllLookupStrings, additionalLookupStrings); return this; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java index 6b6b196e1f5b..cf8e0a83710f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java @@ -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 list = new ArrayList(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]); } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/DescriptorProviderInspection.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/DescriptorProviderInspection.java index a6f434de965c..5c345cccc601 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/DescriptorProviderInspection.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/DescriptorProviderInspection.java @@ -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(); 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 allAvailable = new HashSet(); for (CommonProblemDescriptor[] descriptors : myOldProblemElements.values()) { if (descriptors != null) { - allAvailable.addAll(Arrays.asList(descriptors)); + ContainerUtil.addAll(allAvailable, descriptors); } } final boolean old = contains(descriptor, allAvailable); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionToolRegistrar.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionToolRegistrar.java index bf513ae44682..6ff301d55d0b 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionToolRegistrar.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionToolRegistrar.java @@ -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 providers = new THashSet(); - 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; diff --git a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineInspectionRVContentProvider.java b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineInspectionRVContentProvider.java index 21fffcea23c6..87c0cdf61fe0 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineInspectionRVContentProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineInspectionRVContentProvider.java @@ -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); } } } diff --git a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java index 9b3c4fa34f37..c25ffbe95eba 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java @@ -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 currentWindows = new HashSet(); String[] toolWindowIds = toolWindowManager.getToolWindowIds(); - currentWindows.addAll(Arrays.asList(toolWindowIds)); + ContainerUtil.addAll(currentWindows, toolWindowIds); myToolwindowIdZbuffer.retainAll(currentWindows); final String activeToolWindowId = toolWindowManager.getActiveToolWindowId(); diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java index 1a387f0ea878..93bc16681874 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java @@ -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 result = new ArrayList(); if (myLeftToolbarActions != null) { AnAction[] kids = myLeftToolbarActions.getChildren(null); - result.addAll(Arrays.asList(kids)); + ContainerUtil.addAll(result, kids); } return result; } diff --git a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java index 5a23064d7622..174a53bdfda5 100644 --- a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java +++ b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java @@ -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 shortcuts = new ArrayList(); - 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 shortcuts = new ArrayList(); - 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 shortcuts = new ArrayList(); - 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()])), diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java index 21108288998c..ad6002473a98 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java @@ -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); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java index 8670d90ba00f..cc77cad1656d 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java @@ -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 createFileTypeChooser(final GotoFileModel gotoFileModel) { List elements = new ArrayList(); - elements.addAll(Arrays.asList(FileTypeManager.getInstance().getRegisteredFileTypes())); + ContainerUtil.addAll(elements, FileTypeManager.getInstance().getRegisteredFileTypes()); Collections.sort(elements, FileTypeComparator.INSTANCE); final ElementsChooser chooser = new ElementsChooser(elements, true) { @Override @@ -304,4 +305,4 @@ public class GotoFileAction extends GotoActionBase implements DumbAware { } } } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java index 9d01929f3a17..3bf724a442ed 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java @@ -187,8 +187,8 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable { List allTabs = new ArrayList(Arrays.asList(myTemplatesList, myIncludesList, myCodeTemplatesList)); final Set factories = new THashSet(); - 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 categories = new TreeSet(new Comparator() { - public int compare(FileTemplateGroupDescriptor o1, FileTemplateGroupDescriptor o2) { - return o1.getTitle().compareTo(o2.getTitle()); - } - }); + SortedSet categories = + new TreeSet(new Comparator() { + 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() { - public FileTemplateNode fun(FileTemplateGroupDescriptor s) { - return new FileTemplateNode(s); - } - })); + return new FileTemplateNode("ROOT", null, + ContainerUtil.map2List(categories, new Function() { + public FileTemplateNode fun(FileTemplateGroupDescriptor s) { + return new FileTemplateNode(s); + } + })); } }; allTabs.add(myJ2eeTemplatesList); @@ -561,27 +563,27 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable { // Apply templates ArrayList newModifiedItems = new ArrayList(); 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(); 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(); 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(); templates = myJ2eeTemplatesList.getTemplates(); - newModifiedItems.addAll(Arrays.asList(templates)); + ContainerUtil.addAll(newModifiedItems, templates); apply(newModifiedItems, myJ2eeTemplatesList.savedTemplates, J2EE_ID, templatesManager.getAllJ2eeTemplates()); } diff --git a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java index f124f54e4491..4840cfa0d704 100644 --- a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java +++ b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java @@ -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 result = new ArrayList(); for (Module selectedModule : selectedModules) { - result.addAll(Arrays.asList(ModuleRootManager.getInstance(selectedModule).getContentRoots())); + ContainerUtil.addAll(result, ModuleRootManager.getInstance(selectedModule).getContentRoots()); } return VfsUtil.toVirtualFileArray(result); } diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java index 1fd6bb333131..cdcefe560cfe 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarModel.java @@ -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() { - public Module[] compute() { - return ModuleManager.getInstance((Project)object).getModules(); - } + ContainerUtil.addAll(result, ApplicationManager.getApplication().runReadAction( + new Computable() { + public Module[] compute() { + return ModuleManager.getInstance((Project)object).getModules(); } - ))); + } + )); } else if (object instanceof Module) { Module module = (Module)object; diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java index a3c20ee4ec22..cbcf79a9f302 100644 --- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java +++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java @@ -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 allScopes = new ArrayList(); - 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(); diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/impl/common/PsiTreeElementBase.java b/platform/lang-impl/src/com/intellij/ide/structureView/impl/common/PsiTreeElementBase.java index 87f4845486c9..7a8c4dbe7284 100644 --- a/platform/lang-impl/src/com/intellij/ide/structureView/impl/common/PsiTreeElementBase.java +++ b/platform/lang-impl/src/com/intellij/ide/structureView/impl/common/PsiTreeElementBase.java @@ -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 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()]); diff --git a/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoTreeHelper.java b/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoTreeHelper.java index 7807198aba1f..63d9c8dc697b 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoTreeHelper.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/nodes/TodoTreeHelper.java @@ -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 roots = new ArrayList(); final List sourceRoots = new ArrayList(); - 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) { diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java index 403116e9aea5..f976b779ff7d 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java @@ -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 names = new HashSet(); 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; } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/JdkScope.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/JdkScope.java index 258f50da60a3..227d5e4fff76 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/JdkScope.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/JdkScope.java @@ -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() { diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java index 7c47c75feda8..9cb591bb1ef8 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java @@ -22,6 +22,7 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.*; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -63,19 +64,19 @@ public class LibraryRuntimeClasspathScope extends GlobalSearchScope { ModuleRootManager.getInstance(module).orderEntries().recursively().process(new RootPolicy>() { public LinkedHashSet visitLibraryOrderEntry(final LibraryOrderEntry libraryOrderEntry, final LinkedHashSet value) { - value.addAll(Arrays.asList(libraryOrderEntry.getFiles(OrderRootType.CLASSES))); + ContainerUtil.addAll(value, libraryOrderEntry.getFiles(OrderRootType.CLASSES)); return value; } public LinkedHashSet visitModuleSourceOrderEntry(final ModuleSourceOrderEntry moduleSourceOrderEntry, final LinkedHashSet value) { - value.addAll(Arrays.asList(moduleSourceOrderEntry.getFiles(OrderRootType.SOURCES))); + ContainerUtil.addAll(value, moduleSourceOrderEntry.getFiles(OrderRootType.SOURCES)); return value; } public LinkedHashSet visitJdkOrderEntry(final JdkOrderEntry jdkOrderEntry, final LinkedHashSet value) { if (!myJDKProcessed.add(jdkOrderEntry.getJdk())) return value; - value.addAll(Arrays.asList(jdkOrderEntry.getFiles(OrderRootType.CLASSES))); + ContainerUtil.addAll(value, jdkOrderEntry.getFiles(OrderRootType.CLASSES)); return value; } }, myEntries); diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleRuntimeClasspathScope.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleRuntimeClasspathScope.java index a2b4f8374478..e70e7e166cf7 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleRuntimeClasspathScope.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleRuntimeClasspathScope.java @@ -20,6 +20,7 @@ import com.intellij.openapi.roots.*; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiBundle; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import java.util.Arrays; @@ -60,20 +61,20 @@ public class ModuleRuntimeClasspathScope extends GlobalSearchScope { public LinkedHashSet visitModuleSourceOrderEntry(final ModuleSourceOrderEntry moduleSourceOrderEntry, final LinkedHashSet value) { - value.addAll(Arrays.asList(moduleSourceOrderEntry.getFiles(OrderRootType.SOURCES))); + ContainerUtil.addAll(value, moduleSourceOrderEntry.getFiles(OrderRootType.SOURCES)); return value; } public LinkedHashSet visitLibraryOrderEntry(final LibraryOrderEntry libraryOrderEntry, final LinkedHashSet value) { - value.addAll(Arrays.asList(libraryOrderEntry.getFiles(OrderRootType.CLASSES))); + ContainerUtil.addAll(value, libraryOrderEntry.getFiles(OrderRootType.CLASSES)); return value; } public LinkedHashSet visitJdkOrderEntry(final JdkOrderEntry jdkOrderEntry, final LinkedHashSet value) { if (myJDKProcessed) return value; myJDKProcessed = true; - value.addAll(Arrays.asList(jdkOrderEntry.getFiles(OrderRootType.CLASSES))); + ContainerUtil.addAll(value, jdkOrderEntry.getFiles(OrderRootType.CLASSES)); return value; } }, myEntries); diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java index 788dd7ff3cd6..6ab0be7833ea 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java @@ -21,6 +21,7 @@ import com.intellij.openapi.roots.*; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiBundle; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -58,7 +59,7 @@ public class ModuleWithDependenciesScope extends GlobalSearchScope { myModules = new LinkedHashSet(); myModules.add(myModule); Module[] dependencies = ModuleRootManager.getInstance(myModule).getDependencies(myIncludeTests); - myModules.addAll(Arrays.asList(dependencies)); + ContainerUtil.addAll(myModules, dependencies); for (Module dependency : dependencies) { addExportedModules(dependency); } diff --git a/platform/lang-impl/src/com/intellij/openapi/paths/PsiDynaReference.java b/platform/lang-impl/src/com/intellij/openapi/paths/PsiDynaReference.java index 46b156bc6888..e2d040f41473 100644 --- a/platform/lang-impl/src/com/intellij/openapi/paths/PsiDynaReference.java +++ b/platform/lang-impl/src/com/intellij/openapi/paths/PsiDynaReference.java @@ -27,6 +27,7 @@ import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferen import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceOwner; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -211,7 +212,7 @@ public class PsiDynaReference extends PsiReferenceBase final ArrayList list = new ArrayList(); for (Object ref: myReferences) { if (ref instanceof LocalQuickFixProvider) { - list.addAll(Arrays.asList(((LocalQuickFixProvider)ref).getQuickFixes())); + ContainerUtil.addAll(list, ((LocalQuickFixProvider)ref).getQuickFixes()); } } return list.toArray(new LocalQuickFix[list.size()]); diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/CompositeProjectRoot.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/CompositeProjectRoot.java index 65ebc7db7e56..8ce9223922d5 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/CompositeProjectRoot.java +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/CompositeProjectRoot.java @@ -22,6 +22,7 @@ import com.intellij.openapi.util.WriteExternalException; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ArrayUtil; +import com.intellij.util.containers.ContainerUtil; import org.jdom.Element; import org.jetbrains.annotations.NotNull; @@ -48,7 +49,7 @@ class CompositeProjectRoot implements ProjectRoot { public VirtualFile[] getVirtualFiles() { List result = new ArrayList(); for (ProjectRoot root : myRoots) { - result.addAll(Arrays.asList(root.getVirtualFiles())); + ContainerUtil.addAll(result, root.getVirtualFiles()); } return VfsUtil.toVirtualFileArray(result); @@ -57,7 +58,7 @@ class CompositeProjectRoot implements ProjectRoot { public String[] getUrls() { final List result = new ArrayList(); for (ProjectRoot root : myRoots) { - result.addAll(Arrays.asList(root.getUrls())); + ContainerUtil.addAll(result, root.getUrls()); } return ArrayUtil.toStringArray(result); } diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkImpl.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkImpl.java index b58d7672ca56..39b859acae1c 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkImpl.java @@ -31,6 +31,7 @@ import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.util.ArrayUtil; +import com.intellij.util.containers.ContainerUtil; import org.jdom.Element; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -241,7 +242,7 @@ public class ProjectJdkImpl extends UserDataHolderBase implements JDOMExternaliz final ProjectRoot[] rootFiles = myRootContainer.getRoots(rootType); final ArrayList result = new ArrayList(); for (ProjectRoot rootFile : rootFiles) { - result.addAll(Arrays.asList(rootFile.getUrls())); + ContainerUtil.addAll(result, rootFile.getUrls()); } return ArrayUtil.toStringArray(result); } @@ -318,7 +319,7 @@ public class ProjectJdkImpl extends UserDataHolderBase implements JDOMExternaliz final ProjectRoot[] roots = myRootContainer.getRoots(rootType); // use getRoots() cause the data is most up-to-date there final List files = new ArrayList(roots.length); for (ProjectRoot root : roots) { - files.addAll(Arrays.asList(root.getVirtualFiles())); + ContainerUtil.addAll(files, root.getVirtualFiles()); } return VfsUtil.toVirtualFileArray(files); } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java index 109f1fbcf341..39d89a5f576e 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java @@ -56,6 +56,7 @@ import com.intellij.openapi.vfs.pointers.VirtualFilePointerListener; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.EventDispatcher; import com.intellij.util.containers.ConcurrentHashMap; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; import com.intellij.util.containers.HashSet; import com.intellij.util.messages.MessageBusConnection; @@ -280,7 +281,7 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj final Module[] modules = getModuleManager().getModules(); for (Module module : modules) { final VirtualFile[] contentRoots = ModuleRootManager.getInstance(module).getContentRoots(); - result.addAll(Arrays.asList(contentRoots)); + ContainerUtil.addAll(result, contentRoots); } return VfsUtil.toVirtualFileArray(result); } @@ -290,7 +291,7 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj final Module[] modules = getModuleManager().getModules(); for (Module module : modules) { final VirtualFile[] sourceRoots = ModuleRootManager.getInstance(module).getSourceRoots(); - result.addAll(Arrays.asList(sourceRoots)); + ContainerUtil.addAll(result, sourceRoots); } return VfsUtil.toVirtualFileArray(result); } @@ -300,7 +301,7 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj final Module[] modules = getModuleManager().getSortedModules(); for (Module module : modules) { final VirtualFile[] files = ModuleRootManager.getInstance(module).getFiles(type); - result.addAll(Arrays.asList(files)); + ContainerUtil.addAll(result, files); } return VfsUtil.toVirtualFileArray(result); } @@ -315,7 +316,7 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj final Module[] modules = getModuleManager().getSortedModules(); for (Module module : modules) { final VirtualFile[] files = ModuleRootManager.getInstance(module).getContentRoots(); - result.addAll(Arrays.asList(files)); + ContainerUtil.addAll(result, files); } result.add(myProject.getBaseDir()); return VfsUtil.toVirtualFileArray(result); diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java index 8fc6eb058f81..7f7fe69047d7 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java @@ -256,7 +256,7 @@ public class RootModelImpl implements ModifiableRootModel { final ArrayList result = new ArrayList(); for (OrderEntry orderEntry : getOrderEntries()) { - result.addAll(Arrays.asList(orderEntry.getFiles(type))); + ContainerUtil.addAll(result, orderEntry.getFiles(type)); } return ContainerUtil.toArray(result, new VirtualFile[result.size()]); } @@ -266,7 +266,7 @@ public class RootModelImpl implements ModifiableRootModel { final ArrayList result = new ArrayList(); for (OrderEntry orderEntry : getOrderEntries()) { - result.addAll(Arrays.asList(orderEntry.getUrls(type))); + ContainerUtil.addAll(result, orderEntry.getUrls(type)); } return ContainerUtil.toArray(result, new String[result.size()]); } @@ -434,7 +434,7 @@ public class RootModelImpl implements ModifiableRootModel { assertWritable(); assertValidRearrangement(newEntries); myOrderEntries.clear(); - myOrderEntries.addAll(Arrays.asList(newEntries)); + ContainerUtil.addAll(myOrderEntries, newEntries); } private void assertValidRearrangement(OrderEntry[] newEntries) { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java index 71db64c4e063..382e73aa40c6 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java @@ -40,6 +40,7 @@ import com.intellij.openapi.vfs.VirtualFileAdapter; import com.intellij.openapi.vfs.VirtualFileEvent; import com.intellij.openapi.vfs.tracker.VirtualFileTracker; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.io.fs.FileSystem; import com.intellij.util.io.fs.IFile; import com.intellij.util.messages.MessageBus; @@ -264,7 +265,7 @@ public class ClasspathStorage implements StateStorage { public static List getProviders() { final List list = new ArrayList(); list.add(new DefaultStorageProvider()); - list.addAll(Arrays.asList(Extensions.getExtensions(ClasspathStorageProvider.EXTENSION_POINT_NAME))); + ContainerUtil.addAll(list, Extensions.getExtensions(ClasspathStorageProvider.EXTENSION_POINT_NAME)); return list; } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/CompositeCacheManager.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/CompositeCacheManager.java index cc35eab4fc07..49b7ee48d519 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/CompositeCacheManager.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/CompositeCacheManager.java @@ -25,6 +25,7 @@ import com.intellij.psi.search.IndexPattern; import com.intellij.psi.search.IndexPatternProvider; import com.intellij.util.CommonProcessors; import com.intellij.util.Processor; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -57,7 +58,7 @@ public class CompositeCacheManager implements CacheManager{ public CacheUpdater[] getCacheUpdaters() { List updaters = new ArrayList(); for (CacheManager cacheManager : myManagers) { - updaters.addAll(Arrays.asList(cacheManager.getCacheUpdaters())); + ContainerUtil.addAll(updaters, cacheManager.getCacheUpdaters()); } return updaters.toArray(new CacheUpdater[updaters.size()]); } @@ -83,7 +84,7 @@ public class CompositeCacheManager implements CacheManager{ PsiFile[] items = cacheManager.getFilesWithTodoItems(); if (items.length != 0 && files == null) { files = new ArrayList(); - files.addAll(Arrays.asList(items)); + ContainerUtil.addAll(files, items); } } return files == null ? PsiFile.EMPTY_ARRAY : files.toArray(new PsiFile[files.size()]); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiMultiReference.java b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiMultiReference.java index f8b5c7f8f6bc..3927eab81cf1 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiMultiReference.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiMultiReference.java @@ -19,6 +19,7 @@ package com.intellij.psi.impl.source.resolve.reference.impl; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import org.jetbrains.annotations.NotNull; @@ -133,7 +134,7 @@ public class PsiMultiReference implements PsiPolyVariantReference { Set variants = new HashSet(); for(PsiReference ref: myReferences) { Object[] refVariants = ref.getVariants(); - variants.addAll(Arrays.asList(refVariants)); + ContainerUtil.addAll(variants, refVariants); } return variants.toArray(); } @@ -149,7 +150,7 @@ public class PsiMultiReference implements PsiPolyVariantReference { PsiElementResolveResult selfReference = null; for (PsiReference reference : refs) { if (reference instanceof PsiPolyVariantReference) { - result.addAll(Arrays.asList(((PsiPolyVariantReference)reference).multiResolve(incompleteCode))); + ContainerUtil.addAll(result, ((PsiPolyVariantReference)reference).multiResolve(incompleteCode)); } else { final PsiElement resolved = reference.resolve(); diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java index 0cb5e42d89ca..19da85e87894 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java @@ -25,6 +25,7 @@ import com.intellij.refactoring.util.MoveRenameUsageInfo; import com.intellij.usageView.UsageInfo; import com.intellij.usageView.UsageViewUtil; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.hash.HashMap; import com.intellij.util.containers.hash.HashSet; import org.jetbrains.annotations.NotNull; @@ -60,7 +61,7 @@ public abstract class ChangeSignatureProcessorBase extends BaseRefactoringProces final ChangeSignatureUsageProcessor[] processors = ChangeSignatureUsageProcessor.EP_NAME.getExtensions(); for (ChangeSignatureUsageProcessor processor : processors) { - infos.addAll(Arrays.asList(processor.findUsages(myChangeInfo))); + ContainerUtil.addAll(infos, processor.findUsages(myChangeInfo)); } infos = filterUsages(infos); return infos.toArray(new UsageInfo[infos.size()]); diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/naming/AutomaticRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/naming/AutomaticRenamer.java index 655afe2866c6..f1c73f546ebd 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/naming/AutomaticRenamer.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/naming/AutomaticRenamer.java @@ -21,6 +21,7 @@ import com.intellij.psi.PsiNamedElement; import com.intellij.refactoring.rename.RenameUtil; import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo; import com.intellij.usageView.UsageInfo; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import java.util.*; @@ -65,7 +66,7 @@ public abstract class AutomaticRenamer { for (final UsageInfo usage : usages) { if (usage instanceof UnresolvableCollisionUsageInfo) return false; } - result.addAll(Arrays.asList(usages)); + ContainerUtil.addAll(result, usages); } return true; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java index a25d7116fae3..995f4c148897 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java @@ -29,6 +29,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.*; import com.intellij.refactoring.util.CommonRefactoringUtil; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -89,7 +90,7 @@ public class SafeDeleteHandler implements RefactoringActionHandler { } } } else { - fullElementsSet.addAll(Arrays.asList(temptoDelete)); + ContainerUtil.addAll(fullElementsSet, temptoDelete); } if (!CommonRefactoringUtil.checkReadOnlyStatusRecursively(project, fullElementsSet)) return; diff --git a/platform/lang-impl/src/com/intellij/util/ui/classpath/SimpleClasspathPanel.java b/platform/lang-impl/src/com/intellij/util/ui/classpath/SimpleClasspathPanel.java index 53b5e0b1b674..71564a9bede7 100644 --- a/platform/lang-impl/src/com/intellij/util/ui/classpath/SimpleClasspathPanel.java +++ b/platform/lang-impl/src/com/intellij/util/ui/classpath/SimpleClasspathPanel.java @@ -35,6 +35,7 @@ import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.components.JBList; import com.intellij.util.Icons; import com.intellij.util.PathUtil; +import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; @@ -135,7 +136,7 @@ public class SimpleClasspathPanel extends JPanel { final THashSet result = new THashSet(); for (final Enumeration enumeration = myListModel.elements(); enumeration.hasMoreElements(); ) { final Library library = (Library)enumeration.nextElement(); - result.addAll(Arrays.asList(library.getFiles(OrderRootType.CLASSES))); + ContainerUtil.addAll(result, library.getFiles(OrderRootType.CLASSES)); } return result; } diff --git a/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java b/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java index 341ca561f258..08b873b12410 100644 --- a/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java +++ b/platform/platform-api/src/com/intellij/execution/configurations/ParametersList.java @@ -22,6 +22,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.EnvironmentUtil; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -131,7 +132,7 @@ public class ParametersList implements Cloneable{ } public void addAll(final String[] parameters) { - myParameters.addAll(Arrays.asList(parameters)); + ContainerUtil.addAll(myParameters, parameters); } public void addAll(final List parameters) { diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java index c7f6639bb911..589755218b46 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java @@ -30,6 +30,7 @@ import com.intellij.util.Alarm; import com.intellij.util.ArrayUtil; import com.intellij.util.Time; import com.intellij.util.concurrency.WorkerThread; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import com.intellij.util.enumeration.EnumerationCopy; import com.intellij.util.ui.UIUtil; @@ -3526,7 +3527,7 @@ public class AbstractTreeUi { Set toSelect = new HashSet(); myTree.clearSelection(); - toSelect.addAll(Arrays.asList(elements)); + ContainerUtil.addAll(toSelect, elements); if (addToSelection) { toSelect.addAll(currentElements); } diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/UpdaterTreeState.java b/platform/platform-api/src/com/intellij/ide/util/treeView/UpdaterTreeState.java index f90fe1534054..d3a56c0fb51d 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/UpdaterTreeState.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/UpdaterTreeState.java @@ -19,6 +19,7 @@ import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.util.Condition; import com.intellij.util.ArrayUtil; import com.intellij.util.Function; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -62,7 +63,7 @@ public class UpdaterTreeState { private Set addPaths(Object[] elements) { Set set = new HashSet(); if (elements != null) { - set.addAll(Arrays.asList(elements)); + ContainerUtil.addAll(set, elements); } return addPaths(set); @@ -221,7 +222,7 @@ public class UpdaterTreeState { boolean wasFullyRejected = false; if (toSelect.length > 0 && selected.size() > 0 && !originallySelected.containsAll(selected)) { final Set successfulSelections = new HashSet(); - successfulSelections.addAll(Arrays.asList(toSelect)); + ContainerUtil.addAll(successfulSelections, toSelect); successfulSelections.retainAll(selected); wasFullyRejected = successfulSelections.size() == 0; diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DetailsComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/DetailsComponent.java index 1fedc010c035..5af34c7b32fe 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DetailsComponent.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DetailsComponent.java @@ -21,6 +21,7 @@ import com.intellij.ui.components.panels.NonOpaquePanel; import com.intellij.ui.components.panels.Wrapper; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ArrayUtil; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -192,11 +193,11 @@ public class DetailsComponent { public void update() { ArrayList strings = new ArrayList(); if (myPrefix != null) { - strings.addAll(Arrays.asList(myPrefix)); + ContainerUtil.addAll(strings, myPrefix); } if (myText != null) { - strings.addAll(Arrays.asList(myText)); + ContainerUtil.addAll(strings, myText); } myBannerText = ArrayUtil.toStringArray(strings); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java index 57bfaf107251..68469f1ea6ef 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java @@ -21,6 +21,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -93,7 +94,7 @@ public class DialogBuilder { public void setActionDescriptors(ActionDescriptor[] descriptors) { removeAllActions(); - myActions.addAll(Arrays.asList(descriptors)); + ContainerUtil.addAll(myActions, descriptors); } public void removeAllActions() { diff --git a/platform/platform-api/src/com/intellij/ui/switcher/QuickAccessSettings.java b/platform/platform-api/src/com/intellij/ui/switcher/QuickAccessSettings.java index e0a1a65147b1..95814fd3a3dc 100644 --- a/platform/platform-api/src/com/intellij/ui/switcher/QuickAccessSettings.java +++ b/platform/platform-api/src/com/intellij/ui/switcher/QuickAccessSettings.java @@ -37,6 +37,7 @@ import com.intellij.openapi.util.registry.RegistryValueListener; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.SeparatorWithText; import com.intellij.ui.components.panels.VerticalBox; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.AwtVisitor; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; @@ -142,7 +143,7 @@ public class QuickAccessSettings implements ApplicationComponent, SearchableConf String[] vks = text.split(" "); HashSet vksSet = new HashSet(); - vksSet.addAll(Arrays.asList(vks)); + ContainerUtil.addAll(vksSet, vks); myModifierVks.clear(); int mask = getModiferMask(vksSet); myModifierVks.addAll(getModifiersVKs(mask)); diff --git a/platform/platform-impl/src/com/intellij/diagnostic/DialogAppender.java b/platform/platform-impl/src/com/intellij/diagnostic/DialogAppender.java index d27bc542ce17..de842f4a04f0 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/DialogAppender.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/DialogAppender.java @@ -19,6 +19,7 @@ import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.ErrorLogger; import com.intellij.openapi.diagnostic.IdeaLoggingEvent; +import com.intellij.util.containers.ContainerUtil; import org.apache.log4j.AppenderSkeleton; import org.apache.log4j.Priority; import org.apache.log4j.spi.LoggingEvent; @@ -48,7 +49,7 @@ public class DialogAppender extends AppenderSkeleton { Application application = ApplicationManager.getApplication(); if (application != null) { if (application.isHeadlessEnvironment() || application.isDisposed()) return; - loggers.addAll(Arrays.asList(application.getComponents(ErrorLogger.class))); + ContainerUtil.addAll(loggers, application.getComponents(ErrorLogger.class)); } appendToLoggers(event, loggers.toArray(new ErrorLogger[loggers.size()])); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ExportSettingsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ExportSettingsAction.java index c806dec90f8a..64e183d051bb 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ExportSettingsAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ExportSettingsAction.java @@ -31,6 +31,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.io.ZipUtil; import java.io.BufferedOutputStream; @@ -58,7 +59,7 @@ public class ExportSettingsAction extends AnAction implements DumbAware { Set exportFiles = new HashSet(); for (final ExportableComponent markedComponent : markedComponents) { final File[] files = markedComponent.getExportFiles(); - exportFiles.addAll(Arrays.asList(files)); + ContainerUtil.addAll(exportFiles, files); } ApplicationManager.getApplication().saveSettings(); diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/DnDEnabler.java b/platform/platform-impl/src/com/intellij/ide/dnd/DnDEnabler.java index 23a0334f13e8..f5165ef3ccc6 100644 --- a/platform/platform-impl/src/com/intellij/ide/dnd/DnDEnabler.java +++ b/platform/platform-impl/src/com/intellij/ide/dnd/DnDEnabler.java @@ -20,6 +20,7 @@ import com.intellij.ide.ui.LafManager; import com.intellij.ide.ui.LafManagerListener; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.AwtVisitor; import com.intellij.util.ui.update.Activatable; import com.intellij.util.ui.update.UiNotifyConnector; @@ -95,7 +96,7 @@ public class DnDEnabler implements Activatable, Disposable { public boolean visit(Component component) { EventListener[] mouseListeners = component.getListeners(MouseListener.class); if (mouseListeners.length > 0) { - myMouseListeners.addAll(Arrays.asList(mouseListeners)); + ContainerUtil.addAll(myMouseListeners, mouseListeners); for (EventListener each : mouseListeners) { if (each instanceof MouseDragGestureRecognizer) { myOriginalDragGestureRecognizer = (MouseListener)each; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java index 05a7b3512f6a..d10cd17f6e30 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java @@ -21,6 +21,7 @@ import com.intellij.openapi.keymap.impl.ui.Group; import com.intellij.openapi.util.Pair; import com.intellij.ui.PopupHandler; import com.intellij.ui.treeStructure.Tree; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.diff.Diff; import com.intellij.util.ui.tree.TreeUtil; import org.jetbrains.annotations.NotNull; @@ -64,47 +65,49 @@ public class CustomizationUtil { private static AnAction [] getReordableChildren(ActionGroup group, CustomActionsSchema schema, String defaultGroupName, AnActionEvent e) { - String text = group.getTemplatePresentation().getText(); - ActionManager actionManager = ActionManager.getInstance(); - final ArrayList reordableChildren = new ArrayList(); - reordableChildren.addAll(Arrays.asList(group.getChildren(e))); - final List actions = schema.getActions(); - for (Iterator iterator = actions.iterator(); iterator.hasNext();) { - ActionUrl actionUrl = iterator.next(); - if ((actionUrl.getParentGroup().equals(text) || - actionUrl.getParentGroup().equals(defaultGroupName) || - actionUrl.getParentGroup().equals(actionManager.getId(group))) ) { - AnAction componentAction = actionUrl.getComponentAction(); - if (componentAction != null) { - if (actionUrl.getActionType() == ActionUrl.ADDED) { - if (reordableChildren.size() > actionUrl.getAbsolutePosition()){ - reordableChildren.add(actionUrl.getAbsolutePosition(), componentAction); - } else { - reordableChildren.add(componentAction); - } - } - else if (actionUrl.getActionType() == ActionUrl.DELETED && reordableChildren.size() > actionUrl.getAbsolutePosition()) { - final AnAction anAction = reordableChildren.get(actionUrl.getAbsolutePosition()); - if (anAction.getTemplatePresentation().getText() == null - ? (componentAction.getTemplatePresentation().getText() != null && componentAction.getTemplatePresentation().getText().length() > 0) - : !anAction.getTemplatePresentation().getText().equals(componentAction.getTemplatePresentation().getText())) { - continue; - } - reordableChildren.remove(actionUrl.getAbsolutePosition()); - } - } - } - } - for (int i = 0; i < reordableChildren.size(); i++) { - if (reordableChildren.get(i) instanceof ActionGroup) { - final ActionGroup groupToCorrect = (ActionGroup)reordableChildren.get(i); - final AnAction correctedAction = correctActionGroup(groupToCorrect, schema, ""); - reordableChildren.set(i, correctedAction); - } - } + String text = group.getTemplatePresentation().getText(); + ActionManager actionManager = ActionManager.getInstance(); + final ArrayList reordableChildren = new ArrayList(); + ContainerUtil.addAll(reordableChildren, group.getChildren(e)); + final List actions = schema.getActions(); + for (Iterator iterator = actions.iterator(); iterator.hasNext();) { + ActionUrl actionUrl = iterator.next(); + if ((actionUrl.getParentGroup().equals(text) || + actionUrl.getParentGroup().equals(defaultGroupName) || + actionUrl.getParentGroup().equals(actionManager.getId(group)))) { + AnAction componentAction = actionUrl.getComponentAction(); + if (componentAction != null) { + if (actionUrl.getActionType() == ActionUrl.ADDED) { + if (reordableChildren.size() > actionUrl.getAbsolutePosition()) { + reordableChildren.add(actionUrl.getAbsolutePosition(), componentAction); + } + else { + reordableChildren.add(componentAction); + } + } + else if (actionUrl.getActionType() == ActionUrl.DELETED && reordableChildren.size() > actionUrl.getAbsolutePosition()) { + final AnAction anAction = reordableChildren.get(actionUrl.getAbsolutePosition()); + if (anAction.getTemplatePresentation().getText() == null + ? (componentAction.getTemplatePresentation().getText() != null && + componentAction.getTemplatePresentation().getText().length() > 0) + : !anAction.getTemplatePresentation().getText().equals(componentAction.getTemplatePresentation().getText())) { + continue; + } + reordableChildren.remove(actionUrl.getAbsolutePosition()); + } + } + } + } + for (int i = 0; i < reordableChildren.size(); i++) { + if (reordableChildren.get(i) instanceof ActionGroup) { + final ActionGroup groupToCorrect = (ActionGroup)reordableChildren.get(i); + final AnAction correctedAction = correctActionGroup(groupToCorrect, schema, ""); + reordableChildren.set(i, correctedAction); + } + } - return reordableChildren.toArray(new AnAction[reordableChildren.size()]); - } + return reordableChildren.toArray(new AnAction[reordableChildren.size()]); + } private static class CachedAction extends ActionGroup { private boolean myForceUpdate; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java index a38d00bdb137..5d21a20cd18c 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java @@ -31,6 +31,7 @@ import com.intellij.ui.*; import com.intellij.ui.components.JBList; import com.intellij.util.Alarm; import com.intellij.util.Consumer; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -659,7 +660,7 @@ public class SearchUtil { public static List expandGroup(final ConfigurableGroup group) { final Configurable[] configurables = group.getConfigurables(); ArrayList result = new ArrayList(); - result.addAll(Arrays.asList(configurables)); + ContainerUtil.addAll(result, configurables); for (Configurable each : configurables) { addChildren(each, result); } diff --git a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java index 6f18ae4accee..ca968e0d4dfc 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java @@ -28,6 +28,7 @@ import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ResourceUtil; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.StringInterner; import gnu.trove.THashMap; import gnu.trove.THashSet; @@ -73,7 +74,7 @@ public class SearchableOptionsRegistrarImpl extends SearchableOptionsRegistrar { //stop words final String text = ResourceUtil.loadText(ResourceUtil.getResource(SearchableOptionsRegistrarImpl.class, "/search/", "ignore.txt")); final String[] stopWords = text.split("[\\W]"); - myStopWords.addAll(Arrays.asList(stopWords)); + ContainerUtil.addAll(myStopWords, stopWords); //index Document document = diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java index f429cbcbcc93..5c1eed0ba99d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java @@ -159,7 +159,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark if (nearestMarkSpots.isEmpty()) return false; Set highlighters = new THashSet(nearestMarkSpots.size() + 4); for (MarkSpot markSpot : nearestMarkSpots) { - highlighters.addAll(Arrays.asList(markSpot.highlighters)); + ContainerUtil.addAll(highlighters, markSpot.highlighters); } TooltipRenderer bigRenderer = myTooltipRendererProvider.calcTooltipRenderer(highlighters); if (bigRenderer != null) { diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java index 312de2a367a9..3780227dd82f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java @@ -34,6 +34,7 @@ import com.intellij.ui.tabs.JBTabs; import com.intellij.util.Alarm; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ArrayListSet; +import com.intellij.util.containers.ContainerUtil; import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -521,7 +522,7 @@ public final class EditorsSplitters extends JPanel { for (final EditorWindow myWindow : myWindows) { final EditorWithProviderComposite[] editors = myWindow.getEditors(); - res.addAll(Arrays.asList(editors)); + ContainerUtil.addAll(res, editors); } return res.toArray(new EditorWithProviderComposite[res.size()]); } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java index d3a690c854d6..06493cbc0f5d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java @@ -695,12 +695,13 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec public void run() { VirtualFile file = descriptor.getFile(); final FileEditor[] editors = openFile(file, focusEditor); - result.addAll(Arrays.asList(editors)); + ContainerUtil.addAll(result, editors); boolean navigated = false; for (final FileEditor editor : editors) { - if (editor instanceof NavigatableFileEditor && getSelectedEditor(descriptor.getFile()) == editor) { // try to navigate opened editor - navigated = navigateAndSelectEditor((NavigatableFileEditor) editor, descriptor); + if (editor instanceof NavigatableFileEditor && + getSelectedEditor(descriptor.getFile()) == editor) { // try to navigate opened editor + navigated = navigateAndSelectEditor((NavigatableFileEditor)editor, descriptor); if (navigated) break; } } @@ -708,7 +709,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec if (!navigated) { for (final FileEditor editor : editors) { if (editor instanceof NavigatableFileEditor && getSelectedEditor(descriptor.getFile()) != editor) { // try other editors - if (navigateAndSelectEditor((NavigatableFileEditor) editor, descriptor)) { + if (navigateAndSelectEditor((NavigatableFileEditor)editor, descriptor)) { break; } } @@ -882,7 +883,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec List editorComposites = getEditorComposites(file); List editors = new ArrayList(); for (EditorWithProviderComposite composite : editorComposites) { - editors.addAll(Arrays.asList(composite.getEditors())); + ContainerUtil.addAll(editors, composite.getEditors()); } return editors.toArray(new FileEditor[editors.size()]); } @@ -908,7 +909,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec final EditorWithProviderComposite[] editorsComposites = getSplitters().getEditorsComposites(); for (EditorWithProviderComposite editorsComposite : editorsComposites) { final FileEditor[] editors = editorsComposite.getEditors(); - result.addAll(Arrays.asList(editors)); + ContainerUtil.addAll(result, editors); } return result.toArray(new FileEditor[result.size()]); } diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java index 1991b02eb89e..70d3745a00b9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java @@ -217,7 +217,7 @@ public class KeymapImpl implements Keymap, ExternalizableScheme { // copy parent shortcuts for this actionId Shortcut[] shortcuts = getParentShortcuts(actionId); // shortcuts are immutables - list.addAll(Arrays.asList(shortcuts)); + ContainerUtil.addAll(list, shortcuts); } } list.add(shortcut); @@ -829,7 +829,7 @@ public class KeymapImpl implements Keymap, ExternalizableScheme { ArrayList ids = new ArrayList(); if (myParent != null) { String[] parentIds = getParentActionIds(); - ids.addAll(Arrays.asList(parentIds)); + ContainerUtil.addAll(ids, parentIds); } String[] ownActionIds = getOwnActionIds(); for (String id : ownActionIds) { diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java index 9cadef712ded..c8ff36fcf9ad 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java @@ -17,6 +17,7 @@ package com.intellij.openapi.options.ex; import com.intellij.openapi.options.*; import com.intellij.openapi.project.Project; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -88,8 +89,8 @@ public class ProjectConfigurablesGroup implements ConfigurableGroup { static List buildConfigurablesList(final Configurable[] extensions, final Configurable[] components, ConfigurableFilter filter) { List result = new ArrayList(); - result.addAll(Arrays.asList(extensions)); - result.addAll(Arrays.asList(components)); + ContainerUtil.addAll(result, extensions); + ContainerUtil.addAll(result, components); final Iterator iterator = result.iterator(); while (iterator.hasNext()) { diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java index c1645cdf3f26..c60c6767f431 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java @@ -28,6 +28,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ListUtil; import com.intellij.util.ArrayUtil; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.MappingListCellRenderer; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -126,7 +127,7 @@ public class UpdateSettingsConfigurable extends BaseConfigurable implements Sear } final String pluginHosts = System.getProperty("idea.plugin.hosts"); if (pluginHosts != null) { - hosts.addAll(Arrays.asList(pluginHosts.split(";"))); + ContainerUtil.addAll(hosts, pluginHosts.split(";")); } return hosts; } diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFS.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFS.java index 77a057d2a792..827ced1fc840 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFS.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFS.java @@ -159,8 +159,8 @@ public class PersistentFS extends ManagingFS implements ApplicationComponent { } else { Set allNamesSet = new LinkedHashSet((currentNames.length + delegateNames.length) * 2); - allNamesSet.addAll(Arrays.asList(currentNames)); - allNamesSet.addAll(Arrays.asList(delegateNames)); + ContainerUtil.addAll(allNamesSet, currentNames); + ContainerUtil.addAll(allNamesSet, delegateNames); names = ArrayUtil.toStringArray(allNamesSet); } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java index 0ff89fa00856..7b32bd5772ba 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java @@ -43,6 +43,7 @@ import com.intellij.openapi.wm.impl.status.IdeStatusBarImpl; import com.intellij.openapi.wm.impl.status.MemoryUsagePanel; import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeScreen; import com.intellij.ui.PopupHandler; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -275,7 +276,7 @@ public class IdeRootPane extends JRootPane implements UISettingsListener { } public void installNorthComponents(final Project project) { - myNorthComponents.addAll(Arrays.asList(Extensions.getExtensions(IdeRootPaneNorthExtension.EP_NAME, project))); + ContainerUtil.addAll(myNorthComponents, Extensions.getExtensions(IdeRootPaneNorthExtension.EP_NAME, project)); for (IdeRootPaneNorthExtension northComponent : myNorthComponents) { myNorthPanel.add(northComponent.getComponent()); northComponent.uiSettingsChanged(myUISettings); diff --git a/platform/testFramework/src/com/intellij/testFramework/TreePrintCondition.java b/platform/testFramework/src/com/intellij/testFramework/TreePrintCondition.java index 40e9298520e1..429a554833a5 100644 --- a/platform/testFramework/src/com/intellij/testFramework/TreePrintCondition.java +++ b/platform/testFramework/src/com/intellij/testFramework/TreePrintCondition.java @@ -16,6 +16,7 @@ package com.intellij.testFramework; import com.intellij.openapi.util.Condition; +import com.intellij.util.containers.ContainerUtil; import java.util.Arrays; import java.util.HashSet; @@ -28,7 +29,7 @@ public abstract class TreePrintCondition implements Condition { protected Set mySet = new HashSet(); public SetBased(String... elements) { - mySet.addAll(Arrays.asList(elements)); + ContainerUtil.addAll(mySet, elements); } } diff --git a/platform/usageView/src/com/intellij/usages/impl/ImportUsageFilteringRuleProvider.java b/platform/usageView/src/com/intellij/usages/impl/ImportUsageFilteringRuleProvider.java index 3920bdf28cff..04cfd85f5a11 100644 --- a/platform/usageView/src/com/intellij/usages/impl/ImportUsageFilteringRuleProvider.java +++ b/platform/usageView/src/com/intellij/usages/impl/ImportUsageFilteringRuleProvider.java @@ -26,6 +26,7 @@ import com.intellij.usages.rules.ImportFilteringRule; import com.intellij.usages.UsageView; import com.intellij.usages.rules.UsageFilteringRule; import com.intellij.usages.rules.UsageFilteringRuleProvider; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -43,7 +44,7 @@ public class ImportUsageFilteringRuleProvider implements UsageFilteringRuleProvi public UsageFilteringRule[] getActiveRules(@NotNull final Project project) { final List rules = new ArrayList(); if (!ImportFilteringUsageViewSetting.getInstance().SHOW_IMPORTS) { - rules.addAll(Arrays.asList(Extensions.getExtensions(ImportFilteringRule.EP_NAME))); + ContainerUtil.addAll(rules, Extensions.getExtensions(ImportFilteringRule.EP_NAME)); } return rules.toArray(new UsageFilteringRule[rules.size()]); } diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java index dc533ee43773..d6b6903e98c2 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java @@ -51,6 +51,7 @@ import com.intellij.util.Alarm; import com.intellij.util.EditSourceOnDoubleClickHandler; import com.intellij.util.Processor; import com.intellij.util.containers.ConcurrentHashSet; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.messages.MessageBusConnection; import com.intellij.util.ui.DialogUtil; import com.intellij.util.ui.UIUtil; @@ -253,7 +254,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra final UsageFilteringRuleProvider[] providers = Extensions.getExtensions(UsageFilteringRuleProvider.EP_NAME); List list = new ArrayList(providers.length); for (UsageFilteringRuleProvider provider : providers) { - list.addAll(Arrays.asList(provider.getActiveRules(project))); + ContainerUtil.addAll(list, provider.getActiveRules(project)); } return list.toArray(new UsageFilteringRule[list.size()]); } @@ -262,7 +263,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra final UsageGroupingRuleProvider[] providers = Extensions.getExtensions(UsageGroupingRuleProvider.EP_NAME); List list = new ArrayList(providers.length); for (UsageGroupingRuleProvider provider : providers) { - list.addAll(Arrays.asList(provider.getActiveRules(project))); + ContainerUtil.addAll(list, provider.getActiveRules(project)); } Collections.sort(list, new Comparator() { @@ -448,7 +449,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra final UsageGroupingRuleProvider[] providers = Extensions.getExtensions(UsageGroupingRuleProvider.EP_NAME); List list = new ArrayList(providers.length); for (UsageGroupingRuleProvider provider : providers) { - list.addAll(Arrays.asList(provider.createGroupingActions(this))); + ContainerUtil.addAll(list, provider.createGroupingActions(this)); } return list.toArray(new AnAction[list.size()]); } @@ -900,13 +901,13 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra if (usage instanceof UsageInFiles) { UsageInFiles usageInFiles = (UsageInFiles)usage; - result.addAll(Arrays.asList(usageInFiles.getFiles())); + ContainerUtil.addAll(result, usageInFiles.getFiles()); } } for (UsageTarget target : myTargets) { VirtualFile[] files = target.getFiles(); if (files == null) continue; - result.addAll(Arrays.asList(files)); + ContainerUtil.addAll(result, files); } return result; } @@ -1168,7 +1169,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra } if (usage instanceof UsageInFiles) { - result.addAll(Arrays.asList(((UsageInFiles)usage).getFiles())); + ContainerUtil.addAll(result, ((UsageInFiles)usage).getFiles()); } } } @@ -1179,7 +1180,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra if (usageTarget.isValid()) { final VirtualFile[] files = usageTarget.getFiles(); if (files != null) { - result.addAll(Arrays.asList(files)); + ContainerUtil.addAll(result, files); } } } diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java index 237287c9bf1f..660e29a741cd 100644 --- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java @@ -23,6 +23,7 @@ import com.intellij.openapi.util.ShutDownTracker; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Processor; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.io.URLUtil; import org.intellij.lang.annotations.RegExp; import org.jetbrains.annotations.NonNls; @@ -1023,7 +1024,7 @@ public class FileUtil { if (file.isDirectory()) { final File[] children = file.listFiles(); if (children != null) { - queue.addAll(Arrays.asList(children)); + ContainerUtil.addAll(queue, children); } } } diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index 784c11060dff..99c8b10ffd4d 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -422,17 +422,24 @@ public class ContainerUtil { list.set(index2, e1); } - public static ArrayList collect(Iterator iterator, FilteringIterator.InstanceOf instanceOf) { - return collect(FilteringIterator.create(iterator, instanceOf)); + public static ArrayList collect(@NotNull Iterator iterator, @NotNull FilteringIterator.InstanceOf instanceOf) { + return collect(FilteringIterator.create((Iterator)iterator, instanceOf)); } - public static void addAll(Collection collection, Enumeration enumeration) { + public static void addAll(@NotNull Collection collection, @NotNull Enumeration enumeration) { while (enumeration.hasMoreElements()) { T element = enumeration.nextElement(); collection.add(element); } } + public static void addAll(@NotNull Collection collection, @NotNull T... elements) { + //noinspection ManualArrayToCollectionCopy + for (T element : elements) { + collection.add(element); + } + } + public static U findInstance(Iterable iterable, Class aClass) { return findInstance(iterable.iterator(), aClass); } diff --git a/platform/util/src/com/intellij/util/containers/FilteringIterator.java b/platform/util/src/com/intellij/util/containers/FilteringIterator.java index a89d66f67d56..cba282ca88b7 100644 --- a/platform/util/src/com/intellij/util/containers/FilteringIterator.java +++ b/platform/util/src/com/intellij/util/containers/FilteringIterator.java @@ -111,7 +111,7 @@ public class FilteringIterator implements Iterator { } public static Iterator createInstanceOf(Iterator iterator, Class aClass) { - return create(iterator, instanceOf(aClass)); + return create((Iterator)iterator, instanceOf(aClass)); } public static class InstanceOf implements Condition { diff --git a/platform/util/src/com/intellij/util/io/zip/ReorderJarsMain.java b/platform/util/src/com/intellij/util/io/zip/ReorderJarsMain.java index 7acb1acb23ba..9df7a6854fdb 100644 --- a/platform/util/src/com/intellij/util/io/zip/ReorderJarsMain.java +++ b/platform/util/src/com/intellij/util/io/zip/ReorderJarsMain.java @@ -22,6 +22,7 @@ package com.intellij.util.io.zip; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; import java.io.File; @@ -90,7 +91,7 @@ public class ReorderJarsMain { private static Set loadIgnoredJars(String libPath) throws IOException { final File ignoredJarsFile = new File(libPath, "required_for_dist.txt"); final Set ignoredJars = new HashSet(); - ignoredJars.addAll(Arrays.asList(new String(FileUtil.loadFileText(ignoredJarsFile)).split("\r\n"))); + ContainerUtil.addAll(ignoredJars, new String(FileUtil.loadFileText(ignoredJarsFile)).split("\r\n")); return ignoredJars; } @@ -113,4 +114,4 @@ public class ReorderJarsMain { return entriesOrder; } -} \ No newline at end of file +} diff --git a/platform/util/src/com/intellij/util/xmlb/PropertyAccessor.java b/platform/util/src/com/intellij/util/xmlb/PropertyAccessor.java index 120795956c94..2f49e21998f3 100644 --- a/platform/util/src/com/intellij/util/xmlb/PropertyAccessor.java +++ b/platform/util/src/com/intellij/util/xmlb/PropertyAccessor.java @@ -16,6 +16,7 @@ package com.intellij.util.xmlb; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import java.beans.PropertyDescriptor; @@ -63,11 +64,11 @@ class PropertyAccessor implements Accessor { List result = new ArrayList(); if (myPropertyDescriptor.getReadMethod() != null) { - result.addAll(Arrays.asList(myPropertyDescriptor.getReadMethod().getAnnotations())); + ContainerUtil.addAll(result, myPropertyDescriptor.getReadMethod().getAnnotations()); } if (myPropertyDescriptor.getWriteMethod() != null) { - result.addAll(Arrays.asList(myPropertyDescriptor.getWriteMethod().getAnnotations())); + ContainerUtil.addAll(result, myPropertyDescriptor.getWriteMethod().getAnnotations()); } return result.toArray(new Annotation[result.size()]); diff --git a/platform/util/src/com/intellij/util/xmlb/TagBinding.java b/platform/util/src/com/intellij/util/xmlb/TagBinding.java index 0fe20a815db2..dfa08a67fe9f 100644 --- a/platform/util/src/com/intellij/util/xmlb/TagBinding.java +++ b/platform/util/src/com/intellij/util/xmlb/TagBinding.java @@ -17,6 +17,7 @@ package com.intellij.util.xmlb; import com.intellij.openapi.util.JDOMUtil; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xmlb.annotations.Tag; import com.intellij.util.ArrayUtil; import org.jdom.Element; @@ -64,7 +65,7 @@ class TagBinding implements Binding { List childrenList = new ArrayList(); for (Object node : nodes) { assert ((Element)node).getName().equals(name); - childrenList.addAll(Arrays.asList(JDOMUtil.getContent((Element)node))); + ContainerUtil.addAll(childrenList, JDOMUtil.getContent((Element)node)); } children = ArrayUtil.toObjectArray(childrenList); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RootsCalculator.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RootsCalculator.java index c8ab525847fd..6980065ba41d 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RootsCalculator.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RootsCalculator.java @@ -21,6 +21,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.vcs.*; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.containers.ContainerUtil; import java.util.*; @@ -49,26 +50,29 @@ public class RootsCalculator { if (myVcs.equals(myPlManager.getVcsFor(myProject.getBaseDir()))) { roots.add(myProject.getBaseDir()); } - } else { + } + else { VirtualFile newFile = LocalFileSystem.getInstance().findFileByPath(mapping.getDirectory()); if (newFile == null) { newFile = LocalFileSystem.getInstance().refreshAndFindFileByPath(mapping.getDirectory()); } if (newFile != null) { roots.add(newFile); - } else { + } + else { LOG.info("Can not file virtual file for root: " + mapping.getDirectory()); } } } - roots.addAll(Arrays.asList(myContentRoots)); + ContainerUtil.addAll(roots, myContentRoots); final Map result = new HashMap(); for (Iterator iterator = roots.iterator(); iterator.hasNext();) { final VirtualFile vf = iterator.next(); final RepositoryLocation location = myLocationCache.getLocation(myVcs, new FilePathImpl(vf), false); if (location != null) { result.put(vf, location); - } else { + } + else { iterator.remove(); } } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcesor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcesor.java index 9d563b3d0370..2d552793b0c3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcesor.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcesor.java @@ -22,6 +22,7 @@ import com.intellij.openapi.components.RoamingType; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.options.StreamProvider; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.util.containers.ContainerUtil; import java.io.*; import java.util.*; @@ -96,7 +97,7 @@ public class CompoundShelfFileProcesor { for (StreamProvider serverStreamProvider : myServerStreamProviders) { if (serverStreamProvider.isEnabled()) { String[] subFiles = serverStreamProvider.listSubFiles(FILE_SPEC); - result.addAll(Arrays.asList(subFiles)); + ContainerUtil.addAll(result, subFiles); } } return new ArrayList(result); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java index 51cc15f71306..6fe1ab181cff 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java @@ -48,6 +48,7 @@ import com.intellij.ui.*; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentFactory; import com.intellij.ui.treeStructure.Tree; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.Convertor; import com.intellij.util.messages.MessageBus; import com.intellij.util.ui.tree.TreeUtil; @@ -452,10 +453,10 @@ public class ShelvedChangesViewManager implements ProjectComponent { final List shelvedChangeLists = (shelved == null && recycled == null) ? Collections.emptyList() : new ArrayList(); if (shelved != null) { - shelvedChangeLists.addAll(Arrays.asList(shelved)); + ContainerUtil.addAll(shelvedChangeLists, shelved); } if (recycled != null) { - shelvedChangeLists.addAll(Arrays.asList(recycled)); + ContainerUtil.addAll(shelvedChangeLists, recycled); } return shelvedChangeLists; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java index a667f4d6f5d1..97d2ae73e0f3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java @@ -19,6 +19,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiLiteralExpression; import com.intellij.psi.PsiMethodCallExpression; import com.intellij.psi.PsiType; +import com.intellij.util.containers.ContainerUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -100,7 +101,7 @@ public class HardcodedFileSeparatorsInspection extends BaseInspection { */ private static final Set timeZoneIds = new HashSet(); static { - timeZoneIds.addAll(Arrays.asList(TimeZone.getAvailableIDs())); + ContainerUtil.addAll(timeZoneIds, TimeZone.getAvailableIDs()); } /** @@ -310,4 +311,4 @@ public class HardcodedFileSeparatorsInspection extends BaseInspection { return timeZoneIds.contains(string); } } -} \ No newline at end of file +} diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JDBCResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JDBCResourceInspection.java index 268eef5c4d73..5841cd2ff2be 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JDBCResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/JDBCResourceInspection.java @@ -16,6 +16,7 @@ package com.siyeh.ig.resources; import com.intellij.psi.*; +import com.intellij.util.containers.ContainerUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspectionVisitor; import org.jetbrains.annotations.NonNls; @@ -58,8 +59,8 @@ public class JDBCResourceInspection extends ResourceInspection{ private static final Set creationMethodNameSet = new HashSet(9); - static{ - creationMethodNameSet.addAll(Arrays.asList(creationMethodName)); + static { + ContainerUtil.addAll(creationMethodNameSet, creationMethodName); } @NotNull @@ -143,4 +144,4 @@ public class JDBCResourceInspection extends ResourceInspection{ return false; } } -} \ No newline at end of file +} diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/ui/ListWrappingTableModel.java b/plugins/InspectionGadgets/src/com/siyeh/ig/ui/ListWrappingTableModel.java index b929557e4cb9..e030f816c680 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/ui/ListWrappingTableModel.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/ui/ListWrappingTableModel.java @@ -15,6 +15,8 @@ */ package com.siyeh.ig.ui; +import com.intellij.util.containers.ContainerUtil; + import javax.swing.table.AbstractTableModel; import java.util.ArrayList; import java.util.Arrays; @@ -27,14 +29,14 @@ public class ListWrappingTableModel extends AbstractTableModel { public ListWrappingTableModel(List> list, String... columnNames) { - if (list == null) { - throw new NullPointerException("list"); - } - if (columnNames == null) { - throw new NullPointerException("columnNames"); - } - this.list = list; - this.columnNames.addAll(Arrays.asList(columnNames)); + if (list == null) { + throw new NullPointerException("list"); + } + if (columnNames == null) { + throw new NullPointerException("columnNames"); + } + this.list = list; + ContainerUtil.addAll(this.columnNames, columnNames); } /** @@ -124,4 +126,4 @@ public class ListWrappingTableModel extends AbstractTableModel { public void setValueAt(Object value, int rowIndex, int columnIndex) { list.get(columnIndex).set(rowIndex, String.valueOf(value)); } -} \ No newline at end of file +} diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java index 31feef9eda9d..372f74e4cea1 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java @@ -298,7 +298,7 @@ public class JavaLanguageInjectionSupport extends AbstractLanguageInjectionSuppo return method; } else { - methods.addAll(Arrays.asList(method.findSuperMethods())); + ContainerUtil.addAll(methods, method.findSuperMethods()); } } return null; @@ -342,7 +342,7 @@ public class JavaLanguageInjectionSupport extends AbstractLanguageInjectionSuppo new ConcatenationInjector.InjectionProcessor(configuration, host) { @Override protected boolean processAnnotationInjections(PsiModifierListOwner annoElement) { - annotations.addAll(Arrays.asList(AnnotationUtilEx.getAnnotationFrom(annoElement, configuration.getLanguageAnnotationPair(), true))); + ContainerUtil.addAll(annotations, AnnotationUtilEx.getAnnotationFrom(annoElement, configuration.getLanguageAnnotationPair(), true)); return true; } diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotationUtilEx.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotationUtilEx.java index 8625c5109516..0f6264e6ddf3 100644 --- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotationUtilEx.java +++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotationUtilEx.java @@ -23,6 +23,7 @@ import com.intellij.psi.search.searches.SuperMethodsSearch; import com.intellij.psi.util.MethodSignatureBackedByPsiMethod; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.Processor; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -284,13 +285,13 @@ public class AnnotationUtilEx { } }; if (listOwner instanceof PsiMethod) { - all.addAll(Arrays.asList(modifierList.getAnnotations())); + ContainerUtil.addAll(all, modifierList.getAnnotations()); SuperMethodsSearch.search((PsiMethod)listOwner, null, true, true).forEach(new Processor() { - public boolean process(final MethodSignatureBackedByPsiMethod superMethod) { - all.addAll(Arrays.asList(superMethod.getMethod().getModifierList().getAnnotations())); - return true; - } - }); + public boolean process(final MethodSignatureBackedByPsiMethod superMethod) { + ContainerUtil.addAll(all, superMethod.getMethod().getModifierList().getAnnotations()); + return true; + } + }); return all.toArray(new PsiAnnotation[all.size()]); } if (listOwner instanceof PsiParameter) { @@ -300,13 +301,13 @@ public class AnnotationUtilEx { if (declarationScope instanceof PsiMethod && parameter.getParent() == (parameterList = ((PsiMethod)declarationScope).getParameterList())) { PsiMethod method = (PsiMethod)declarationScope; final int parameterIndex = parameterList.getParameterIndex(parameter); - all.addAll(Arrays.asList(modifierList.getAnnotations())); + ContainerUtil.addAll(all, modifierList.getAnnotations()); SuperMethodsSearch.search(method, null, true, true).forEach(new Processor() { public boolean process(final MethodSignatureBackedByPsiMethod superMethod) { PsiParameter superParameter = superMethod.getMethod().getParameterList().getParameters()[parameterIndex]; PsiModifierList modifierList = superParameter.getModifierList(); if (modifierList != null) { - all.addAll(Arrays.asList(modifierList.getAnnotations())); + ContainerUtil.addAll(all, modifierList.getAnnotations()); } return true; } diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java index 7d246d1eea3e..5cbdb6d68d7e 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java @@ -130,9 +130,10 @@ public class InjectionsSettingsUI implements Configurable { } }; for (LanguageInjectionSupport support : InjectorUtils.getActiveInjectionSupports()) { - myAddActions.addAll(Arrays.asList(support.createAddActions(myProject, consumer))); + ContainerUtil.addAll(myAddActions, support.createAddActions(myProject, consumer)); final AnAction action = support.createEditAction(myProject, producer); - myEditActions.put(support.getId(), action == null? AbstractLanguageInjectionSupport.createDefaultEditAction(myProject, producer) : action); + myEditActions + .put(support.getId(), action == null ? AbstractLanguageInjectionSupport.createDefaultEditAction(myProject, producer) : action); mySupports.put(support.getId(), support); } Collections.sort(myAddActions, new Comparator() { diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/SettingsUI.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/SettingsUI.java index 1f8154389f56..ddfebbc5a8e4 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/SettingsUI.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/SettingsUI.java @@ -21,6 +21,7 @@ import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; +import com.intellij.util.containers.ContainerUtil; import org.intellij.plugins.intelliLang.inject.LanguageInjectionSupport; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -49,7 +50,7 @@ class SettingsUI { final ArrayList configurables = new ArrayList(); for (LanguageInjectionSupport support : Extensions.getExtensions(LanguageInjectionSupport.EP_NAME)) { - configurables.addAll(Arrays.asList(support.createSettings(project, configuration))); + ContainerUtil.addAll(configurables, support.createSettings(project, configuration)); } Collections.sort(configurables, new Comparator() { public int compare(final Configurable o1, final Configurable o2) { diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntCommandLineBuilder.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntCommandLineBuilder.java index 56c7d5ba7e40..cc537f54cb5c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntCommandLineBuilder.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntCommandLineBuilder.java @@ -34,6 +34,7 @@ import com.intellij.rt.ant.execution.IdeaInputHandler; import com.intellij.util.ArrayUtil; import com.intellij.util.PathUtil; import com.intellij.util.config.AbstractProperty; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import java.io.File; @@ -173,7 +174,7 @@ public class AntCommandLineBuilder { } public void addTargets(String[] targets) { - myTargets.addAll(Arrays.asList(targets)); + ContainerUtil.addAll(myTargets, targets); } public String[] getTargets() { diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java index 13855996e54f..d77589d95ead 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java @@ -52,6 +52,7 @@ import com.intellij.ui.*; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ArrayUtil; import com.intellij.util.StringBuilderSpinAllocator; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.tree.TreeUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -313,7 +314,7 @@ public class AntExplorer extends SimpleToolWindowPanel implements DataProvider { } final AntBuildTarget target = ((AntTargetNodeDescriptor)userObject).getTarget(); if (target instanceof MetaTarget) { - targets.addAll(Arrays.asList(((MetaTarget)target).getTargetNames())); + ContainerUtil.addAll(targets, ((MetaTarget)target).getTargetNames()); } else { targets.add(target.getName()); diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AllJarsUnderDirEntry.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AllJarsUnderDirEntry.java index 1d2001e994be..4cb95eb5f5c4 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AllJarsUnderDirEntry.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AllJarsUnderDirEntry.java @@ -70,7 +70,7 @@ public class AllJarsUnderDirEntry implements AntClasspathEntry { return pathname.getName().endsWith(JAR_SUFFIX) && pathname.isFile(); } }); - if (children != null) files.addAll(Arrays.asList(children)); + if (children != null) ContainerUtil.addAll(files, children); } public CompositeAppearance getAppearance() { diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntMultiPathStringConverter.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntMultiPathStringConverter.java index ed84459f4a6b..2cd6342c6c02 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/AntMultiPathStringConverter.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntMultiPathStringConverter.java @@ -25,6 +25,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFileSystemItem; import com.intellij.psi.PsiManager; import com.intellij.psi.PsiReference; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xml.*; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -124,7 +125,7 @@ public class AntMultiPathStringConverter extends Converter 0) { final AntDomFileReferenceSet refSet = new AntDomFileReferenceSet(attributeValue, path, pair.getSecond()); - result.addAll(Arrays.asList(refSet.getAllReferences())); + ContainerUtil.addAll(result, refSet.getAllReferences()); } } diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntElementImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntElementImpl.java index 8b2964905a65..a023784ba03a 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntElementImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntElementImpl.java @@ -31,12 +31,12 @@ import com.intellij.psi.*; import com.intellij.psi.xml.XmlElement; import com.intellij.util.ProcessingContext; import com.intellij.util.StringBuilderSpinAllocator; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; -import java.util.Arrays; import java.util.List; public class AntElementImpl extends MetadataPsiElementBase implements AntElement { @@ -249,7 +249,7 @@ public class AntElementImpl extends MetadataPsiElementBase implements AntElement final List result = PsiReferenceListSpinAllocator.alloc(); try { for (final PsiReferenceProvider provider : providers) { - result.addAll(Arrays.asList(provider.getReferencesByElement(this, new ProcessingContext()))); + ContainerUtil.addAll(result, provider.getReferencesByElement(this, new ProcessingContext())); } return myReferences = result.toArray(new PsiReference[result.size()]); } diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntTargetReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntTargetReference.java index 4eb610c7a65f..ebaa46678cc6 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntTargetReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntTargetReference.java @@ -32,6 +32,7 @@ import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlAttributeValue; import com.intellij.util.IncorrectOperationException; import com.intellij.util.StringBuilderSpinAllocator; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -183,7 +184,7 @@ public class AntTargetReference extends AntGenericReference { } } - result.addAll(Arrays.asList(project.getImportedTargets())); + ContainerUtil.addAll(result, project.getImportedTargets()); return result.toArray(); } diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntFileReferenceProvider.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntFileReferenceProvider.java index a9918a2b896d..1f8ce65df9f4 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntFileReferenceProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntFileReferenceProvider.java @@ -23,10 +23,10 @@ import com.intellij.psi.PsiReferenceProvider; import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlAttributeValue; import com.intellij.util.ProcessingContext; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; public class AntFileReferenceProvider extends PsiReferenceProvider { @@ -53,7 +53,7 @@ public class AntFileReferenceProvider extends PsiReferenceProvider { continue; } final AntFileReferenceSet refSet = new AntFileReferenceSet(antElement, xmlAttributeValue, this); - refList.addAll(Arrays.asList(refSet.getAllReferences())); + ContainerUtil.addAll(refList, refSet.getAllReferences()); } return refList.toArray(new PsiReference[refList.size()]); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ActionOnSelectedElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ActionOnSelectedElement.java index 616a9baa0102..396d4cfcd12c 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ActionOnSelectedElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ActionOnSelectedElement.java @@ -28,6 +28,7 @@ import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.vcs.FileStatus; import com.intellij.openapi.vcs.actions.VcsContext; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.containers.ContainerUtil; import javax.swing.*; import java.io.File; @@ -50,7 +51,7 @@ public abstract class ActionOnSelectedElement extends AbstractAction { } } ; - if (selectedIOFiles != null) result.addAll(Arrays.asList(selectedIOFiles)); + if (selectedIOFiles != null) ContainerUtil.addAll(result, selectedIOFiles); return (File[])result.toArray(new File[result.size()]); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RemoveLocallyDeletedFilesAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RemoveLocallyDeletedFilesAction.java index b42895585415..3c3366b7c445 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RemoveLocallyDeletedFilesAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RemoveLocallyDeletedFilesAction.java @@ -24,6 +24,7 @@ import com.intellij.cvsSupport2.ui.CvsTabbedWindow; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.vcs.ui.Refreshable; +import com.intellij.util.containers.ContainerUtil; import java.io.File; import java.util.ArrayList; @@ -81,7 +82,7 @@ public class RemoveLocallyDeletedFilesAction extends RemoveLocallyFileOrDirector File[] files = context.getSelectedIOFiles(); ArrayList result = new ArrayList(); if (files == null) return result; - result.addAll(Arrays.asList(files)); + ContainerUtil.addAll(result, files); return result; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/SelectedFiles.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/SelectedFiles.java index c89d9792cd18..48ae8670159a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/SelectedFiles.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/SelectedFiles.java @@ -17,6 +17,7 @@ package com.intellij.cvsSupport2.cvshandlers; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.containers.ContainerUtil; import java.util.ArrayList; import java.util.Collection; @@ -43,7 +44,7 @@ class SelectedFiles extends AnyProcessedFiles { } public SelectedFiles(VirtualFile[] files) { - myFiles.addAll(Arrays.asList(files)); + ContainerUtil.addAll(myFiles, files); } diff --git a/plugins/devkit/src/inspections/InspectionDescriptionNotFoundInspection.java b/plugins/devkit/src/inspections/InspectionDescriptionNotFoundInspection.java index ecfa584604e5..e2d7b7ae6b8b 100644 --- a/plugins/devkit/src/inspections/InspectionDescriptionNotFoundInspection.java +++ b/plugins/devkit/src/inspections/InspectionDescriptionNotFoundInspection.java @@ -27,6 +27,7 @@ import com.intellij.openapi.roots.ModuleRootManager; 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.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -119,7 +120,7 @@ public class InspectionDescriptionNotFoundInspection extends DevKitInspectionBas if (parent != null) result.add(parent.getVirtualFile()); } } else { - result.addAll(Arrays.asList(ModuleRootManager.getInstance(module).getSourceRoots())); + ContainerUtil.addAll(result, ModuleRootManager.getInstance(module).getSourceRoots()); } return result; } diff --git a/plugins/devkit/src/inspections/IntentionDescriptionNotFoundInspection.java b/plugins/devkit/src/inspections/IntentionDescriptionNotFoundInspection.java index 3bb28208ba2c..e6c802bb9a47 100644 --- a/plugins/devkit/src/inspections/IntentionDescriptionNotFoundInspection.java +++ b/plugins/devkit/src/inspections/IntentionDescriptionNotFoundInspection.java @@ -26,6 +26,7 @@ import com.intellij.openapi.roots.ModuleRootManager; 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.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -87,7 +88,7 @@ public class IntentionDescriptionNotFoundInspection extends DevKitInspectionBase if (parent != null) result.add(parent.getVirtualFile()); } } else { - result.addAll(Arrays.asList(ModuleRootManager.getInstance(module).getSourceRoots())); + ContainerUtil.addAll(result, ModuleRootManager.getInstance(module).getSourceRoots()); } return result; } @@ -127,4 +128,4 @@ public class IntentionDescriptionNotFoundInspection extends DevKitInspectionBase public boolean isEnabledByDefault() { return true; } -} \ No newline at end of file +} diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseUserLibrariesHelper.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseUserLibrariesHelper.java index 2e180d016966..7922ad7d903f 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseUserLibrariesHelper.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseUserLibrariesHelper.java @@ -31,6 +31,7 @@ import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; +import com.intellij.util.containers.ContainerUtil; import org.jdom.Document; import org.jdom.Element; import org.jdom.JDOMException; @@ -75,7 +76,7 @@ public class EclipseUserLibrariesHelper { } final Element userLibsElement = new Element("eclipse-userlibraries"); final List libraries = new ArrayList(Arrays.asList(ProjectLibraryTable.getInstance(project).getLibraries())); - libraries.addAll(Arrays.asList(LibraryTablesRegistrar.getInstance().getLibraryTable().getLibraries())); + ContainerUtil.addAll(libraries, LibraryTablesRegistrar.getInstance().getLibraryTable().getLibraries()); for (Library library : libraries) { Element libElement = new Element("library"); libElement.setAttribute("name", library.getName()); @@ -123,4 +124,4 @@ public class EclipseUserLibrariesHelper { } } } -} \ No newline at end of file +} diff --git a/plugins/git4idea/src/git4idea/GitRemote.java b/plugins/git4idea/src/git4idea/GitRemote.java index f14de347a04c..94f7dcab0f05 100644 --- a/plugins/git4idea/src/git4idea/GitRemote.java +++ b/plugins/git4idea/src/git4idea/GitRemote.java @@ -21,6 +21,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.containers.ContainerUtil; import git4idea.commands.GitCommand; import git4idea.commands.GitSimpleHandler; import git4idea.commands.StringScanner; @@ -316,7 +317,7 @@ public final class GitRemote { else if (s.tryConsume(SHOW_BRANCHES_LINE)) { s.line(); if (s.tryConsume(" ")) { - branches.addAll(Arrays.asList(s.line().split(" "))); + ContainerUtil.addAll(branches, s.line().split(" ")); } } else if (s.tryConsume(" Remote branch")) { diff --git a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java index c622bd070992..8c59a2b56351 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java +++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java @@ -32,6 +32,7 @@ import com.intellij.openapi.vcs.ui.RefreshableOnComponent; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.NullableFunction; import com.intellij.util.PairConsumer; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; import com.intellij.vcsUtil.VcsUtil; import git4idea.GitUtil; @@ -622,7 +623,7 @@ public class GitCheckinEnvironment implements CheckinEnvironment { c.weightx = 1; c.fill = GridBagConstraints.HORIZONTAL; final Set authors = getUsersList(project, roots); - authors.addAll(Arrays.asList(mySettings.getCommitAuthors())); + ContainerUtil.addAll(authors, mySettings.getCommitAuthors()); final ArrayList authorsList = new ArrayList(authors); Collections.sort(authorsList); myAuthor = new JComboBox(authorsList.toArray(new Object[authorsList.size()])); diff --git a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java index 21e7bee73090..fd91def3f6b5 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java @@ -23,6 +23,7 @@ import com.intellij.openapi.components.Storage; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Computable; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -261,7 +262,7 @@ public class GitVcsSettings implements PersistentStateComponent strings = new LinkedHashSet(); strings.add("gdsl"); for (GroovyScriptTypeEP ep : GroovyScriptType.EP_NAME.getExtensions()) { - strings.addAll(Arrays.asList(ep.extensions.split(";"))); + ContainerUtil.addAll(strings, ep.extensions.split(";")); } return strings; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/equals/GrGenerateEqualsHelper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/equals/GrGenerateEqualsHelper.java index 134cc932f9ff..ffe65c5deb10 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/equals/GrGenerateEqualsHelper.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/equals/GrGenerateEqualsHelper.java @@ -26,6 +26,7 @@ import com.intellij.psi.util.MethodSignatureUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.StringBuilderSpinAllocator; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -79,7 +80,7 @@ public class GrGenerateEqualsHelper { myCheckParameterWithInstanceof = useInstanceofToCheckParameterType; myNonNullSet = new HashSet(); - myNonNullSet.addAll(Arrays.asList(nonNullFields)); + ContainerUtil.addAll(myNonNullSet, nonNullFields); myFactory = GroovyPsiElementFactory.getInstance(project); @@ -253,7 +254,7 @@ public class GrGenerateEqualsHelper { addClassInstance(buffer); ArrayList equalsFields = new ArrayList(); - equalsFields.addAll(Arrays.asList(myEqualsFields)); + ContainerUtil.addAll(equalsFields, myEqualsFields); Collections.sort(equalsFields, EqualsFieldsComparator.INSTANCE); for (PsiField field : equalsFields) { @@ -261,15 +262,18 @@ public class GrGenerateEqualsHelper { final PsiType type = field.getType(); if (type instanceof PsiArrayType) { addArrayEquals(buffer, field); - } else if (type instanceof PsiPrimitiveType) { + } + else if (type instanceof PsiPrimitiveType) { if (PsiType.DOUBLE.equals(type) || PsiType.FLOAT.equals(type)) { addDoubleFieldComparison(buffer, field); - } else { + } + else { addFieldComparison(buffer, field); } - } else { + } + else { if (type instanceof PsiClassType) { - final PsiClass aClass = ((PsiClassType) type).resolve(); + final PsiClass aClass = ((PsiClassType)type).resolve(); if (aClass != null && aClass.isEnum()) { addFieldComparison(buffer, field); continue; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/generator/GroovyToJavaGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/generator/GroovyToJavaGenerator.java index 8f2ee7f06d98..919e1431f0e8 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/generator/GroovyToJavaGenerator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/generator/GroovyToJavaGenerator.java @@ -36,6 +36,7 @@ import com.intellij.psi.util.MethodSignature; import com.intellij.psi.util.MethodSignatureUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.CollectionFactory; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; @@ -166,7 +167,7 @@ public class GroovyToJavaGenerator { final HashSet set = new HashSet(); ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { - set.addAll(Arrays.asList(context.getProjectCompileScope().getFiles(GroovyFileType.GROOVY_FILE_TYPE, true))); + ContainerUtil.addAll(set, context.getProjectCompileScope().getFiles(GroovyFileType.GROOVY_FILE_TYPE, true)); } }); @@ -350,7 +351,9 @@ public class GroovyToJavaGenerator { writePackageStatement(text, packageDefinition); - GrMembersDeclaration[] membersDeclarations = typeDefinition instanceof GrTypeDefinition ? ((GrTypeDefinition) typeDefinition).getMemberDeclarations() : GrMembersDeclaration.EMPTY_ARRAY; //todo + GrMembersDeclaration[] membersDeclarations = typeDefinition instanceof GrTypeDefinition + ? ((GrTypeDefinition)typeDefinition).getMemberDeclarations() + : GrMembersDeclaration.EMPTY_ARRAY; //todo boolean isClassDef = typeDefinition instanceof GrClassDefinition; boolean isInterface = typeDefinition instanceof GrInterfaceDefinition; @@ -372,7 +375,8 @@ public class GroovyToJavaGenerator { if (isScript) { text.append("extends groovy.lang.Script "); - } else if (!isEnum && !isAtInterface) { + } + else if (!isEnum && !isAtInterface) { final PsiClassType[] extendsClassesTypes = typeDefinition.getExtendsListTypes(); if (extendsClassesTypes.length > 0) { @@ -394,14 +398,14 @@ public class GroovyToJavaGenerator { text.append("{"); if (isEnum) { - writeEnumConstants(text, (GrEnumTypeDefinition) typeDefinition); + writeEnumConstants(text, (GrEnumTypeDefinition)typeDefinition); } Set methodSignatures = new HashSet(); List methods = new ArrayList(); - methods.addAll(Arrays.asList(typeDefinition.getMethods())); + ContainerUtil.addAll(methods, typeDefinition.getMethods()); if (isClassDef) { final PsiElementFactory factory = JavaPsiFacade.getInstance(myProject).getElementFactory(); methods.add(factory.createMethodFromText("public groovy.lang.MetaClass getMetaClass() {}", null)); @@ -418,7 +422,7 @@ public class GroovyToJavaGenerator { } if (method instanceof GrConstructor) { - writeConstructor(text, (GrConstructor) method, isEnum); + writeConstructor(text, (GrConstructor)method, isEnum); continue; } @@ -432,17 +436,19 @@ public class GroovyToJavaGenerator { } for (int i = parameters.length - 1; i >= 0; i--) { - MethodSignature signature = MethodSignatureUtil.createMethodSignature(method.getName(), parameterTypes, method.getTypeParameters(), PsiSubstitutor.EMPTY); + MethodSignature signature = + MethodSignatureUtil.createMethodSignature(method.getName(), parameterTypes, method.getTypeParameters(), PsiSubstitutor.EMPTY); if (methodSignatures.add(signature)) { writeMethod(text, method, parametersCopy); } PsiParameter parameter = parameters[i]; - if (!(parameter instanceof GrParameter) || !((GrParameter) parameter).isOptional()) break; + if (!(parameter instanceof GrParameter) || !((GrParameter)parameter).isOptional()) break; parameterTypes = ArrayUtil.remove(parameterTypes, parameterTypes.length - 1); parametersCopy = ArrayUtil.remove(parametersCopy, parametersCopy.length - 1); } - } else { + } + else { MethodSignature signature = method.getSignature(PsiSubstitutor.EMPTY); if (methodSignatures.add(signature)) { writeMethod(text, method, parameters); @@ -452,7 +458,7 @@ public class GroovyToJavaGenerator { for (GrMembersDeclaration declaration : membersDeclarations) { if (declaration instanceof GrVariableDeclaration) { - writeVariableDeclarations(text, (GrVariableDeclaration) declaration); + writeVariableDeclarations(text, (GrVariableDeclaration)declaration); } } for (PsiClass inner : typeDefinition.getInnerClasses()) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerClassFilterProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerClassFilterProvider.java index 3e0a45dd38de..51fffa036c3a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerClassFilterProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerClassFilterProvider.java @@ -18,6 +18,7 @@ package org.jetbrains.plugins.groovy.debugger.filters; import com.intellij.execution.filters.StackFrameFilter; import com.intellij.ui.classFilter.ClassFilter; import com.intellij.ui.classFilter.DebuggerClassFilterProvider; +import com.intellij.util.containers.ContainerUtil; import java.util.ArrayList; import java.util.Arrays; @@ -35,7 +36,7 @@ public class GroovyDebuggerClassFilterProvider extends StackFrameFilter implemen final Boolean flag = settings.DEBUG_DISABLE_SPECIFIC_GROOVY_METHODS; final ArrayList list = new ArrayList(); if (flag == null || flag.booleanValue()) { - list.addAll(Arrays.asList(FILTERS)); + ContainerUtil.addAll(list, FILTERS); return list; } return list; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/GroovyFindUsagesHandlerFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/GroovyFindUsagesHandlerFactory.java index d08b5004c8f4..71bd7675949a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/GroovyFindUsagesHandlerFactory.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/GroovyFindUsagesHandlerFactory.java @@ -29,6 +29,7 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiField; import com.intellij.psi.PsiMethod; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField; import org.jetbrains.plugins.groovy.lang.psi.util.GroovyPropertyUtils; @@ -78,10 +79,10 @@ public class GroovyFindUsagesHandlerFactory extends JavaFindUsagesHandlerFactory if (doSearch) { final List elements = new ArrayList(); 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()]); } else { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java index 4e367ce80b39..5efefbf27e51 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java @@ -34,6 +34,7 @@ import com.intellij.psi.util.CachedValueProvider; import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiModificationTracker; import com.intellij.util.PathUtil; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.lang.UrlClassLoader; import org.jetbrains.plugins.groovy.extensions.GroovyScriptType; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; @@ -99,7 +100,7 @@ public class AntTasksProvider { final Module module = ModuleUtil.findModuleForPsiElement(groovyFile); Set jars = new HashSet(); if (module != null) { - jars.addAll(Arrays.asList(OrderEnumerator.orderEntries(module).getAllLibrariesAndSdkClassesRoots())); + ContainerUtil.addAll(jars, OrderEnumerator.orderEntries(module).getAllLibrariesAndSdkClassesRoots()); } if (groovyFile.isScript() && GroovyScriptType.getScriptType(groovyFile) instanceof GantScriptType) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java index b1760594c8bb..6b32b8c7ac69 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java @@ -32,6 +32,7 @@ import com.intellij.psi.util.*; import com.intellij.util.Consumer; import com.intellij.util.ProcessingContext; import com.intellij.util.SmartList; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.hash.HashMap; import com.intellij.util.containers.hash.HashSet; import org.jetbrains.annotations.NotNull; @@ -255,12 +256,12 @@ public class GroovyCompletionContributor extends CompletionContributor { //costructor call if (call instanceof GrConstructorCall) { GrConstructorCall constructorCall = (GrConstructorCall)call; - results.addAll(Arrays.asList(constructorCall.multiResolveConstructor())); - results.addAll(Arrays.asList(constructorCall.multiResolveClass())); + ContainerUtil.addAll(results, constructorCall.multiResolveConstructor()); + ContainerUtil.addAll(results, constructorCall.multiResolveClass()); } else if (call instanceof GrCallExpression) { GrCallExpression constructorCall = (GrCallExpression)call; - results.addAll(Arrays.asList(constructorCall.getMethodVariants())); + ContainerUtil.addAll(results, constructorCall.getMethodVariants()); final PsiType type = ((GrCallExpression)call).getType(); if (type instanceof PsiClassType) { final PsiClass psiClass = ((PsiClassType)type).resolve(); @@ -270,7 +271,7 @@ public class GroovyCompletionContributor extends CompletionContributor { else if (call instanceof GrApplicationStatement) { final GrExpression element = ((GrApplicationStatement)call).getFunExpression(); if (element instanceof GrReferenceElement) { - results.addAll(Arrays.asList(((GrReferenceElement)element).multiResolve(true))); + ContainerUtil.addAll(results, ((GrReferenceElement)element).multiResolve(true)); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java index 34806af53fbb..d5ede9cbdfcb 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovySmartCompletionContributor.java @@ -29,6 +29,7 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.Consumer; import com.intellij.util.ProcessingContext; +import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashSet; import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; @@ -74,7 +75,7 @@ public class GroovySmartCompletionContributor extends CompletionContributor { final THashSet _infos = new THashSet(); ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { - _infos.addAll(Arrays.asList(getExpectedTypes(params))); + ContainerUtil.addAll(_infos, getExpectedTypes(params)); } }); final Set infos = ApplicationManager.getApplication().runReadAction(new Computable>() { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java index b31c7aede49f..72acb7bd74a5 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java @@ -38,6 +38,7 @@ import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; import com.intellij.psi.util.CachedValuesManager; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.GroovyFileType; @@ -206,7 +207,7 @@ public class GroovyFileImpl extends GroovyFileBaseImpl implements GroovyFile { private List getImplicitlyImportedPackages() { final ArrayList result = new ArrayList(); result.add(getPackageName()); - result.addAll(Arrays.asList(IMPLICITLY_IMPORTED_PACKAGES)); + ContainerUtil.addAll(result, IMPLICITLY_IMPORTED_PACKAGES); if (isScript()) { result.addAll(GroovyScriptType.getScriptType(this).appendImplicitImports(this)); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java index edc62b3a251f..e333cd9ab886 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java @@ -20,6 +20,7 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.*; import com.intellij.psi.stubs.IStubElementType; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import gnu.trove.TObjectIntHashMap; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -93,9 +94,9 @@ public class GrModifierListImpl extends GroovyBaseElementImpl 0) return fieldCandidates; @@ -505,7 +506,7 @@ public class GrReferenceExpressionImpl extends GrReferenceElementImpl implements return candidates; } else { - list.addAll(Arrays.asList(candidates)); + ContainerUtil.addAll(list, candidates); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrMethodCallExpressionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrMethodCallExpressionImpl.java index 9affeefc83c2..720b0dcc0cd0 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrMethodCallExpressionImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrMethodCallExpressionImpl.java @@ -21,6 +21,7 @@ import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.Function; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes; @@ -154,7 +155,7 @@ public class GrMethodCallExpressionImpl extends GrCallExpressionImpl implements if (!(newExpr instanceof GrClosableBlock)) { ArrayList allArgs = new ArrayList(); // Collecting all arguments - allArgs.addAll(Arrays.asList(getExpressionArguments())); + ContainerUtil.addAll(allArgs, getExpressionArguments()); ArrayList closureArgs = new ArrayList(); for (GrExpression closArg : getClosureArguments()) { if (closArg.equals(closure)) break; @@ -168,7 +169,7 @@ public class GrMethodCallExpressionImpl extends GrCallExpressionImpl implements GrArgumentList newArgList = GroovyPsiElementFactory.getInstance(getProject()).createExpressionArgumentList(allArgs.toArray(new GrExpression[allArgs.size()])); while (closure.getNode().getTreePrev() != null && - !(closure.getNode().getTreePrev().getPsi() instanceof GrArgumentList)) { + !(closure.getNode().getTreePrev().getPsi() instanceof GrArgumentList)) { parentNode.removeChild(closure.getNode().getTreePrev()); } parentNode.removeChild(closure.getNode()); @@ -203,4 +204,4 @@ public class GrMethodCallExpressionImpl extends GrCallExpressionImpl implements return res.toArray(new GroovyResolveResult[res.size()]); } -} \ No newline at end of file +} diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/bodies/GrTypeDefinitionBodyImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/bodies/GrTypeDefinitionBodyImpl.java index c548d3fd34d1..b91896452173 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/bodies/GrTypeDefinitionBodyImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/bodies/GrTypeDefinitionBodyImpl.java @@ -20,6 +20,7 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes; @@ -90,11 +91,11 @@ public class GrTypeDefinitionBodyImpl extends GroovyPsiElementImpl implements Gr GrField[] fields = getFields(); if (fields.length == 0) return Arrays.asList(groovyMethods); List result = new ArrayList(); - result.addAll(Arrays.asList(groovyMethods)); + ContainerUtil.addAll(result, groovyMethods); for (GrField field : fields) { if (field.isProperty()) { PsiMethod[] getters = field.getGetters(); - if (getters.length > 0) result.addAll(Arrays.asList(getters)); + if (getters.length > 0) ContainerUtil.addAll(result, getters); PsiMethod setter = field.getSetter(); if (setter != null) result.add(setter); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java index 7db3182d5633..663ee5da9447 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java @@ -18,6 +18,7 @@ package org.jetbrains.plugins.groovy.lang.psi.stubs; import com.intellij.psi.stubs.StubInputStream; import com.intellij.psi.stubs.StubOutputStream; +import com.intellij.util.containers.ContainerUtil; import java.util.*; import java.io.IOException; @@ -40,7 +41,7 @@ public class GrStubUtils { namedParameterSetArray[j] = dataStream.readUTF(); } Set curSet = new HashSet(); - curSet.addAll(Arrays.asList(namedParameterSetArray)); + ContainerUtil.addAll(curSet, namedParameterSetArray); collArray.add(curSet); } return collArray; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrFieldElementType.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrFieldElementType.java index 8e9f8d630b4c..f9c5e5745554 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrFieldElementType.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrFieldElementType.java @@ -142,7 +142,7 @@ public class GrFieldElementType extends GrStubElementType namedParameterSetArray[j] = dataStream.readUTF(); } Set curSet = new HashSet(); - curSet.addAll(Arrays.asList(namedParameterSetArray)); + ContainerUtil.addAll(curSet, namedParameterSetArray); namedParametersSets.add(curSet); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java index d98c290198db..2456e2106c87 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java @@ -140,7 +140,7 @@ public class GrClassImplUtil { if (visited.contains(clazz)) return; visited.add(clazz); - allMethods.addAll(Arrays.asList(clazz.getMethods())); + ContainerUtil.addAll(allMethods, clazz.getMethods()); final PsiField[] fields = clazz.getFields(); for (PsiField field : fields) { @@ -148,7 +148,7 @@ public class GrClassImplUtil { final GrField groovyField = (GrField)field; if (groovyField.isProperty()) { PsiMethod[] getters = groovyField.getGetters(); - if (getters.length > 0) allMethods.addAll(Arrays.asList(getters)); + if (getters.length > 0) ContainerUtil.addAll(allMethods, getters); PsiMethod setter = groovyField.getSetter(); if (setter != null) allMethods.add(setter); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java index 6c88ca8eaa96..5725b20a9077 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java @@ -31,6 +31,7 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import gnu.trove.TIntStack; import org.jetbrains.annotations.NotNull; @@ -845,8 +846,10 @@ public class PsiUtil { final GroovyPsiElement context = classResult.getCurrentFileResolveContext(); PsiClass clazz = (PsiClass)element; String className = clazz.getName(); - PsiType thisType = JavaPsiFacade.getInstance(place.getProject()).getElementFactory().createType(clazz, classResult.getSubstitutor()); - final MethodResolverProcessor processor = new MethodResolverProcessor(className, place, true, thisType, argTypes, PsiType.EMPTY_ARRAY); + PsiType thisType = + JavaPsiFacade.getInstance(place.getProject()).getElementFactory().createType(clazz, classResult.getSubstitutor()); + final MethodResolverProcessor processor = + new MethodResolverProcessor(className, place, true, thisType, argTypes, PsiType.EMPTY_ARRAY); PsiSubstitutor substitutor = classResult.getSubstitutor(); final ResolveState state = ResolveState.initial().put(PsiSubstitutor.KEY, substitutor).put(ResolverProcessor.RESOLVE_CONTEXT, context); @@ -856,7 +859,7 @@ public class PsiUtil { if (!membersProcessor.processNonCodeMembers(thisType, processor, place, true)) break; } NonCodeMembersContributor.runContributors(thisType, processor, place, state); - constructorResults.addAll(Arrays.asList(processor.getCandidates())); + ContainerUtil.addAll(constructorResults, processor.getCandidates()); if (!toBreak) break; } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/surroundWith/descriptors/GroovyStmtsSurroundDescriptor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/surroundWith/descriptors/GroovyStmtsSurroundDescriptor.java index d625afe0a4e6..b49465df5ea5 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/surroundWith/descriptors/GroovyStmtsSurroundDescriptor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/surroundWith/descriptors/GroovyStmtsSurroundDescriptor.java @@ -16,6 +16,7 @@ package org.jetbrains.plugins.groovy.lang.surroundWith.descriptors; import com.intellij.lang.surroundWith.Surrounder; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.lang.surroundWith.surrounders.GroovySurrounderByClosure; import org.jetbrains.plugins.groovy.lang.surroundWith.surrounders.surroundersImpl.blocks.open.*; @@ -73,8 +74,8 @@ public class GroovyStmtsSurroundDescriptor extends GroovySurroundDescriptor { @NotNull public Surrounder[] getSurrounders() { List surroundersList = new ArrayList(); - surroundersList.addAll(Arrays.asList(exprSurrounders)); - surroundersList.addAll(Arrays.asList(stmtsSurrounders)); + ContainerUtil.addAll(surroundersList, exprSurrounders); + ContainerUtil.addAll(surroundersList, stmtsSurrounders); return surroundersList.toArray(new Surrounder[0]); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChageSignatureUsageSearcher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChageSignatureUsageSearcher.java index 4404a611603b..9ac08bef49a1 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChageSignatureUsageSearcher.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChageSignatureUsageSearcher.java @@ -31,6 +31,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 org.jetbrains.plugins.groovy.GroovyFileType; import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocTagValueToken; @@ -106,7 +107,7 @@ class GrChageSignatureUsageSearcher { final PsiParameter[] parameters = method.getParameterList().getParameters(); final Set deletedOrRenamedParameters = new HashSet(); if (isOriginal) { - deletedOrRenamedParameters.addAll(Arrays.asList(parameters)); + ContainerUtil.addAll(deletedOrRenamedParameters, parameters); for (ParameterInfo parameterInfo : myChangeInfo.getNewParameters()) { if (parameterInfo.getOldIndex() >= 0) { final PsiParameter parameter = parameters[parameterInfo.getOldIndex()]; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java index ea1f8352467a..c5d737a59f61 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java @@ -196,7 +196,8 @@ public class GrChangeSignatureUsageProcessor implements ChangeSignatureUsageProc else { PsiType type = newReturnType.getType(context, method.getManager()); final PsiType oldReturnType = method.getReturnType(); - if (!TypesUtil.isAssignable(type, oldReturnType, context.getManager(), context.getResolveScope())) { //todo ask for replace covariant type + if (!TypesUtil + .isAssignable(type, oldReturnType, context.getManager(), context.getResolveScope())) { //todo ask for replace covariant type method.setReturnType(substitutor.substitute(type)); } } @@ -207,7 +208,7 @@ public class GrChangeSignatureUsageProcessor implements ChangeSignatureUsageProc GrParameter[] oldParameters = parameterList.getParameters(); Set toRemove = new HashSet(oldParameters.length); - toRemove.addAll(Arrays.asList(oldParameters)); + ContainerUtil.addAll(toRemove, oldParameters); GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(method.getProject()); GrParameter anchor = null; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java index f34df291cf52..daa0310fe9df 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java @@ -32,6 +32,7 @@ import com.intellij.refactoring.HelpID; import com.intellij.refactoring.inline.InlineOptionsDialog; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; @@ -464,8 +465,8 @@ public class GroovyInlineMethodUtil { return; } ArrayList exprs = new ArrayList(); - exprs.addAll(Arrays.asList(argumentList.getExpressionArguments())); - exprs.addAll(Arrays.asList(call.getClosureArguments())); + ContainerUtil.addAll(exprs, argumentList.getExpressionArguments()); + ContainerUtil.addAll(exprs, call.getClosureArguments()); // first parameter may have map type boolean firstParamIsMap = argumentList.getNamedArguments().length > 0; @@ -493,7 +494,8 @@ public class GroovyInlineMethodUtil { if (initializer != null) { if (nonDefault > 0) { nonDefault--; - } else { + } + else { nameFilter.add(parameter.getName()); } } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevertCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevertCommand.java index f7a3d939daa4..96ab2ac461e5 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevertCommand.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevertCommand.java @@ -13,6 +13,7 @@ package org.zmlx.hg4idea.command; import com.intellij.openapi.project.Project; +import com.intellij.util.containers.ContainerUtil; import org.apache.commons.lang.StringUtils; import org.zmlx.hg4idea.HgFile; import org.zmlx.hg4idea.HgRevisionNumber; @@ -36,7 +37,8 @@ public class HgRevertCommand { arguments.add("--rev"); if (StringUtils.isNotBlank(vcsRevisionNumber.getChangeset())) { arguments.add(vcsRevisionNumber.getChangeset()); - } else { + } + else { arguments.add(vcsRevisionNumber.getRevision()); } } @@ -45,7 +47,7 @@ public class HgRevertCommand { arguments.add("--no-backup"); } - arguments.addAll(Arrays.asList(hgFile.getRelativePath())); + ContainerUtil.addAll(arguments, hgFile.getRelativePath()); HgCommandService.getInstance(project).execute(hgFile.getRepo(), "revert", arguments); } diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java index 24c8e3206216..1b2948d7c526 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java @@ -48,6 +48,7 @@ import com.intellij.ui.AddDeleteListPanel; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.FieldPanel; import com.intellij.util.ArrayUtil; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import org.jdom.Element; import org.jetbrains.annotations.NonNls; @@ -311,7 +312,7 @@ public class I18nInspection extends BaseLocalInspectionTool { for (PsiClassInitializer initializer : initializers) { final ProblemDescriptor[] descriptors = checkElement(initializer, manager, isOnTheFly); if (descriptors != null) { - result.addAll(Arrays.asList(descriptors)); + ContainerUtil.addAll(result, descriptors); } } diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspection.java index 263d06527da0..2ea45ac24a46 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspection.java @@ -30,6 +30,7 @@ import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Ref; import com.intellij.psi.*; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -79,7 +80,7 @@ public class InvalidPropertyKeyInspection extends BaseJavaLocalInspectionTool { for (PsiClassInitializer initializer : initializers) { final ProblemDescriptor[] descriptors = checkElement(initializer, manager, isOnTheFly); if (descriptors != null) { - result.addAll(Arrays.asList(descriptors)); + ContainerUtil.addAll(result, descriptors); } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java index 90942cda928e..928663c4d5fe 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java @@ -21,6 +21,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.xml.XmlTag; import com.intellij.util.Function; import com.intellij.util.Processor; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.hash.HashSet; import com.intellij.util.xml.DomUtil; import org.jetbrains.annotations.NotNull; @@ -141,7 +142,7 @@ public class MavenDomProjectProcessorUtils { public boolean process(MavenDomProperties mavenDomProperties) { XmlTag propertiesTag = mavenDomProperties.getXmlTag(); if (propertiesTag != null) { - properties.addAll(Arrays.asList(propertiesTag.getSubTags())); + ContainerUtil.addAll(properties, propertiesTag.getSubTags()); } return false; } diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java b/plugins/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java index 5f0c00e0103a..9f6053d793e2 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java +++ b/plugins/spellchecker/src/com/intellij/spellchecker/SpellCheckerManager.java @@ -33,6 +33,7 @@ import com.intellij.spellchecker.state.StateLoader; import com.intellij.spellchecker.util.SPFileUtil; import com.intellij.spellchecker.util.Strings; import com.intellij.util.Consumer; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -192,7 +193,7 @@ public class SpellCheckerManager { public List getBundledDictionaries() { final ArrayList dictionaries = new ArrayList(); for (BundledDictionaryProvider provider : Extensions.getExtensions(BundledDictionaryProvider.EP_NAME)) { - dictionaries.addAll(Arrays.asList(provider.getBundledDictionaries())); + ContainerUtil.addAll(dictionaries, provider.getBundledDictionaries()); } return dictionaries; } diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java index f8b521108edb..f61de0da36e9 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/SearchingForTestsTask.java @@ -38,6 +38,7 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.PackageScope; import com.intellij.psi.search.searches.AllClassesSearch; import com.intellij.psi.search.searches.AnnotatedMembersSearch; +import com.intellij.util.containers.ContainerUtil; import com.theoryinpractice.testng.model.TestClassFilter; import com.theoryinpractice.testng.model.TestData; import com.theoryinpractice.testng.model.TestType; @@ -359,7 +360,7 @@ public class SearchingForTestsTask extends Task.Backgroundable { psiMethods = new LinkedHashSet(); classes.put(psiClass, psiMethods); } - psiMethods.addAll(Arrays.asList(methods)); + ContainerUtil.addAll(psiMethods, methods); } else if (data.TEST_OBJECT.equals(TestType.GROUP.getType())) { //for a group, we include all classes @@ -464,4 +465,4 @@ public class SearchingForTestsTask extends Task.Backgroundable { : module != null ? GlobalSearchScope.moduleWithDependenciesScope(module) : GlobalSearchScope.projectScope(myConfig.getProject()); } -} \ No newline at end of file +} diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java index 3c37abc01856..a81fd51d5599 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java +++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java @@ -30,6 +30,7 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiNameValuePair; import com.intellij.ui.DocumentAdapter; import com.intellij.util.ArrayUtil; +import com.intellij.util.containers.ContainerUtil; import com.theoryinpractice.testng.util.TestNGUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -86,7 +87,7 @@ public class DependsOnGroupsInspection extends BaseJavaLocalInspectionTool { protected void textChanged(final DocumentEvent e) { groups.clear(); final String[] groupsFromString = textField.getText().split("[, ]"); - groups.addAll(Arrays.asList(groupsFromString)); + ContainerUtil.addAll(groups, groupsFromString); } }); definedGroups.setComponent(textField); diff --git a/plugins/testng/src/com/theoryinpractice/testng/util/TestNGUtil.java b/plugins/testng/src/com/theoryinpractice/testng/util/TestNGUtil.java index 25bf6337aeb2..3886e8746fec 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/util/TestNGUtil.java +++ b/plugins/testng/src/com/theoryinpractice/testng/util/TestNGUtil.java @@ -44,6 +44,7 @@ import com.intellij.psi.util.PsiElementFilter; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.PathUtil; import com.intellij.util.Processor; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xml.NanoXmlUtil; import com.theoryinpractice.testng.model.TestClassFilter; import org.jetbrains.annotations.NonNls; @@ -220,14 +221,15 @@ public class TestNGUtil Map> results = new HashMap>(); Set test = new HashSet(1); test.add(TEST_ANNOTATION_FQN); - test.addAll(Arrays.asList(CONFIG_ANNOTATIONS_FQN)); + ContainerUtil.addAll(test, CONFIG_ANNOTATIONS_FQN); for (PsiClass psiClass : classes) { if (isBrokenPsiClass(psiClass)) continue; PsiAnnotation annotation; try { annotation = AnnotationUtil.findAnnotation(psiClass, test); - } catch (Exception e) { + } + catch (Exception e) { LOGGER.error("Exception trying to findAnnotation on " + psiClass.getClass().getName() + ".\n\n" + e.getMessage()); annotation = null; } @@ -235,7 +237,8 @@ public class TestNGUtil if (isAnnotatedWithParameter(annotation, parameter, values)) { results.put(psiClass, new LinkedHashSet()); } - } else { + } + else { Collection matches = extractAnnotationValuesFromJavaDoc(getTextJavaDoc(psiClass), parameter); for (String s : matches) { if (values.contains(s)) { @@ -255,7 +258,8 @@ public class TestNGUtil if (results.get(psiClass) == null) results.put(psiClass, new LinkedHashSet()); results.get(psiClass).add(method); } - } else { + } + else { Collection matches = extractAnnotationValuesFromJavaDoc(getTextJavaDoc(psiClass), parameter); for (String s : matches) { if (values.contains(s)) { @@ -296,18 +300,19 @@ public class TestNGUtil public static void collectAnnotationValues(final Set results, final String parameter, PsiMethod[] psiMethods, PsiClass... classes) { final Set test = new HashSet(1); test.add(TEST_ANNOTATION_FQN); - test.addAll(Arrays.asList(CONFIG_ANNOTATIONS_FQN)); + ContainerUtil.addAll(test, CONFIG_ANNOTATIONS_FQN); if (psiMethods != null) { for (final PsiMethod psiMethod : psiMethods) { ApplicationManager.getApplication().runReadAction( - new Runnable() { - public void run() { - appendAnnotationAttributeValues(parameter, results, AnnotationUtil.findAnnotation(psiMethod, test), psiMethod); - } + new Runnable() { + public void run() { + appendAnnotationAttributeValues(parameter, results, AnnotationUtil.findAnnotation(psiMethod, test), psiMethod); } + } ); } - } else { + } + else { for (final PsiClass psiClass : classes) { ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java index f511223e29f2..7cba73796349 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferencesSearcher.java @@ -24,6 +24,7 @@ import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.Processor; import com.intellij.util.QueryExecutor; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import com.intellij.util.text.CharArrayUtil; @@ -228,9 +229,11 @@ public class FormReferencesSearcher implements QueryExecutor fileSet = new HashSet(); ApplicationManager.getApplication().runReadAction(new Runnable() { public void run() { - fileSet.addAll(Arrays.asList(manager.getCacheManager().getFilesWithWord(words.get(0), UsageSearchContext.IN_PLAIN_TEXT, scope, true))); + ContainerUtil + .addAll(fileSet, manager.getCacheManager().getFilesWithWord(words.get(0), UsageSearchContext.IN_PLAIN_TEXT, scope, true)); for (int i = 1; i < words.size(); i++) { - fileSet.retainAll(Arrays.asList(manager.getCacheManager().getFilesWithWord(words.get(i), UsageSearchContext.IN_PLAIN_TEXT, scope, true))); + fileSet.retainAll( + Arrays.asList(manager.getCacheManager().getFilesWithWord(words.get(i), UsageSearchContext.IN_PLAIN_TEXT, scope, true))); } } }); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java index 4fdc1140064c..97101576bde4 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/FormMergerTreeStructureProvider.java @@ -32,6 +32,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.refactoring.actions.MoveAction; import com.intellij.uiDesigner.binding.FormClassIndex; +import com.intellij.util.containers.ContainerUtil; import java.util.*; @@ -163,9 +164,9 @@ public class FormMergerTreeStructureProvider implements TreeStructureProvider { Set result = new HashSet(); for(AbstractTreeNode node: selected) { if (node.getValue() instanceof Form) { - Form form = (Form) node.getValue(); + Form form = (Form)node.getValue(); result.add(form.getClassToBind()); - result.addAll(Arrays.asList(form.getFormFiles())); + ContainerUtil.addAll(result, form.getFormFiles()); } else if (node.getValue() instanceof PsiElement) { result.add((PsiElement) node.getValue()); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/CompletionLists.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/CompletionLists.java index bbc0fc44b516..d388e26ad821 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/CompletionLists.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/CompletionLists.java @@ -20,6 +20,7 @@ import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.XmlElement; import com.intellij.util.Icons; +import com.intellij.util.containers.ContainerUtil; import org.intellij.lang.xpath.XPathFile; import org.intellij.lang.xpath.XPathTokenTypes; import org.intellij.lang.xpath.context.ContextProvider; @@ -234,39 +235,40 @@ public class CompletionLists { } private static void addNameCompletions(ContextProvider contextProvider, final XPathNodeTest element, final Set list) { - final PrefixedName prefixedName = element.getQName(); - final XPathNodeTest.PrincipalType principalType = element.getPrincipalType(); + final PrefixedName prefixedName = element.getQName(); + final XPathNodeTest.PrincipalType principalType = element.getPrincipalType(); - final Set files = new HashSet(); - final XPathFile file = (XPathFile)element.getContainingFile(); - files.add(file); - files.addAll(Arrays.asList(contextProvider.getRelatedFiles(file))); + final Set files = new HashSet(); + final XPathFile file = (XPathFile)element.getContainingFile(); + files.add(file); + ContainerUtil.addAll(files, contextProvider.getRelatedFiles(file)); - for (PsiFile xpathFile : files) { - xpathFile.accept(new PsiRecursiveElementVisitor() { - public void visitElement(PsiElement e) { - if (e instanceof XPathNodeTest) { - final XPathNodeTest nodeTest = (XPathNodeTest)e; + for (PsiFile xpathFile : files) { + xpathFile.accept(new PsiRecursiveElementVisitor() { + public void visitElement(PsiElement e) { + if (e instanceof XPathNodeTest) { + final XPathNodeTest nodeTest = (XPathNodeTest)e; - final XPathNodeTest.PrincipalType _principalType = nodeTest.getPrincipalType(); - if (_principalType == principalType) { - final PrefixedName _prefixedName = nodeTest.getQName(); - if (_prefixedName != null && prefixedName != null) { - final String localName = _prefixedName.getLocalName(); - if (!"*".equals(localName) && localName.indexOf(INTELLIJ_IDEA_RULEZ) == -1) { - if (Comparing.equal(_prefixedName.getPrefix(), prefixedName.getPrefix())) { - list.add(new NodeLookup(localName, _principalType)); - } else if (prefixedName.getPrefix() == null) { - list.add(new NodeLookup(_prefixedName.toString(), _principalType)); - } - } - } - } + final XPathNodeTest.PrincipalType _principalType = nodeTest.getPrincipalType(); + if (_principalType == principalType) { + final PrefixedName _prefixedName = nodeTest.getQName(); + if (_prefixedName != null && prefixedName != null) { + final String localName = _prefixedName.getLocalName(); + if (!"*".equals(localName) && localName.indexOf(INTELLIJ_IDEA_RULEZ) == -1) { + if (Comparing.equal(_prefixedName.getPrefix(), prefixedName.getPrefix())) { + list.add(new NodeLookup(localName, _principalType)); } - super.visitElement(e); + else if (prefixedName.getPrefix() == null) { + list.add(new NodeLookup(_prefixedName.toString(), _principalType)); + } + } } - }); - } + } + } + super.visitElement(e); + } + }); + } } private static boolean namespaceMatches(PrefixedName prefixedName, String uri, NamespaceContext namespaceContext, XmlElement context) { @@ -298,8 +300,8 @@ public class CompletionLists { public static Class[] getAllInterfaces(Class clazz) { Set set = new HashSet(); do { - set.addAll(Arrays.asList(clazz.getInterfaces())); - clazz = clazz.getSuperclass(); + ContainerUtil.addAll(set, clazz.getInterfaces()); + clazz = clazz.getSuperclass(); } while (clazz != null); return set.toArray(new Class[set.size()]); } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltContextProvider.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltContextProvider.java index 45378bd859c6..462609699198 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltContextProvider.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltContextProvider.java @@ -29,6 +29,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.*; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import com.intellij.xml.XmlAttributeDescriptor; import com.intellij.xml.XmlElementDescriptor; import com.intellij.xml.XmlNSDescriptor; @@ -238,9 +239,9 @@ public class XsltContextProvider extends ContextProvider { if (associations.length == 0) { fillFromSchema(file, names); } else { - names.validateNames = true; - //noinspection unchecked - names.dependencies.addAll(Arrays.asList(associations)); + names.validateNames = true; + //noinspection unchecked + ContainerUtil.addAll(names.dependencies, associations); } //noinspection unchecked names.dependencies.add(myFileAssociationsManager); diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java index df62e0f3b7bb..18ff0559a9fa 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java @@ -16,6 +16,7 @@ package org.intellij.lang.xpath.xslt.impl.references; +import com.intellij.util.containers.ContainerUtil; import org.intellij.lang.xpath.completion.NamespaceLookup; import org.intellij.lang.xpath.psi.impl.ResolveUtil; import org.intellij.lang.xpath.xslt.XsltSupport; @@ -70,13 +71,13 @@ class ModeReference extends SimpleAttributeReference implements PsiPolyVariantRe if (containingFile instanceof XmlFile && XsltSupport.isXsltFile(containingFile)) { final List l = new ArrayList(); if (!myImplicitModeElement.hasPrefix()) { - final Object[] prefixes = PrefixReference.getPrefixCompletions(myAttribute); - l.addAll(Arrays.asList(prefixes)); + final Object[] prefixes = PrefixReference.getPrefixCompletions(myAttribute); + ContainerUtil.addAll(l, prefixes); } if (myImplicitModeElement.getQName() != null) { - final PsiElement[] modes = ResolveUtil.collect(getMatcher().variantMatcher()); - l.addAll(Arrays.asList(modes)); + final PsiElement[] modes = ResolveUtil.collect(getMatcher().variantMatcher()); + ContainerUtil.addAll(l, modes); } return ArrayUtil.toObjectArray(l); } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/util/XsltCodeInsightUtil.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/util/XsltCodeInsightUtil.java index aef0a89a134f..bf5083a828eb 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/util/XsltCodeInsightUtil.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/util/XsltCodeInsightUtil.java @@ -28,6 +28,7 @@ import com.intellij.psi.search.PsiElementProcessor; import com.intellij.psi.util.PsiElementFilter; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.*; +import com.intellij.util.containers.ContainerUtil; import org.intellij.lang.xpath.psi.XPathElement; import org.intellij.lang.xpath.psi.XPathExpression; import org.intellij.lang.xpath.psi.XPathVariableReference; @@ -170,75 +171,76 @@ public class XsltCodeInsightUtil { } public static XmlTag findVariableInsertionPoint(final XmlTag currentUsageTag, PsiElement usageBlock, final String referenceName, XmlTag... moreUsages) { - // sort tags by document order - final Set usages = new TreeSet(POSITION_COMPARATOR); - usages.add(currentUsageTag); - usages.addAll(Arrays.asList(moreUsages)); + // sort tags by document order + final Set usages = new TreeSet(POSITION_COMPARATOR); + usages.add(currentUsageTag); + ContainerUtil.addAll(usages, moreUsages); - // collect all other possible unresolved references with the same name in the current template - final Project project = currentUsageTag.getProject(); - usageBlock.accept(new PsiRecursiveElementVisitor() { - public void visitElement(PsiElement element) { - if (element instanceof XPathVariableReference) { - visitXPathVariableReference(((XPathVariableReference)element)); - } else { - super.visitElement(element); - } - } - - private void visitXPathVariableReference(XPathVariableReference reference) { - if (referenceName.equals(reference.getReferencedName())) { - if (reference.resolve() == null) { - usages.add(PsiTreeUtil.getContextOfType(reference, XmlTag.class, true)); - } - } - } - - public void visitXmlAttribute(XmlAttribute attribute) { - if (XsltSupport.isXPathAttribute(attribute)) { - final PsiFile[] xpathFiles = XsltSupport.getFiles(attribute); - for (PsiFile xpathFile : xpathFiles) { - xpathFile.accept(this); - } - } - } - }); - - final Iterator it = usages.iterator(); - final XmlTag firstUsage = it.next(); - - // find broadest scope to create the variable in - XmlTag tag = firstUsage; - while (it.hasNext()) { - XmlTag xmlTag = it.next(); - final PsiElement t = PsiTreeUtil.findCommonParent(tag, xmlTag); - if (t instanceof XmlTag) { - tag = (XmlTag)t; - } else { - break; - } + // collect all other possible unresolved references with the same name in the current template + final Project project = currentUsageTag.getProject(); + usageBlock.accept(new PsiRecursiveElementVisitor() { + public void visitElement(PsiElement element) { + if (element instanceof XPathVariableReference) { + visitXPathVariableReference(((XPathVariableReference)element)); + } + else { + super.visitElement(element); + } } - // find the actual tag to create the variable before - final XmlTag[] subTags = tag.getSubTags(); - for (XmlTag xmlTag : subTags) { - if (xmlTag.getTextOffset() > firstUsage.getTextOffset()) break; - tag = xmlTag; + private void visitXPathVariableReference(XPathVariableReference reference) { + if (referenceName.equals(reference.getReferencedName())) { + if (reference.resolve() == null) { + usages.add(PsiTreeUtil.getContextOfType(reference, XmlTag.class, true)); + } + } } - final XmlTag parentTag = tag.getParentTag(); - if (parentTag == null) return tag; - - final String parentName = parentTag.getLocalName(); - if ("apply-templates".equals(parentName) || "call-template".equals(parentName) - || "when".equals(parentName) || "choose".equals(parentName)) - { - if ("when".equals(parentName)) tag = tag.getParentTag(); - assert tag != null; - tag = tag.getParentTag(); + public void visitXmlAttribute(XmlAttribute attribute) { + if (XsltSupport.isXPathAttribute(attribute)) { + final PsiFile[] xpathFiles = XsltSupport.getFiles(attribute); + for (PsiFile xpathFile : xpathFiles) { + xpathFile.accept(this); + } + } } + }); + + final Iterator it = usages.iterator(); + final XmlTag firstUsage = it.next(); + + // find broadest scope to create the variable in + XmlTag tag = firstUsage; + while (it.hasNext()) { + XmlTag xmlTag = it.next(); + final PsiElement t = PsiTreeUtil.findCommonParent(tag, xmlTag); + if (t instanceof XmlTag) { + tag = (XmlTag)t; + } + else { + break; + } + } + + // find the actual tag to create the variable before + final XmlTag[] subTags = tag.getSubTags(); + for (XmlTag xmlTag : subTags) { + if (xmlTag.getTextOffset() > firstUsage.getTextOffset()) break; + tag = xmlTag; + } + + final XmlTag parentTag = tag.getParentTag(); + if (parentTag == null) return tag; + + final String parentName = parentTag.getLocalName(); + if ("apply-templates".equals(parentName) || "call-template".equals(parentName) + || "when".equals(parentName) || "choose".equals(parentName)) { + if ("when".equals(parentName)) tag = tag.getParentTag(); assert tag != null; - return tag; + tag = tag.getParentTag(); + } + assert tag != null; + return tag; } @Nullable diff --git a/xml/dom-impl/src/com/intellij/util/dom/generator/ModelGen.java b/xml/dom-impl/src/com/intellij/util/dom/generator/ModelGen.java index 6c544ae4a064..b27d0a817b9d 100644 --- a/xml/dom-impl/src/com/intellij/util/dom/generator/ModelGen.java +++ b/xml/dom-impl/src/com/intellij/util/dom/generator/ModelGen.java @@ -15,6 +15,7 @@ */ package com.intellij.util.dom.generator; +import com.intellij.util.containers.ContainerUtil; import org.jdom.Element; import org.jdom.Document; import org.jdom.input.SAXBuilder; @@ -175,7 +176,7 @@ public class ModelGen { }; ArrayList files = new ArrayList(); for (File root : modelRoots) { - files.addAll(Arrays.asList(root.listFiles())); + ContainerUtil.addAll(files, root.listFiles()); } loader.loadModel(model, files, resolver); Util.log(model.jtMap.size() + " java types loaded"); diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java index d6a79f0b6e62..9c4276f64a43 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java @@ -25,6 +25,7 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiReference; import com.intellij.psi.xml.XmlElement; import com.intellij.util.SmartList; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xml.*; import com.intellij.util.xml.impl.ConvertContextImpl; import com.intellij.util.xml.impl.DomManagerImpl; @@ -109,11 +110,11 @@ public class DomElementAnnotationHolderImpl extends SmartList(initial, provider, validator); final Set intf = new HashSet(); - intf.addAll(Arrays.asList(initial.getClass().getInterfaces())); + ContainerUtil.addAll(intf, initial.getClass().getInterfaces()); intf.add(StableElement.class); //noinspection unchecked diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/StableInvocationHandler.java b/xml/dom-impl/src/com/intellij/util/xml/impl/StableInvocationHandler.java index 82f802f16ee4..b5b3f1da7618 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/StableInvocationHandler.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/StableInvocationHandler.java @@ -48,7 +48,7 @@ class StableInvocationHandler implements InvocationHandler, StableElement { myValidator = validator; final Class superClass = initial.getClass().getSuperclass(); final Set classes = new HashSet(); - classes.addAll(Arrays.asList(initial.getClass().getInterfaces())); + ContainerUtil.addAll(classes, initial.getClass().getInterfaces()); ContainerUtil.addIfNotNull(superClass, classes); classes.remove(MergedObject.class); myClasses = classes; diff --git a/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionsRegistrarImpl.java b/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionsRegistrarImpl.java index a4f75dec6ca2..206a72ca94c9 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionsRegistrarImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionsRegistrarImpl.java @@ -17,6 +17,7 @@ package com.intellij.util.xml.reflect; import com.intellij.util.SmartList; import com.intellij.util.ReflectionUtil; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xml.GenericAttributeValue; import com.intellij.util.xml.XmlName; import gnu.trove.THashSet; @@ -102,7 +103,7 @@ public class DomExtensionsRegistrarImpl implements DomExtensionsRegistrar { } public final void addDependencies(Object[] deps) { - myDependencies.addAll(Arrays.asList(deps)); + ContainerUtil.addAll(myDependencies, deps); } public Object[] getDependencies() { diff --git a/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java b/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java index 2f11e23434bb..bf224dc9d9a8 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/DomUtil.java @@ -273,7 +273,7 @@ public class DomUtil { public static Collection getAllInterfaces(final Class aClass, final Collection result) { final Class[] interfaces = ReflectionCache.getInterfaces(aClass); - result.addAll(Arrays.asList(interfaces)); + ContainerUtil.addAll(result, interfaces); if (aClass.getSuperclass() != null) { getAllInterfaces(aClass.getSuperclass(), result); } diff --git a/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java b/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java index d89aa4edab25..72b8c457aa68 100644 --- a/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java +++ b/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java @@ -24,6 +24,7 @@ import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.AddEditRemovePanel; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.Table; import com.intellij.util.ui.UIUtil; import com.intellij.xml.XmlBundle; @@ -162,7 +163,7 @@ public class ExternalResourceConfigurable extends BaseConfigurable implements Se myIgnoredUrls = new ArrayList(); final String[] ignoredResources = manager.getIgnoredResources(); - myIgnoredUrls.addAll(Arrays.asList(ignoredResources)); + ContainerUtil.addAll(myIgnoredUrls, ignoredResources); Collections.sort(myIgnoredUrls); diff --git a/xml/impl/src/com/intellij/lang/xml/XmlFileViewProvider.java b/xml/impl/src/com/intellij/lang/xml/XmlFileViewProvider.java index 5f5191200e27..7734c0bdb247 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlFileViewProvider.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlFileViewProvider.java @@ -21,6 +21,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.CompositeLanguageFileViewProvider; import com.intellij.psi.PsiManager; import com.intellij.psi.templateLanguages.TemplateLanguage; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import java.util.*; @@ -45,7 +46,7 @@ public class XmlFileViewProvider extends CompositeLanguageFileViewProvider { if (myRelevantLanguages != null) return myRelevantLanguages; List relevantLanguages = new ArrayList(1); relevantLanguages.add(myLanguage); - relevantLanguages.addAll(Arrays.asList(myLanguage.getLanguageExtensionsForFile(getPsi(myLanguage)))); + ContainerUtil.addAll(relevantLanguages, myLanguage.getLanguageExtensionsForFile(getPsi(myLanguage))); return myRelevantLanguages = new LinkedHashSet(relevantLanguages); } diff --git a/xml/impl/src/com/intellij/lang/xml/XmlFoldingBuilder.java b/xml/impl/src/com/intellij/lang/xml/XmlFoldingBuilder.java index e8f398487e11..d12add7330f6 100644 --- a/xml/impl/src/com/intellij/lang/xml/XmlFoldingBuilder.java +++ b/xml/impl/src/com/intellij/lang/xml/XmlFoldingBuilder.java @@ -30,6 +30,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.tree.TokenSet; import com.intellij.psi.xml.*; +import com.intellij.util.containers.ContainerUtil; import com.intellij.xml.util.XmlTagUtil; import org.jetbrains.annotations.NotNull; @@ -119,7 +120,7 @@ public class XmlFoldingBuilder implements FoldingBuilder, DumbAware { if (foldingBuilder != null) { final FoldingDescriptor[] foldingDescriptors = foldingBuilder.buildFoldRegions(child.getNode(), document); - foldings.addAll(Arrays.asList(foldingDescriptors)); + ContainerUtil.addAll(foldings, foldingDescriptors); } } } diff --git a/xml/impl/src/com/intellij/psi/CompositeLanguageFileViewProvider.java b/xml/impl/src/com/intellij/psi/CompositeLanguageFileViewProvider.java index fb51b7ad2d33..1d3a3679af06 100644 --- a/xml/impl/src/com/intellij/psi/CompositeLanguageFileViewProvider.java +++ b/xml/impl/src/com/intellij/psi/CompositeLanguageFileViewProvider.java @@ -28,6 +28,7 @@ import com.intellij.psi.templateLanguages.OuterLanguageElement; import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.ReflectionCache; import com.intellij.util.containers.ConcurrentHashMap; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -129,7 +130,7 @@ public class CompositeLanguageFileViewProvider extends SingleRootFileViewProvide public FileElement[] getKnownTreeRoots() { final List knownRoots = new ArrayList(); - knownRoots.addAll(Arrays.asList(super.getKnownTreeRoots())); + ContainerUtil.addAll(knownRoots, super.getKnownTreeRoots()); for (PsiFile psiFile : myRoots.values()) { if (psiFile == null || !(psiFile instanceof PsiFileImpl)) continue; final FileElement fileElement = ((PsiFileImpl)psiFile).getTreeElement(); diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java index ddfe1b03a6f6..dca64449f5ee 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java @@ -33,6 +33,7 @@ import com.intellij.psi.filters.ElementFilter; import com.intellij.psi.xml.XmlAttribute; import com.intellij.util.ArrayUtil; import com.intellij.util.ProcessingContext; +import com.intellij.util.containers.ContainerUtil; import com.intellij.xml.util.XmlUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -127,7 +128,7 @@ public class URIReferenceProvider extends PsiReferenceProvider { offset = text.indexOf(url); if (isUrlText(url, element.getProject())) refs.add(new DependentNSReference(element, new TextRange(offset,offset + url.length()), urlReference)); else { - refs.addAll(Arrays.asList(new FileReferenceSet(url, element, offset, this, false).getAllReferences())); + ContainerUtil.addAll(refs, new FileReferenceSet(url, element, offset, this, false).getAllReferences()); } } diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java index 3561404b022d..b85b302997f9 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java +++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java @@ -751,14 +751,14 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag { } if (parentElement instanceof XmlTag) { if (known.isEmpty()) return ((XmlTag)parentElement).knownNamespaces(); - known.addAll(Arrays.asList(((XmlTag)parentElement).knownNamespaces())); + ContainerUtil.addAll(known, ((XmlTag)parentElement).knownNamespaces()); } else { final XmlFile xmlFile = XmlExtension.getExtensionByElement(this).getContainingFile(this); final XmlTag rootTag = xmlFile.getDocument().getRootTag(); if (rootTag != null && rootTag != this) { if (known.isEmpty()) return rootTag.knownNamespaces(); - known.addAll(Arrays.asList(rootTag.knownNamespaces())); + ContainerUtil.addAll(known, rootTag.knownNamespaces()); } } return ArrayUtil.toStringArray(known); diff --git a/xml/impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java b/xml/impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java index db0846e4e51b..4987b58efa92 100644 --- a/xml/impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java +++ b/xml/impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java @@ -30,6 +30,7 @@ import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.*; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import com.intellij.xml.XmlAttributeDescriptor; import com.intellij.xml.XmlElementDescriptor; import com.intellij.xml.XmlNSDescriptor; @@ -126,12 +127,12 @@ public class XmlElementDescriptorImpl extends BaseXmlElementDescriptorImpl imple } else if (token.getTokenType() == XmlTokenType.XML_CONTENT_ANY) { if (NSDescriptor instanceof XmlNSDescriptorImpl) { - result.addAll(Arrays.asList(((XmlNSDescriptorImpl) NSDescriptor).getElements())); + ContainerUtil.addAll(result, ((XmlNSDescriptorImpl)NSDescriptor).getElements()); } else if (NSDescriptor instanceof XmlNSDescriptorSequence) { for (XmlNSDescriptor xmlNSDescriptor : ((XmlNSDescriptorSequence)NSDescriptor).getSequence()) { if (xmlNSDescriptor instanceof XmlNSDescriptorImpl) { - result.addAll(Arrays.asList(((XmlNSDescriptorImpl) xmlNSDescriptor).getElements())); + ContainerUtil.addAll(result, ((XmlNSDescriptorImpl)xmlNSDescriptor).getElements()); } } } diff --git a/xml/impl/src/com/intellij/xml/util/HtmlUtil.java b/xml/impl/src/com/intellij/xml/util/HtmlUtil.java index 1b115a97b72f..8cac46dcc475 100644 --- a/xml/impl/src/com/intellij/xml/util/HtmlUtil.java +++ b/xml/impl/src/com/intellij/xml/util/HtmlUtil.java @@ -42,6 +42,7 @@ import com.intellij.psi.xml.XmlElement; import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; import com.intellij.util.ArrayUtil; +import com.intellij.util.containers.ContainerUtil; import com.intellij.xml.XmlAttributeDescriptor; import com.intellij.xml.XmlElementDescriptor; import com.intellij.xml.impl.schema.XmlAttributeDescriptorImpl; @@ -102,12 +103,12 @@ public class HtmlUtil { private static final Set POSSIBLY_INLINE_TAGS_MAP = new THashSet(); static { - EMPTY_TAGS_MAP.addAll(Arrays.asList(EMPTY_TAGS)); - EMPTY_ATTRS_MAP.addAll(Arrays.asList(EMPTY_ATTRS)); - OPTIONAL_END_TAGS_MAP.addAll(Arrays.asList(OPTIONAL_END_TAGS)); - BLOCK_TAGS_MAP.addAll(Arrays.asList(BLOCK_TAGS)); - INLINE_ELEMENTS_CONTAINER_MAP.addAll(Arrays.asList(INLINE_ELEMENTS_CONTAINER)); - POSSIBLY_INLINE_TAGS_MAP.addAll(Arrays.asList(POSSIBLY_INLINE_TAGS)); + ContainerUtil.addAll(EMPTY_TAGS_MAP, EMPTY_TAGS); + ContainerUtil.addAll(EMPTY_ATTRS_MAP, EMPTY_ATTRS); + ContainerUtil.addAll(OPTIONAL_END_TAGS_MAP, OPTIONAL_END_TAGS); + ContainerUtil.addAll(BLOCK_TAGS_MAP, BLOCK_TAGS); + ContainerUtil.addAll(INLINE_ELEMENTS_CONTAINER_MAP, INLINE_ELEMENTS_CONTAINER); + ContainerUtil.addAll(POSSIBLY_INLINE_TAGS_MAP, POSSIBLY_INLINE_TAGS); } public static boolean isSingleHtmlTag(String tagName) { diff --git a/xml/impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java b/xml/impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java index 2c33dca468c5..b3647878f273 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java +++ b/xml/impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java @@ -19,6 +19,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.xml.XmlDocument; import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; +import com.intellij.util.containers.ContainerUtil; import com.intellij.xml.XmlElementDescriptor; import com.intellij.xml.XmlNSDescriptor; import org.jetbrains.annotations.NotNull; @@ -67,9 +68,9 @@ public class XmlNSDescriptorSequence implements XmlNSDescriptor{ public XmlElementDescriptor[] getRootElementsDescriptors(@Nullable final XmlDocument document) { final List descriptors = new ArrayList(); final Iterator iterator = sequence.iterator(); - while(iterator.hasNext()){ - final XmlNSDescriptor descriptor = (XmlNSDescriptor) iterator.next(); - descriptors.addAll(Arrays.asList(descriptor.getRootElementsDescriptors(document))); + while(iterator.hasNext()) { + final XmlNSDescriptor descriptor = (XmlNSDescriptor)iterator.next(); + ContainerUtil.addAll(descriptors, descriptor.getRootElementsDescriptors(document)); } return descriptors.toArray(new XmlElementDescriptor[descriptors.size()]); @@ -139,9 +140,9 @@ public class XmlNSDescriptorSequence implements XmlNSDescriptor{ public Object[] getDependences(){ final List ret = new ArrayList(); final Iterator iterator = sequence.iterator(); - while(iterator.hasNext()){ - final XmlNSDescriptor descriptor = (XmlNSDescriptor) iterator.next(); - ret.addAll(Arrays.asList(descriptor.getDependences())); + while(iterator.hasNext()) { + final XmlNSDescriptor descriptor = (XmlNSDescriptor)iterator.next(); + ContainerUtil.addAll(ret, descriptor.getDependences()); } return ret.toArray(); }