diff --git a/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.java index 23f5255cf88b..4ce292084b14 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.java @@ -36,6 +36,7 @@ import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.util.NullableFunction; +import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashSet; import gnu.trove.TObjectHashingStrategy; @@ -148,8 +149,7 @@ public class ValidationConfigurable implements SearchableConfigurable, Configura private List getValidators() { final CompilerManager compilerManager = CompilerManager.getInstance(myProject); - final List validators = new ArrayList<>(); - validators.addAll(Arrays.asList(compilerManager.getCompilers(Validator.class))); + final List validators = new SmartList<>(compilerManager.getCompilers(Validator.class)); for (GenericCompiler compiler : compilerManager.getCompilers(GenericCompiler.class)) { if (compiler.getOrderPlace() == GenericCompiler.CompileOrderPlace.VALIDATING) { validators.add(compiler); diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java index a58a9ada8aec..69163219ec28 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java @@ -22,6 +22,7 @@ import com.intellij.ide.util.projectWizard.WizardContext; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.roots.ui.configuration.ModulesProvider; import com.intellij.openapi.util.Pair; +import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NonNls; @@ -31,14 +32,14 @@ import org.jetbrains.annotations.Nullable; import java.util.*; public class StepSequence { - private final List myCommonSteps = new ArrayList<>(); + private final List myCommonSteps; private final List>> myCommonFinishingSteps = new ArrayList<>(); private final MultiMap mySpecificSteps = new MultiMap<>(); @NonNls private List myTypes = new ArrayList<>(); private List mySelectedSteps; public StepSequence(ModuleWizardStep... commonSteps) { - myCommonSteps.addAll(Arrays.asList(commonSteps)); + myCommonSteps = new SmartList<>(commonSteps); } public void addCommonStep(@NotNull ModuleWizardStep step){ diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java index c83cd6b59b67..32d6808d30b0 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java @@ -33,6 +33,7 @@ import com.intellij.psi.scope.processor.VariablesProcessor; import com.intellij.psi.scope.util.PsiScopesUtil; import com.intellij.psi.util.*; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; import com.intellij.util.containers.HashSet; import org.jetbrains.annotations.NonNls; @@ -234,7 +235,7 @@ public class GenerateDelegateHandler implements LanguageCodeInsightActionHandler if (targetClass instanceof PsiTypeParameter) { LinkedHashSet meths = new LinkedHashSet<>(); for (PsiClass superClass : targetClass.getSupers()) { - meths.addAll(Arrays.asList(superClass.getAllMethods())); + ContainerUtil.addAll(meths, superClass.getAllMethods()); } allMethods = meths.toArray(new PsiMethod[meths.size()]); } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PsiPackageReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PsiPackageReference.java index 658ea9b99826..6a7e652b46d1 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PsiPackageReference.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PsiPackageReference.java @@ -20,9 +20,12 @@ import com.intellij.codeInsight.daemon.JavaErrorMessages; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import java.util.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; public class PsiPackageReference extends PsiPolyVariantReferenceBase implements EmptyResolveMessageProvider { private final PackageReferenceSet myReferenceSet; @@ -52,7 +55,7 @@ public class PsiPackageReference extends PsiPolyVariantReferenceBase public Object[] getVariants() { Set subPackages = new HashSet<>(); for (PsiPackage psiPackage : getContext()) { - subPackages.addAll(Arrays.asList(psiPackage.getSubPackages(myReferenceSet.getResolveScope()))); + ContainerUtil.addAll(subPackages, psiPackage.getSubPackages(myReferenceSet.getResolveScope())); } return subPackages.toArray(); } diff --git a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java index 3a17ca5cc22b..dfcf46afc401 100644 --- a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java +++ b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java @@ -59,6 +59,7 @@ import com.intellij.testIntegration.TestFramework; import com.intellij.testIntegration.TestIntegrationUtils; import com.intellij.ui.*; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.JBUI; import org.jetbrains.annotations.NotNull; @@ -355,8 +356,7 @@ public class CreateTestDialog extends DialogWrapper { final DefaultComboBoxModel model = (DefaultComboBoxModel)myLibrariesCombo.getModel(); - final List descriptors = new ArrayList<>(); - descriptors.addAll(Arrays.asList(Extensions.getExtensions(TestFramework.EXTENSION_NAME))); + final List descriptors = new SmartList<>(Extensions.getExtensions(TestFramework.EXTENSION_NAME)); descriptors.sort((d1, d2) -> Comparing.compare(d1.getName(), d2.getName())); for (final TestFramework descriptor : descriptors) { diff --git a/platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadAssistant.java b/platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadAssistant.java index 71b0c9fb04ab..d82e1bdb120a 100644 --- a/platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadAssistant.java +++ b/platform/lang-api/src/com/intellij/facet/frameworks/LibrariesDownloadAssistant.java @@ -6,9 +6,7 @@ import com.intellij.facet.frameworks.beans.Artifacts; import com.intellij.facet.ui.libraries.LibraryInfo; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import com.intellij.util.net.HttpConfigurable; @@ -79,7 +77,7 @@ public class LibrariesDownloadAssistant { if (allArtifacts != null) { final Artifact[] vers = allArtifacts.getArtifacts(); if (vers != null) { - versions.addAll(Arrays.asList(vers)); + ContainerUtil.addAll(versions, Arrays.asList(vers)); } } } diff --git a/platform/lang-api/src/com/intellij/facet/frameworks/ui/LibrariesDownloadUiUtil.java b/platform/lang-api/src/com/intellij/facet/frameworks/ui/LibrariesDownloadUiUtil.java index ec41a4b819c5..010de0dcce9c 100644 --- a/platform/lang-api/src/com/intellij/facet/frameworks/ui/LibrariesDownloadUiUtil.java +++ b/platform/lang-api/src/com/intellij/facet/frameworks/ui/LibrariesDownloadUiUtil.java @@ -19,6 +19,7 @@ import com.intellij.facet.frameworks.LibrariesDownloadAssistant; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.ui.CollectionComboBoxModel; +import com.intellij.util.SmartList; import com.intellij.util.ui.update.Activatable; import com.intellij.util.ui.update.UiNotifyConnector; import org.jetbrains.annotations.NotNull; @@ -26,7 +27,6 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.net.URL; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -73,8 +73,7 @@ public class LibrariesDownloadUiUtil { final URL... localUrls) { final ModalityState state = ModalityState.current(); ApplicationManager.getApplication().executeOnPooledThread(() -> { - final List newItems = new ArrayList<>(); - newItems.addAll(Arrays.asList(LibrariesDownloadAssistant.getVersions(groupId, localUrls))); + final List newItems = new SmartList<>(LibrariesDownloadAssistant.getVersions(groupId, localUrls)); ApplicationManager.getApplication().invokeLater(() -> { items.clear(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java index 84b68a336f6a..0b4db7844b8f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java @@ -48,6 +48,7 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.ProjectScope; import com.intellij.util.ArrayUtil; import com.intellij.util.ProcessingContext; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -218,7 +219,7 @@ public class FilePathCompletionContributor extends CompletionContributor { final ChooseByNameContributor[] nameContributors = ChooseByNameContributor.FILE_EP_NAME.getExtensions(); for (final ChooseByNameContributor contributor : nameContributors) { try { - names.addAll(Arrays.asList(contributor.getNames(project, false))); + ContainerUtil.addAll(names, contributor.getNames(project, false)); } catch (ProcessCanceledException ex) { // index corruption detected, ignore diff --git a/platform/lang-impl/src/com/intellij/ide/util/StructureViewCompositeModel.java b/platform/lang-impl/src/com/intellij/ide/util/StructureViewCompositeModel.java index 36cc762505a2..33aff66e0f2f 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/StructureViewCompositeModel.java +++ b/platform/lang-impl/src/com/intellij/ide/util/StructureViewCompositeModel.java @@ -26,11 +26,15 @@ import com.intellij.ide.util.treeView.smartTree.TreeElement; import com.intellij.navigation.ItemPresentation; import com.intellij.openapi.Disposable; import com.intellij.psi.PsiFile; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; /** * @author Konstantin Bulenkov @@ -102,7 +106,7 @@ public class StructureViewCompositeModel extends StructureViewModelBase implemen final HashSet filters = new HashSet<>(); for (StructureViewComposite.StructureViewDescriptor view : myViews) { final StructureViewModel model = view.structureView.getTreeModel(); - filters.addAll(Arrays.asList(model.getFilters())); + ContainerUtil.addAll(filters, model.getFilters()); } return filters.toArray(new Filter[filters.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 a47e25a69b99..d293573dbf45 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 @@ -196,7 +196,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis Set providers = new HashSet<>(); List composites = getEditorComposites(file); for (EditorWithProviderComposite composite : composites) { - providers.addAll(Arrays.asList(composite.getProviders())); + ContainerUtil.addAll(providers, composite.getProviders()); } FileEditorProvider[] newProviders = FileEditorProviderManager.getInstance().getProviders(project, file); if (newProviders.length > providers.size()) { @@ -485,7 +485,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis Set all = getAllSplitters(); for (EditorsSplitters each : all) { EditorWindow[] eachList = each.getWindows(); - windows.addAll(Arrays.asList(eachList)); + ContainerUtil.addAll(windows, eachList); } return windows.toArray(new EditorWindow[windows.size()]); @@ -1216,7 +1216,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis public VirtualFile[] getOpenFiles() { Set openFiles = new THashSet<>(); for (EditorsSplitters each : getAllSplitters()) { - openFiles.addAll(Arrays.asList(each.getOpenFiles())); + ContainerUtil.addAll(openFiles, each.getOpenFiles()); } return VfsUtilCore.toVirtualFileArray(openFiles); } @@ -1226,10 +1226,10 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis public VirtualFile[] getSelectedFiles() { Set selectedFiles = new LinkedHashSet<>(); EditorsSplitters activeSplitters = getSplitters(); - selectedFiles.addAll(Arrays.asList(activeSplitters.getSelectedFiles())); + ContainerUtil.addAll(selectedFiles, activeSplitters.getSelectedFiles()); for (EditorsSplitters each : getAllSplitters()) { if (each != activeSplitters) { - selectedFiles.addAll(Arrays.asList(each.getSelectedFiles())); + ContainerUtil.addAll(selectedFiles, each.getSelectedFiles()); } } return VfsUtilCore.toVirtualFileArray(selectedFiles); @@ -1240,7 +1240,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Persis public FileEditor[] getSelectedEditors() { Set selectedEditors = new HashSet<>(); for (EditorsSplitters each : getAllSplitters()) { - selectedEditors.addAll(Arrays.asList(each.getSelectedEditors())); + ContainerUtil.addAll(selectedEditors, each.getSelectedEditors()); } return selectedEditors.toArray(new FileEditor[selectedEditors.size()]); diff --git a/plugins/git4idea/src/git4idea/history/GitLogRecordCollector.java b/plugins/git4idea/src/git4idea/history/GitLogRecordCollector.java index d49cc4fcf162..9d23de9b5a60 100644 --- a/plugins/git4idea/src/git4idea/history/GitLogRecordCollector.java +++ b/plugins/git4idea/src/git4idea/history/GitLogRecordCollector.java @@ -130,7 +130,7 @@ abstract class GitLogRecordCollector implements Consumer { for (GitLogRecord r : records) { hashes.add(r.getHash()); - hashes.addAll(Arrays.asList(r.getParentsHashes())); + ContainerUtil.addAll(hashes, r.getParentsHashes()); } GitSimpleHandler handler = new GitSimpleHandler(myProject, myRoot, GitCommand.LOG); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/TransformationContextImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/TransformationContextImpl.java index 80cbeb8c502d..ade2f1b3a539 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/TransformationContextImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/TransformationContextImpl.java @@ -128,7 +128,7 @@ public class TransformationContextImpl implements TransformationContext { for (PsiClassType type: superTypes) { PsiClass psiClass = type.resolve(); if (psiClass != null) { - fields.addAll(Arrays.asList(psiClass.getAllFields())); + ContainerUtil.addAll(fields, psiClass.getAllFields()); } } return fields;