From 44b584a72dd16bf97bd6e17c2be3e467fc9dea23 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 29 Dec 2014 11:24:36 +0100 Subject: [PATCH] CR-IC-6786 createSmartList -> createSmart --- .../templates/ArchivedTemplatesFactory.java | 2 +- .../platform/templates/RemoteTemplatesFactory.java | 14 ++++++-------- .../ide/projectWizard/ProjectWizardTestCase.java | 4 ++-- .../daemon/impl/HighlightersRecycler.java | 2 +- .../ide/plugins/IdeaPluginDescriptorImpl.java | 4 ++-- .../extensions/impl/ExtensionsAreaImpl.java | 2 +- .../psi/impl/search/PsiSearchHelperImpl.java | 2 +- .../impl/LiftShorterItemsClassifier.java | 2 +- .../daemon/impl/PassExecutorService.java | 4 ++-- .../src/com/intellij/semantic/SemServiceImpl.java | 4 ++-- .../com/intellij/openapi/roots/impl/RootIndex.java | 12 ++++++------ .../src/com/intellij/util/containers/MultiMap.java | 12 +++++++++++- .../src/com/intellij/vcs/log/data/RefsModel.java | 2 +- .../cvsSupport2/actions/IgnoreFileAction.java | 5 +++-- 14 files changed, 40 insertions(+), 31 deletions(-) diff --git a/java/idea-ui/src/com/intellij/platform/templates/ArchivedTemplatesFactory.java b/java/idea-ui/src/com/intellij/platform/templates/ArchivedTemplatesFactory.java index d57c45019f5d..7a01d37ed84b 100644 --- a/java/idea-ui/src/com/intellij/platform/templates/ArchivedTemplatesFactory.java +++ b/java/idea-ui/src/com/intellij/platform/templates/ArchivedTemplatesFactory.java @@ -52,7 +52,7 @@ public class ArchivedTemplatesFactory extends ProjectTemplatesFactory { @NotNull @Override protected MultiMap> compute() { - MultiMap> map = MultiMap.createSmartList(); + MultiMap> map = MultiMap.createSmart(); Map urls = new THashMap(); //for (IdeaPluginDescriptor plugin : plugins) { // if (!plugin.isEnabled()) continue; diff --git a/java/idea-ui/src/com/intellij/platform/templates/RemoteTemplatesFactory.java b/java/idea-ui/src/com/intellij/platform/templates/RemoteTemplatesFactory.java index c7365ab04685..6912b7c62586 100644 --- a/java/idea-ui/src/com/intellij/platform/templates/RemoteTemplatesFactory.java +++ b/java/idea-ui/src/com/intellij/platform/templates/RemoteTemplatesFactory.java @@ -105,24 +105,22 @@ public class RemoteTemplatesFactory extends ProjectTemplatesFactory { @NotNull private static MultiMap create(@NotNull Element element) throws IOException, JDOMException { - MultiMap map = MultiMap.createSmartList(); + MultiMap map = MultiMap.createSmart(); for (ArchivedProjectTemplate template : createGroupTemplates(element)) { map.putValue(template.getCategory(), template); } return map; } - @SuppressWarnings("unchecked") private static List createGroupTemplates(Element groupElement) { - List elements = groupElement.getChildren(TEMPLATE); - return ContainerUtil.mapNotNull(elements, new NullableFunction() { + return ContainerUtil.mapNotNull(groupElement.getChildren(TEMPLATE), new NullableFunction() { @Override public ArchivedProjectTemplate fun(final Element element) { - if (!checkRequiredPlugins(element)) return null; - String type = element.getChildText("moduleType"); - - final ModuleType moduleType = ModuleTypeManager.getInstance().findByID(type); + if (!checkRequiredPlugins(element)) { + return null; + } + final ModuleType moduleType = ModuleTypeManager.getInstance().findByID(element.getChildText("moduleType")); final String path = element.getChildText("path"); final String description = element.getChildTextTrim("description"); String name = element.getChildTextTrim("name"); diff --git a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java index 25751535842a..7b90fa69b0a2 100644 --- a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java +++ b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java @@ -182,8 +182,8 @@ public abstract class ProjectWizardTestCase ext mySdks.add(defaultJdk); mySdks.add(otherJdk); - Sdk[] jdks = jdkTable.getAllJdks(); - System.out.println(Arrays.asList(jdks)); + //noinspection UseOfSystemOutOrSystemErr + System.out.println(Arrays.asList(jdkTable.getAllJdks())); if (getName().contains("DefaultSdk")) { Project defaultProject = ProjectManager.getInstance().getDefaultProject(); diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightersRecycler.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightersRecycler.java index bca7c45d12a7..20924c55615f 100644 --- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightersRecycler.java +++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightersRecycler.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; class HighlightersRecycler { - private final MultiMap incinerator = MultiMap.createSmartList(); + private final MultiMap incinerator = MultiMap.createSmart(); void recycleHighlighter(@NotNull RangeHighlighter highlighter) { if (highlighter.isValid()) { diff --git a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java index 7cc18c4eadeb..9c4d5b780d46 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java +++ b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java @@ -278,7 +278,7 @@ public class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor { StringInterner interner = new StringInterner(); List extensions = copyElements(pluginBean.extensions, interner); if (extensions != null) { - myExtensions = MultiMap.createSmartList(); + myExtensions = MultiMap.createSmart(); for (Element extension : extensions) { myExtensions.putValue(ExtensionsAreaImpl.extractEPName(extension), extension); } @@ -286,7 +286,7 @@ public class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor { List extensionPoints = copyElements(pluginBean.extensionPoints, interner); if (extensionPoints != null) { - myExtensionsPoints = MultiMap.createSmartList(); + myExtensionsPoints = MultiMap.createSmart(); for (Element extensionPoint : extensionPoints) { myExtensionsPoints.putValue(StringUtil.notNullize(extensionPoint.getAttributeValue(ExtensionsAreaImpl.ATTRIBUTE_AREA)), extensionPoint); } diff --git a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java index dda3a4ab087d..202dd05890af 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/impl/ExtensionsAreaImpl.java @@ -49,7 +49,7 @@ public class ExtensionsAreaImpl implements ExtensionsArea { private final Throwable myCreationTrace; private final Map myExtensionPoints = ContainerUtil.newConcurrentMap(); private final Map myEPTraces = DEBUG_REGISTRATION ? new THashMap():null; - private final MultiMap myAvailabilityListeners = MultiMap.createSmartList(); + private final MultiMap myAvailabilityListeners = MultiMap.createSmart(); private final List mySuspendedListenerActions = new ArrayList(); private boolean myAvailabilityNotificationsActive = true; diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java index 5288199bcaaf..358b61e2af29 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java @@ -854,7 +854,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper { @NotNull private static MultiMap createMultiMap() { // usually there is just one request - return MultiMap.createSmartList(); + return MultiMap.createSmart(); } @NotNull diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java index 821d16a7b52b..d59f6188fe40 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java @@ -34,7 +34,7 @@ import static com.intellij.util.containers.ContainerUtil.newIdentityTroveSet; */ public class LiftShorterItemsClassifier extends Classifier { private final TreeSet mySortedStrings = new TreeSet(); - private final MultiMap myElements = MultiMap.createSmartList(); + private final MultiMap myElements = MultiMap.createSmart(); private final Map> myToLift = newIdentityHashMap(); private final IdentityHashMap, IdentityHashMap>> myPrepends = newIdentityHashMap(); private final String myName; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java index b4e5f250d4a5..75226646b8e3 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java @@ -114,8 +114,8 @@ public class PassExecutorService implements Disposable { // null keys are ok MultiMap documentToEditors = MultiMap.createSet(); - MultiMap documentBoundPasses = MultiMap.createSmartList(); - MultiMap editorBoundPasses = MultiMap.createSmartList(); + MultiMap documentBoundPasses = MultiMap.createSmart(); + MultiMap editorBoundPasses = MultiMap.createSmart(); for (Map.Entry entry : passesMap.entrySet()) { FileEditor fileEditor = entry.getKey(); HighlightingPass[] passes = entry.getValue(); diff --git a/platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java b/platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java index 905b1928d7f9..c336fb7b2e96 100644 --- a/platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java +++ b/platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java @@ -94,7 +94,7 @@ public class SemServiceImpl extends SemService{ } private static MultiMap cacheKeyHierarchy(Collection allKeys) { - final MultiMap result = MultiMap.createSmartList(); + final MultiMap result = MultiMap.createSmart(); ContainerUtil.process(allKeys, new Processor() { @Override public boolean process(SemKey key) { @@ -115,7 +115,7 @@ public class SemServiceImpl extends SemService{ } private MultiMap> collectProducers() { - final MultiMap> map = MultiMap.createSmartList(); + final MultiMap> map = MultiMap.createSmart(); final SemRegistrar registrar = new SemRegistrar() { @Override diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java index 2d3c4fcc650d..50a7e625757c 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootIndex.java @@ -174,9 +174,9 @@ public class RootIndex { Map result = myOrderEntries; if (result != null) return result; - MultiMap libClassRootEntries = MultiMap.createSmartList(); - MultiMap libSourceRootEntries = MultiMap.createSmartList(); - MultiMap depEntries = MultiMap.createSmartList(); + MultiMap libClassRootEntries = MultiMap.createSmart(); + MultiMap libSourceRootEntries = MultiMap.createSmart(); + MultiMap depEntries = MultiMap.createSmart(); for (final Module module : ModuleManager.getInstance(myProject).getModules()) { final ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(module); @@ -442,9 +442,9 @@ public class RootIndex { @NotNull final Map contentRootOf = ContainerUtil.newHashMap(); @NotNull final MultiMap sourceRootOf = MultiMap.createSet(); @NotNull final TObjectIntHashMap rootTypeId = new TObjectIntHashMap(); - @NotNull final MultiMap excludedFromLibraries = MultiMap.createSmartList(); - @NotNull final MultiMap classOfLibraries = MultiMap.createSmartList(); - @NotNull final MultiMap sourceOfLibraries = MultiMap.createSmartList(); + @NotNull final MultiMap excludedFromLibraries = MultiMap.createSmart(); + @NotNull final MultiMap classOfLibraries = MultiMap.createSmart(); + @NotNull final MultiMap sourceOfLibraries = MultiMap.createSmart(); @NotNull final Set excludedFromProject = ContainerUtil.newHashSet(); @NotNull final Map excludedFromModule = ContainerUtil.newHashMap(); @NotNull final Map packagePrefix = ContainerUtil.newHashMap(); diff --git a/platform/util/src/com/intellij/util/containers/MultiMap.java b/platform/util/src/com/intellij/util/containers/MultiMap.java index cdb0f1298a8d..a68cc516dd87 100644 --- a/platform/util/src/com/intellij/util/containers/MultiMap.java +++ b/platform/util/src/com/intellij/util/containers/MultiMap.java @@ -26,7 +26,7 @@ import java.io.Serializable; import java.util.*; /** - * Consider to use factory methods {@link #createLinked()}, {@link #createSet()}, {@link #createSmartList()}, {@link #create(gnu.trove.TObjectHashingStrategy)} instead of override. + * Consider to use factory methods {@link #createLinked()}, {@link #createSet()}, {@link #createSmart()}, {@link #create(gnu.trove.TObjectHashingStrategy)} instead of override. * @see com.intellij.util.containers.BidirectionalMultiMap * @see com.intellij.util.containers.ConcurrentMultiMap * @author Dmitry Avdeev @@ -280,8 +280,18 @@ public class MultiMap implements Serializable { }; } + @Deprecated + @SuppressWarnings("unused") @NotNull + /** + * @deprecated Use {@link #createSmart()} + */ public static MultiMap createSmartList() { + return createSmart(); + } + + @NotNull + public static MultiMap createSmart() { return new MultiMap() { @NotNull @Override diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java index ed536cca1f89..2a55b8da6422 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java @@ -53,7 +53,7 @@ public class RefsModel implements VcsLogRefs { @NotNull private static MultiMap prepareRefsMap(@NotNull Collection refs) { - MultiMap map = MultiMap.createSmartList(); + MultiMap map = MultiMap.createSmart(); for (VcsRef ref : refs) { map.putValue(ref.getCommitHash(), ref); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/IgnoreFileAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/IgnoreFileAction.java index aaafec804304..003f338534ed 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/IgnoreFileAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/IgnoreFileAction.java @@ -44,7 +44,8 @@ import org.jetbrains.annotations.NotNull; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; /** * author: lesya @@ -66,7 +67,7 @@ public class IgnoreFileAction extends AnAction implements DumbAware { } public void actionPerformed(AnActionEvent e) { - final MultiMap parentToSelectedChildren = MultiMap.createSmartList(); + final MultiMap parentToSelectedChildren = MultiMap.createSmart(); final CvsContext context = CvsContextWrapper.createCachedInstance(e); final VirtualFile[] selectedFiles = context.getSelectedFiles(); for (VirtualFile selectedFile : selectedFiles) {