From 8fded2e700aea47de97cb6acf88f88fddfe6b9a0 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Mon, 9 Jul 2012 14:32:37 +0200
Subject: [PATCH] AppCode: compacting FileSymbolTables after building/loading

---
 .../src/com/intellij/util/containers/LinkedMultiMap.java    | 4 ++--
 .../intellij/util/containers/MostlySingularMultiMap.java    | 6 +++++-
 .../util/src/com/intellij/util/containers/MultiMap.java     | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/platform/util/src/com/intellij/util/containers/LinkedMultiMap.java b/platform/util/src/com/intellij/util/containers/LinkedMultiMap.java
index 3128f507a2bc..2bc0dcd2f952 100644
--- a/platform/util/src/com/intellij/util/containers/LinkedMultiMap.java
+++ b/platform/util/src/com/intellij/util/containers/LinkedMultiMap.java
@@ -30,7 +30,7 @@ public class LinkedMultiMap<K, V> extends MultiMap<K, V> {
     }
 
     @Override
-    protected Map<K, Collection<V>> createMap(int i, float v) {
-        return new LinkedHashMap<K, Collection<V>>(i, v);
+    protected Map<K, Collection<V>> createMap(int initialCapacity, float loadFactor) {
+        return new LinkedHashMap<K, Collection<V>>(initialCapacity, loadFactor);
     }
 }
diff --git a/platform/util/src/com/intellij/util/containers/MostlySingularMultiMap.java b/platform/util/src/com/intellij/util/containers/MostlySingularMultiMap.java
index afb29c742e2d..a512a386bc98 100644
--- a/platform/util/src/com/intellij/util/containers/MostlySingularMultiMap.java
+++ b/platform/util/src/com/intellij/util/containers/MostlySingularMultiMap.java
@@ -35,7 +35,7 @@ import java.util.Set;
 public class MostlySingularMultiMap<K, V> implements Serializable {
   private static final long serialVersionUID = 2784448345881807109L;
 
-  private final Map<K, Object> myMap = new THashMap<K, Object>();
+  private final THashMap<K, Object> myMap = new THashMap<K, Object>();
 
   public void add(K key, V value) {
     Object current = myMap.get(key);
@@ -108,6 +108,10 @@ public class MostlySingularMultiMap<K, V> implements Serializable {
     return Collections.singleton((V)value);
   }
 
+  public void compact() {
+    myMap.compact();
+  }
+
   @Override
   public String toString() {
     return "{" + StringUtil.join(myMap.entrySet(), new Function<Map.Entry<K, Object>, String>() {
diff --git a/platform/util/src/com/intellij/util/containers/MultiMap.java b/platform/util/src/com/intellij/util/containers/MultiMap.java
index 53ed1d6b92eb..4b1db80477cb 100644
--- a/platform/util/src/com/intellij/util/containers/MultiMap.java
+++ b/platform/util/src/com/intellij/util/containers/MultiMap.java
@@ -34,7 +34,7 @@ public class MultiMap<K, V> implements Serializable {
   };
   private static final long serialVersionUID = -2632269270151455493L;
 
-  private final Map<K, Collection<V>> myMap;
+  protected final Map<K, Collection<V>> myMap;
   private Collection<V> values;
 
   public MultiMap() {
@@ -49,8 +49,8 @@ public class MultiMap<K, V> implements Serializable {
     return new HashMap<K, Collection<V>>();
   }
 
-  protected Map<K, Collection<V>> createMap(int i, float v) {
-    return new HashMap<K, Collection<V>>(i, v);
+  protected Map<K, Collection<V>> createMap(int initialCapacity, float loadFactor) {
+    return new HashMap<K, Collection<V>>(initialCapacity, loadFactor);
   }
 
   protected Collection<V> createCollection() {