CR-IC-6786 createSmartList -> createSmart

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 d57c45019f5d087379cb8572d836a84729e73907..7a01d37ed84bc3b2611bc3752637c3f673330c20 100644 (file)
--- 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<String, Pair<URL, ClassLoader>> compute() {
-      MultiMap<String, Pair<URL, ClassLoader>> map = MultiMap.createSmartList();
+      MultiMap<String, Pair<URL, ClassLoader>> map = MultiMap.createSmart();
       Map<URL, ClassLoader> urls = new THashMap<URL, ClassLoader>();
       //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 c7365ab04685a9cbdb88d129187ceffdc00ea0aa..6912b7c62586fb41d59be06f05fafdb2169a422f 100644 (file)
--- 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<String, ArchivedProjectTemplate> create(@NotNull Element element) throws IOException, JDOMException {
-    MultiMap<String, ArchivedProjectTemplate> map = MultiMap.createSmartList();
+    MultiMap<String, ArchivedProjectTemplate> map = MultiMap.createSmart();
     for (ArchivedProjectTemplate template : createGroupTemplates(element)) {
       map.putValue(template.getCategory(), template);
     }
     return map;
   }
 
-  @SuppressWarnings("unchecked")
   private static List<ArchivedProjectTemplate> createGroupTemplates(Element groupElement) {
-    List<Element> elements = groupElement.getChildren(TEMPLATE);
-    return ContainerUtil.mapNotNull(elements, new NullableFunction<Element, ArchivedProjectTemplate>() {
+    return ContainerUtil.mapNotNull(groupElement.getChildren(TEMPLATE), new NullableFunction<Element, ArchivedProjectTemplate>() {
       @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 25751535842aa833ee0bc8396e16d4783d67b5ab..7b90fa69b0a2e6a5af3a45e08672a283838fd1d6 100644 (file)
--- 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<T extends AbstractProjectWizard> 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 bca7c45d12a7224a1bb5ad3af7a9e7a34529abe7..20924c55615f2e8c4630cb94ef405fad7406aafb 100644 (file)
--- 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<TextRange, RangeHighlighter> incinerator = MultiMap.createSmartList();
+  private final MultiMap<TextRange, RangeHighlighter> 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 7cc18c4eadeb4503cb511240a47403a6aebfbe4c..9c4d5b780d463ad396ccc21bb296e2053416fcfb 100644 (file)
--- 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<Element> 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<Element> 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 dda3a4ab087dbd33de5b3e6ad86b3e4d5861ace6..202dd05890afec2212aac4508d940932e6fb0646 100644 (file)
--- 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<String, ExtensionPointImpl> myExtensionPoints = ContainerUtil.newConcurrentMap();
   private final Map<String,Throwable> myEPTraces = DEBUG_REGISTRATION ? new THashMap<String, Throwable>():null;
-  private final MultiMap<String, ExtensionPointAvailabilityListener> myAvailabilityListeners = MultiMap.createSmartList();
+  private final MultiMap<String, ExtensionPointAvailabilityListener> myAvailabilityListeners = MultiMap.createSmart();
   private final List<Runnable> mySuspendedListenerActions = new ArrayList<Runnable>();
   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 5288199bcaaf772d6df1097b8c129d47cb026c34..358b61e2af29a23c92688a6cc5ba4c647e6ff118 100644 (file)
--- 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<VirtualFile, RequestWithProcessor> 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 821d16a7b52b7e6156581a34e312cd53f76cba67..d59f6188fe4047df3436dd2a70b6b43311dbcef8 100644 (file)
--- 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<LookupElement> {
   private final TreeSet<String> mySortedStrings = new TreeSet<String>();
-  private final MultiMap<String, LookupElement> myElements = MultiMap.createSmartList();
+  private final MultiMap<String, LookupElement> myElements = MultiMap.createSmart();
   private final Map<LookupElement, FList<LookupElement>> myToLift = newIdentityHashMap();
   private final IdentityHashMap<FList<LookupElement>, IdentityHashMap<LookupElement, FList<LookupElement>>> 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 b4e5f250d4a5c69ab80a890869eef713fd80ee0a..75226646b8e3fe03e369a2a69ebf0768a50e1512 100644 (file)
--- 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<Document, FileEditor> documentToEditors = MultiMap.createSet();
-    MultiMap<FileEditor, TextEditorHighlightingPass> documentBoundPasses = MultiMap.createSmartList();
-    MultiMap<FileEditor, EditorBoundHighlightingPass> editorBoundPasses = MultiMap.createSmartList();
+    MultiMap<FileEditor, TextEditorHighlightingPass> documentBoundPasses = MultiMap.createSmart();
+    MultiMap<FileEditor, EditorBoundHighlightingPass> editorBoundPasses = MultiMap.createSmart();
     for (Map.Entry<FileEditor, HighlightingPass[]> 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 905b1928d7f9b147e3f63d05a74ddfd11d935065..c336fb7b2e9627c02429689681f901a57556dc55 100644 (file)
--- 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<SemKey, SemKey> cacheKeyHierarchy(Collection<SemKey> allKeys) {
-    final MultiMap<SemKey, SemKey> result = MultiMap.createSmartList();
+    final MultiMap<SemKey, SemKey> result = MultiMap.createSmart();
     ContainerUtil.process(allKeys, new Processor<SemKey>() {
       @Override
       public boolean process(SemKey key) {
@@ -115,7 +115,7 @@ public class SemServiceImpl extends SemService{
   }
 
   private MultiMap<SemKey, NullableFunction<PsiElement, ? extends SemElement>> collectProducers() {
-    final MultiMap<SemKey, NullableFunction<PsiElement, ? extends SemElement>> map = MultiMap.createSmartList();
+    final MultiMap<SemKey, NullableFunction<PsiElement, ? extends SemElement>> 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 2d3c4fcc650d3a33e469ce53dd924f06e69963bc..50a7e625757cf2ee90a93614ee3d19fbac51df40 100644 (file)
--- 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<VirtualFile, OrderEntry[]> result = myOrderEntries;
     if (result != null) return result;
 
-    MultiMap<VirtualFile, OrderEntry> libClassRootEntries = MultiMap.createSmartList();
-    MultiMap<VirtualFile, OrderEntry> libSourceRootEntries = MultiMap.createSmartList();
-    MultiMap<VirtualFile, OrderEntry> depEntries = MultiMap.createSmartList();
+    MultiMap<VirtualFile, OrderEntry> libClassRootEntries = MultiMap.createSmart();
+    MultiMap<VirtualFile, OrderEntry> libSourceRootEntries = MultiMap.createSmart();
+    MultiMap<VirtualFile, OrderEntry> 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<VirtualFile, Module> contentRootOf = ContainerUtil.newHashMap();
     @NotNull final MultiMap<VirtualFile, Module> sourceRootOf = MultiMap.createSet();
     @NotNull final TObjectIntHashMap<VirtualFile> rootTypeId = new TObjectIntHashMap<VirtualFile>();
-    @NotNull final MultiMap<VirtualFile, Library> excludedFromLibraries = MultiMap.createSmartList();
-    @NotNull final MultiMap<VirtualFile, Library> classOfLibraries = MultiMap.createSmartList();
-    @NotNull final MultiMap<VirtualFile, Library> sourceOfLibraries = MultiMap.createSmartList();
+    @NotNull final MultiMap<VirtualFile, Library> excludedFromLibraries = MultiMap.createSmart();
+    @NotNull final MultiMap<VirtualFile, Library> classOfLibraries = MultiMap.createSmart();
+    @NotNull final MultiMap<VirtualFile, Library> sourceOfLibraries = MultiMap.createSmart();
     @NotNull final Set<VirtualFile> excludedFromProject = ContainerUtil.newHashSet();
     @NotNull final Map<VirtualFile, Module> excludedFromModule = ContainerUtil.newHashMap();
     @NotNull final Map<VirtualFile, String> 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 cdb0f1298a8ddf14a01ea2fbff9f6c138c645a01..a68cc516dd875242ec3243488de9b78d9ceaddd4 100644 (file)
--- 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<K, V> implements Serializable {
     };
   }
 
+  @Deprecated
+  @SuppressWarnings("unused")
   @NotNull
+  /**
+   * @deprecated Use {@link #createSmart()}
+   */
   public static <K, V> MultiMap<K, V> createSmartList() {
+    return createSmart();
+  }
+
+  @NotNull
+  public static <K, V> MultiMap<K, V> createSmart() {
     return new MultiMap<K, V>() {
       @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 ed536cca1f8962187d22ca728a0d977c0ca49eb7..2a55b8da64220b1f2b8fcfae2656401b408458ec 100644 (file)
--- 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<Hash, VcsRef> prepareRefsMap(@NotNull Collection<VcsRef> refs) {
-    MultiMap<Hash, VcsRef> map = MultiMap.createSmartList();
+    MultiMap<Hash, VcsRef> 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 aaafec8043041b8404aa24b60897ed6960df04b9..003f338534ed87dae5b55cca6ca5411f22881378 100644 (file)
--- 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<VirtualFile, VirtualFile> parentToSelectedChildren = MultiMap.createSmartList();
+    final MultiMap<VirtualFile, VirtualFile> parentToSelectedChildren = MultiMap.createSmart();
     final CvsContext context = CvsContextWrapper.createCachedInstance(e);
     final VirtualFile[] selectedFiles = context.getSelectedFiles();
     for (VirtualFile selectedFile : selectedFiles) {