From e2cdf406a392e9125d89753f143c4fdd54162753 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 27 Jan 2014 15:08:25 +0400 Subject: [PATCH] CR-IC-4094 (confusing methods united) --- .../intellij/psi/impl/compiled/ClsElementImpl.java | 4 ++-- .../src/com/intellij/ide/wizard/AbstractWizard.java | 4 ++-- .../vfs/newvfs/persistent/PersistentFSImpl.java | 2 +- .../platform-impl/src/com/intellij/ui/AppUIUtil.java | 2 +- .../intellij/ui/mac/MacFileChooserDialogImpl.java | 4 ++-- .../intellij/util/containers/ContainerUtilRt.java | 12 ++++-------- .../src/com/intellij/execution/CommandLineUtil.java | 4 ++-- .../com/intellij/util/containers/ContainerUtil.java | 5 +++-- .../plugins/intelliLang/inject/InjectorUtils.java | 4 ++-- 9 files changed, 19 insertions(+), 22 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java index 3fbfc4ba69c2..5bc4c6136140 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -95,7 +95,7 @@ public abstract class ClsElementImpl extends PsiElementBase implements PsiCompil return PsiElement.EMPTY_ARRAY; } - List list = ContainerUtil.newArrayListWithExpectedSize(children.length); + List list = ContainerUtil.newArrayListWithCapacity(children.length); for (PsiElement child : children) { if (child != null) { list.add(child); diff --git a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java index 7c379da95244..42a94872667f 100644 --- a/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java +++ b/platform/platform-api/src/com/intellij/ide/wizard/AbstractWizard.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -150,7 +150,7 @@ public abstract class AbstractWizard extends DialogWrapper { final GroupLayout.SequentialGroup hGroup = layout.createSequentialGroup(); final GroupLayout.ParallelGroup vGroup = layout.createParallelGroup(); - final Collection buttons = ContainerUtil.newArrayListWithExpectedSize(5); + final Collection buttons = ContainerUtil.newArrayListWithCapacity(5); final boolean helpAvailable = ApplicationInfo.contextHelpAvailable(); if (helpAvailable && UIUtil.isUnderGTKLookAndFeel()) { diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java index b8be33704761..03b63092d597 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java @@ -176,7 +176,7 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone } final TIntArrayList childrenIds = new TIntArrayList(current.length + toAdd.size()); - final List nameIds = ContainerUtil.newArrayListWithExpectedSize(current.length + toAdd.size()); + final List nameIds = ContainerUtil.newArrayListWithCapacity(current.length + toAdd.size()); for (FSRecords.NameId nameId : current) { childrenIds.add(nameId.id); nameIds.add(nameId); diff --git a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java index fdb636958945..83deff30faee 100644 --- a/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java +++ b/platform/platform-impl/src/com/intellij/ui/AppUIUtil.java @@ -56,7 +56,7 @@ public class AppUIUtil { @SuppressWarnings({"UnnecessaryFullyQualifiedName", "deprecation"}) private static List getAppIconImages() { ApplicationInfoEx appInfo = ApplicationInfoImpl.getShadowInstance(); - List images = ContainerUtil.newArrayListWithExpectedSize(3); + List images = ContainerUtil.newArrayListWithCapacity(3); if (SystemInfo.isXWindow) { String bigIconUrl = appInfo.getBigIconUrl(); diff --git a/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java b/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java index 3f58842fadf3..2d673f8c86af 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/MacFileChooserDialogImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -152,7 +152,7 @@ public class MacFileChooserDialogImpl implements PathChooserDialog { } final LocalFileSystem fs = LocalFileSystem.getInstance(); - final List files = ContainerUtil.newArrayListWithExpectedSize(paths.size()); + final List files = ContainerUtil.newArrayListWithCapacity(paths.size()); for (String path : paths) { final String vfsPath = FileUtil.toSystemIndependentName(path); final VirtualFile file = fs.refreshAndFindFileByPath(vfsPath); diff --git a/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java b/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java index 7a6ff1562f93..e4b3153917f7 100644 --- a/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java +++ b/platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java @@ -126,7 +126,7 @@ public class ContainerUtilRt { @NotNull public static ArrayList newArrayList(@NotNull T... elements) { - ArrayList list = new ArrayList(elements.length); + ArrayList list = newArrayListWithCapacity(elements.length); Collections.addAll(list, elements); return list; } @@ -140,18 +140,14 @@ public class ContainerUtilRt { return copy(ContainerUtilRt.newArrayList(), elements); } - @NotNull + /** @deprecated Use {@link #newArrayListWithCapacity(int)} (to remove in IDEA 15) */ public static ArrayList newArrayListWithExpectedSize(int size) { - return new ArrayList(size); + return newArrayListWithCapacity(size); } @NotNull public static ArrayList newArrayListWithCapacity(int size) { - return new ArrayList(computeArrayListCapacity(size)); - } - - private static int computeArrayListCapacity(int size) { - return 5 + size + size / 5; + return new ArrayList(size); } @NotNull diff --git a/platform/util/src/com/intellij/execution/CommandLineUtil.java b/platform/util/src/com/intellij/execution/CommandLineUtil.java index a47d649d5d2e..107131daca53 100644 --- a/platform/util/src/com/intellij/execution/CommandLineUtil.java +++ b/platform/util/src/com/intellij/execution/CommandLineUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ public class CommandLineUtil { // please keep an implementation in sync with [junit-rt] ProcessBuilder.createProcess() @NotNull public static List toCommandLine(@NotNull String command, @NotNull List parameters, @NotNull Platform platform) { - List commandLine = ContainerUtil.newArrayListWithExpectedSize(parameters.size() + 1); + List commandLine = ContainerUtil.newArrayListWithCapacity(parameters.size() + 1); commandLine.add(FileUtilRt.toSystemDependentName(command, platform.fileSeparator)); diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index 7e41f2a8859c..1edda3521fd8 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -150,9 +150,10 @@ public class ContainerUtil extends ContainerUtilRt { return ContainerUtilRt.newArrayList(iterable); } - @NotNull + /** @deprecated Use {@link #newArrayListWithCapacity(int)} (to remove in IDEA 15) */ + @SuppressWarnings("deprecation") public static ArrayList newArrayListWithExpectedSize(int size) { - return ContainerUtilRt.newArrayListWithExpectedSize(size); + return ContainerUtilRt.newArrayListWithCapacity(size); } @NotNull diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectorUtils.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectorUtils.java index 01a76297235d..4211fdf53a74 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectorUtils.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/InjectorUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -68,7 +68,7 @@ public class InjectorUtils { InjectedLanguage.create(injection.getInjectedLanguageId(), injection.getPrefix(), injection.getSuffix(), false); List ranges = injection.getInjectedArea(host); - List> list = ContainerUtil.newArrayListWithExpectedSize(ranges.size()); + List> list = ContainerUtil.newArrayListWithCapacity(ranges.size()); for (TextRange range : ranges) { list.add(Trinity.create(host, injectedLanguage, range));