From 639e90a5d91c977f3fcf0e6fed8e7795608e99c0 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Fri, 1 Jun 2012 19:57:20 +0400
Subject: [PATCH] CollectionFactory: factory methods added. Got rid of Guava
 dependency

---
 .../psi/impl/light/LightModifierList.java     |   2 +-
 .../NaturalLanguageTextSelectioner.java       |   4 +-
 .../impl/UpdateFoldRegionsOperation.java      |   8 +-
 .../template/impl/ListTemplatesHandler.java   |   2 +-
 .../console/ConsoleFoldingSettings.java       |   2 +-
 .../impl/id/PlatformIdTableBuilding.java      |   2 +-
 .../com/intellij/notification/EventLog.java   |   2 +-
 .../wm/impl/ToolWindowManagerImpl.java        |   2 +-
 .../testFramework/LightPlatformTestCase.java  |   2 +-
 .../util/containers/CollectionFactory.java    | 141 ++++++++++++------
 .../lang/completion/GroovyCompletionUtil.java |   2 +-
 .../completion/weighers/GrKindWeigher.java    |   2 +-
 .../groovy/lang/psi/util/GdkMethodUtil.java   |   2 +-
 .../groovy/mvc/MvcModuleStructureUtil.java    |   4 +-
 .../convertToJava/StubGenerator.java          |   2 +-
 .../plugins/groovy/spock/SpockTest.groovy     |   2 +-
 .../maven/compiler/MavenResourceCompiler.java |   2 +-
 .../idea/maven/dom/MavenDomUtil.java          |   2 +-
 .../maven/execution/MavenResumeAction.java    |   2 +-
 .../idea/maven/project/MavenProject.java      |   2 +-
 .../AddToCompositeCollectionInvocation.java   |   2 +-
 21 files changed, 124 insertions(+), 67 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java
index 7f274a4ea7d7..e3ff814bad09 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java
@@ -40,7 +40,7 @@ public class LightModifierList extends LightElement implements PsiModifierList {
 
   public LightModifierList(PsiManager manager, final Language language, String... modifiers) {
     super(manager, language);
-    myModifiers = CollectionFactory.newTroveSet(modifiers);
+    myModifiers = CollectionFactory.troveSet(modifiers);
   }
 
   public void addModifier(String modifier) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/NaturalLanguageTextSelectioner.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/NaturalLanguageTextSelectioner.java
index 9243eb22685d..3e9ec968c08b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/NaturalLanguageTextSelectioner.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/NaturalLanguageTextSelectioner.java
@@ -31,8 +31,8 @@ import java.util.List;
 import java.util.Set;
 
 public class NaturalLanguageTextSelectioner extends ExtendWordSelectionHandlerBase {
-  private static final Set<Character> NATURAL = CollectionFactory.newTroveSet('(', ')', '.', ',', ':', ';', '!', '?', '$', '@', '%', '\"', '\'');
-  private static final Set<Character> SENTENCE_END = CollectionFactory.newTroveSet('.', '!', '?');
+  private static final Set<Character> NATURAL = CollectionFactory.troveSet('(', ')', '.', ',', ':', ';', '!', '?', '$', '@', '%', '\"', '\'');
+  private static final Set<Character> SENTENCE_END = CollectionFactory.troveSet('.', '!', '?');
 
   public boolean canSelect(PsiElement e) {
     return e instanceof PsiPlainText || e instanceof PsiComment;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
index a88aca1d01c9..7250bd6314b4 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
@@ -36,7 +36,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.intellij.util.containers.CollectionFactory.arrayList;
-import static com.intellij.util.containers.CollectionFactory.newTroveMap;
+import static com.intellij.util.containers.CollectionFactory.troveMap;
 
 /**
  * @author cdr
@@ -70,12 +70,12 @@ class UpdateFoldRegionsOperation implements Runnable {
   public void run() {
     EditorFoldingInfo info = EditorFoldingInfo.get(myEditor);
     FoldingModelEx foldingModel = (FoldingModelEx)myEditor.getFoldingModel();
-    Map<TextRange,Boolean> rangeToExpandStatusMap = newTroveMap();
+    Map<TextRange,Boolean> rangeToExpandStatusMap = troveMap();
 
     removeInvalidRegions(info, foldingModel, rangeToExpandStatusMap);
 
-    Map<FoldRegion, Boolean> shouldExpand = newTroveMap();
-    Map<FoldingGroup, Boolean> groupExpand = newTroveMap();
+    Map<FoldRegion, Boolean> shouldExpand = troveMap();
+    Map<FoldingGroup, Boolean> groupExpand = troveMap();
     List<FoldRegion> newRegions = addNewRegions(info, foldingModel, rangeToExpandStatusMap, shouldExpand, groupExpand);
 
     applyExpandStatus(newRegions, shouldExpand, groupExpand);
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java
index 7841f165e3a3..bd01e4e1f4fa 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java
@@ -96,7 +96,7 @@ public class ListTemplatesHandler implements CodeInsightActionHandler {
         if (description == null) {
           return super.getAllLookupStrings();
         }
-        return CollectionFactory.newSet(getLookupString(), description);
+        return CollectionFactory.hashSet(getLookupString(), description);
       }
     };
   }
diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java
index 828b6f574c28..b0665954529f 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java
@@ -70,7 +70,7 @@ public class ConsoleFoldingSettings implements PersistentStateComponent<ConsoleF
   }
 
   private void writeDiff(List<String> added, List<String> removed, boolean negated) {
-    Set<String> baseline = CollectionFactory.newTroveSet();
+    Set<String> baseline = CollectionFactory.troveSet();
     for (CustomizableConsoleFoldingBean regexp : CustomizableConsoleFoldingBean.EP_NAME.getExtensions()) {
       if (regexp.negate == negated) {
         baseline.add(regexp.substring);
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java
index c190dbb7fa82..2faaf0a649e4 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java
@@ -126,7 +126,7 @@ public abstract class PlatformIdTableBuilding {
     @NotNull
     @Override
     public Map<TodoIndexEntry, Integer> map(FileContent inputData) {
-      Map<TodoIndexEntry, Integer> result = CollectionFactory.newTroveMap();
+      Map<TodoIndexEntry, Integer> result = CollectionFactory.troveMap();
       for (DataIndexer<TodoIndexEntry, Integer, FileContent> indexer : indexers) {
         for (Map.Entry<TodoIndexEntry, Integer> entry : indexer.map(inputData).entrySet()) {
           TodoIndexEntry key = entry.getKey();
diff --git a/platform/platform-impl/src/com/intellij/notification/EventLog.java b/platform/platform-impl/src/com/intellij/notification/EventLog.java
index 99f50ee18360..a0233b7afbee 100644
--- a/platform/platform-impl/src/com/intellij/notification/EventLog.java
+++ b/platform/platform-impl/src/com/intellij/notification/EventLog.java
@@ -73,7 +73,7 @@ public class EventLog implements Notifications {
   private static final String A_CLOSING = "</a>";
   private static final Pattern TAG_PATTERN = Pattern.compile("<[^>]*>");
   private static final Pattern A_PATTERN = Pattern.compile("<a ([^>]* )?href=[\"\']([^>]*)[\"\'][^>]*>");
-  private static final Set<String> NEW_LINES = CollectionFactory.newSet("<br>", "</br>", "<br/>", "<p>", "</p>", "<p/>");
+  private static final Set<String> NEW_LINES = CollectionFactory.hashSet("<br>", "</br>", "<br/>", "<p>", "</p>", "<p/>");
 
   public EventLog() {
     ApplicationManager.getApplication().getMessageBus().connect().subscribe(Notifications.TOPIC, this);
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
index 8a75838fcdaf..43a23655bba6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
@@ -93,7 +93,7 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements
   private final HashMap<String, FloatingDecorator> myId2FloatingDecorator;
   private final HashMap<String, StripeButton> myId2StripeButton;
   private final HashMap<String, FocusWatcher> myId2FocusWatcher;
-  private final Set<String> myDumbAwareIds = Collections.synchronizedSet(CollectionFactory.<String>newTroveSet());
+  private final Set<String> myDumbAwareIds = Collections.synchronizedSet(CollectionFactory.<String>troveSet());
 
   private final EditorComponentFocusWatcher myEditorComponentFocusWatcher;
   private final MyToolWindowPropertyChangeListener myToolWindowPropertyChangeListener;
diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
index 4d768aeb94ca..8154d996b0e6 100644
--- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
@@ -793,7 +793,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
 
       final String[] myUrls = mySdk.getRootProvider().getUrls(OrderRootType.CLASSES);
       final String[] newUrls = newSdk.getRootProvider().getUrls(OrderRootType.CLASSES);
-      return CollectionFactory.newSet(myUrls).equals(CollectionFactory.newSet(newUrls));
+      return CollectionFactory.hashSet(myUrls).equals(CollectionFactory.hashSet(newUrls));
     }
 
   }
diff --git a/platform/util/src/com/intellij/util/containers/CollectionFactory.java b/platform/util/src/com/intellij/util/containers/CollectionFactory.java
index 9028cff937f4..897a40b98810 100644
--- a/platform/util/src/com/intellij/util/containers/CollectionFactory.java
+++ b/platform/util/src/com/intellij/util/containers/CollectionFactory.java
@@ -15,16 +15,11 @@
  */
 package com.intellij.util.containers;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import gnu.trove.THashMap;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
-import java.util.HashMap;
-import java.util.Stack;
 
 /**
  * @author peter
@@ -33,34 +28,118 @@ public class CollectionFactory {
   private CollectionFactory() {
   }
 
-  public static <T> Set<T> newSet(T... elements) {
-    return new HashSet<T>(Arrays.asList(elements));
+  @NotNull
+  public static <T> Set<T> hashSet() {
+    return new HashSet<T>();
   }
 
-  public static <T> Set<T> newTroveSet(T... elements) {
-    return newTroveSet(Arrays.asList(elements));
+  @NotNull
+  public static <T> Set<T> hashSet(@NotNull Collection<T> elements) {
+    return new HashSet<T>(elements);
   }
 
-  public static <T> Set<T> newTroveSet(Collection<T> elements) {
+  @NotNull
+  public static <T> Set<T> hashSet(@NotNull T... elements) {
+    return hashSet(Arrays.asList(elements));
+  }
+
+  public static <T> LinkedHashSet<T> linkedHashSet() {
+    return new LinkedHashSet<T>();
+  }
+
+  @NotNull
+  public static <T> Set<T> troveSet(@NotNull T... elements) {
+    return troveSet(Arrays.asList(elements));
+  }
+
+  @NotNull
+  public static <T> Set<T> troveSet(@NotNull Collection<T> elements) {
     return new THashSet<T>(elements);
   }
 
-  public static <T> T[] ar(T... elements) {
-    return elements;
+  @NotNull
+  public static <T> TreeSet<T> treeSet() {
+    return new TreeSet<T>();
   }
 
-  public static <T,V> THashMap<T, V> newTroveMap() {
-    return new THashMap<T,V>();
+  @NotNull
+  public static <T> TreeSet<T> treeSet(@NotNull Collection<T> elements) {
+    return new TreeSet<T>(elements);
   }
 
+  @NotNull
+  public static <T> TreeSet<T> treeSet(@NotNull T... elements) {
+    return treeSet(Arrays.asList(elements));
+  }
+
+  @NotNull
+  public static <T> TreeSet<T> treeSet(@NotNull Comparator<? super T> comparator) {
+    return new TreeSet<T>(comparator);
+  }
+
+  @NotNull
+  public static <T> Set<T> unmodifiableHashSet(@NotNull T... elements) {
+    return unmodifiableHashSet(Arrays.asList(elements));
+  }
+
+  @NotNull
+  public static <T> Set<T> unmodifiableHashSet(@NotNull Collection<T> elements) {
+    return Collections.unmodifiableSet(hashSet(elements));
+  }
+
+  @NotNull
+  public static <T, V> HashMap<T, V> hashMap() {
+    return new HashMap<T, V>();
+  }
+
+  @NotNull
+  public static <T, V> TreeMap<T, V> treeMap() {
+    return new TreeMap<T, V>();
+  }
+
+  @NotNull
+  public static <T, V> THashMap<T, V> troveMap() {
+    return new THashMap<T, V>();
+  }
+
+  public static <T, V> LinkedHashMap<T, V> linkedHashMap() {
+    return new LinkedHashMap<T, V>();
+  }
+
+  @NotNull
+  public static <T, V> Map<T, V> hashMap(@NotNull final List<T> keys, @NotNull final List<V> values) {
+    if (keys.size() != values.size()) {
+      throw new IllegalArgumentException(keys + " should have same length as " + values);
+    }
+
+    final HashMap<T, V> map = new HashMap<T, V>();
+    for (int i = 0; i < keys.size(); ++i) {
+      map.put(keys.get(i), values.get(i));
+    }
+    return map;
+  }
+
+  @NotNull
   public static <T> ArrayList<T> arrayList() {
-    return Lists.newArrayList();
+    return new ArrayList<T>();
   }
 
+  @NotNull
+  public static <T> ArrayList<T> arrayList(int initialCapacity) {
+    return new ArrayList<T>(initialCapacity);
+  }
+
+  @NotNull
+  public static <T> ArrayList<T> arrayList(Collection<T> elements) {
+    return new ArrayList<T>(elements);
+  }
+
+  @NotNull
   public static <T> ArrayList<T> arrayList(T... elements) {
-    return new ArrayList<T>(Arrays.asList(elements));
+    return arrayList(Arrays.asList(elements));
   }
 
+  @NotNull
   public static <T> List<T> arrayList(@NotNull final T[] elements, final int start, final int end) {
     if (start < 0 || start > end || end > elements.length) throw new IllegalArgumentException("start:" + start + " end:" + end + " length:" + elements.length);
 
@@ -80,35 +159,13 @@ public class CollectionFactory {
     };
   }
 
+  @NotNull
   public static <T> Stack<T> stack() {
     return new Stack<T>();
   }
 
-  public static <T> Set<T> hashSet() {
-    return Sets.newHashSet();
-  }
-
-  public static <T, V> Map<T, V> hashMap() {
-    return Maps.newHashMap();
-  }
-
-  public static <T, V> Map<T, V> hashMap(@NotNull final List<T> keys, @NotNull final List<V> values) {
-    if (keys.size() != values.size()) {
-      throw new IllegalArgumentException(keys + " should have some length as " + values);
-    }
-
-    final HashMap<T,V> map = Maps.newHashMap();
-    for (int i = 0; i < keys.size(); ++i) {
-      map.put(keys.get(i), values.get(i));
-    }
-    return map;
-  }
-
-  public static <T, V> LinkedHashMap<T, V> linkedMap() {
-    return Maps.newLinkedHashMap();
-  }
-
-  public static <T> LinkedHashSet<T> linkedHashSet() {
-    return Sets.newLinkedHashSet();
+  @NotNull
+  public static <T> T[] ar(@NotNull T... elements) {
+    return elements;
   }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java
index 007f387c176a..fb0bfef5c72e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java
@@ -448,7 +448,7 @@ public class GroovyCompletionUtil {
     return TailType.insertChar(editor, offset, ')');
   }
 
-  public static final Set<String> OPERATOR_METHOD_NAMES = CollectionFactory.newSet(
+  public static final Set<String> OPERATOR_METHOD_NAMES = CollectionFactory.hashSet(
     "plus", "minus", "multiply", "power", "div", "mod", "or", "and", "xor", "next", "previous", "getAt", "putAt", "leftShift", "rightShift",
     "isCase", "bitwiseNegate", "negative", "positive", "call"
   );
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java
index 442255bd8359..dd469ca38610 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java
@@ -41,7 +41,7 @@ import java.util.Set;
  */
 public class GrKindWeigher extends CompletionWeigher {
   private static final Set<String> TRASH_CLASSES = new HashSet<String>(10);
-  private static final Set<String> PRIORITY_KEYWORDS = CollectionFactory.newSet(
+  private static final Set<String> PRIORITY_KEYWORDS = CollectionFactory.hashSet(
     PsiKeyword.RETURN, PsiKeyword.INSTANCEOF, "in",
     PsiKeyword.PRIVATE, PsiKeyword.PROTECTED, PsiKeyword.PUBLIC, PsiKeyword.STATIC, "def",
     PsiKeyword.TRUE,  PsiKeyword.FALSE, PsiKeyword.NULL);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java
index 6ec188bf83e5..360fdb2c63cd 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java
@@ -44,7 +44,7 @@ public class GdkMethodUtil {
 
   private static final Logger LOG = Logger.getInstance(GdkMethodUtil.class);
 
-  public static final Set<String> COLLECTION_METHOD_NAMES = CollectionFactory.newSet(
+  public static final Set<String> COLLECTION_METHOD_NAMES = CollectionFactory.hashSet(
     "each", "eachWithIndex", "any", "every", "reverseEach", "collect", "collectAll", "find", "findAll", "retainAll", "removeAll", "split",
     "groupBy", "groupEntriesBy", "findLastIndexOf", "findIndexValues", "findIndexOf"
   );
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java
index 2f9bd16b5223..f8992644e1e5 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java
@@ -331,8 +331,8 @@ public class MvcModuleStructureUtil {
   }
 
   private static void removeInvalidSourceRoots(List<Consumer<ModifiableRootModel>> actions, MvcProjectStructure structure) {
-    final Set<SourceFolder> toRemove = CollectionFactory.newTroveSet();
-    final Set<ContentEntry> toRemoveContent = CollectionFactory.newTroveSet();
+    final Set<SourceFolder> toRemove = CollectionFactory.troveSet();
+    final Set<ContentEntry> toRemoveContent = CollectionFactory.troveSet();
     for (ContentEntry entry : ModuleRootManager.getInstance(structure.myModule).getContentEntries()) {
       final VirtualFile file = entry.getFile();
       if (file == null || !structure.isValidContentRoot(file)) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java
index 3eaeda43530f..8bb3a4e6d155 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java
@@ -167,7 +167,7 @@ public class StubGenerator implements ClassItemGenerator {
       return Collections.emptySet();
     }
 
-    final Set<String> result = CollectionFactory.newTroveSet(ArrayUtil.EMPTY_STRING_ARRAY);
+    final Set<String> result = CollectionFactory.troveSet(ArrayUtil.EMPTY_STRING_ARRAY);
     for (PsiClassType type : chainedConstructor.getThrowsList().getReferencedTypes()) {
       StringBuilder builder = new StringBuilder();
       writeType(builder, substitutor.substitute(type), constructor, classNameProvider);
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/spock/SpockTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/spock/SpockTest.groovy
index c0709e8e3860..16756d18eed4 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/spock/SpockTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/spock/SpockTest.groovy
@@ -190,7 +190,7 @@ class FooSpec extends spock.lang.Specification {
 
     assertNotNull(lookupElements);
 
-    Set<String> missedVariants = CollectionFactory.newSet(expectedVariants);
+    Set<String> missedVariants = CollectionFactory.hashSet(expectedVariants);
 
     for (LookupElement lookupElement : lookupElements) {
       missedVariants.remove(lookupElement.getLookupString());
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java
index 02f08aa522ab..5aeb6f81c74f 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java
@@ -59,7 +59,7 @@ import java.util.regex.Pattern;
 public class MavenResourceCompiler implements ClassPostProcessingCompiler {
   private static final Key<List<String>> FILES_TO_DELETE_KEY = Key.create(MavenResourceCompiler.class.getSimpleName() + ".FILES_TO_DELETE");
 
-  private static final Set<String> DEFAULT_NON_FILTERED_EXTENSIONS = CollectionFactory.newSet("jpg", "jpeg", "gif", "bmp", "png");
+  private static final Set<String> DEFAULT_NON_FILTERED_EXTENSIONS = CollectionFactory.hashSet("jpg", "jpeg", "gif", "bmp", "png");
 
   private Map<String, Set<String>> myOutputItemsCache = new THashMap<String, Set<String>>();
 
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java
index a25bd7878b26..b1906ff44f2b 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java
@@ -58,7 +58,7 @@ import java.util.regex.Pattern;
 public class MavenDomUtil {
 
   // see http://maven.apache.org/settings.html
-  private static final Set<String> SUBTAGS_IN_SETTINGS_FILE = CollectionFactory.newSet("localRepository", "interactiveMode",
+  private static final Set<String> SUBTAGS_IN_SETTINGS_FILE = CollectionFactory.hashSet("localRepository", "interactiveMode",
                                                                                        "usePluginRegistry", "offline", "pluginGroups",
                                                                                        "servers", "mirrors", "proxies", "profiles",
                                                                                        "activeProfiles");
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java
index 43885c5a6ecc..1c728d3a4d17 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java
@@ -51,7 +51,7 @@ public class MavenResumeAction extends AnAction {
 
   private static final Logger LOG = Logger.getInstance(MavenResumeAction.class);
 
-  private static final Set<String> PARAMS_DISABLING_RESUME = CollectionFactory.newSet("-rf", "-resume-from", "-pl", "-projects", "-am",
+  private static final Set<String> PARAMS_DISABLING_RESUME = CollectionFactory.hashSet("-rf", "-resume-from", "-pl", "-projects", "-am",
                                                                                       "-also-make", "-amd", "-also-make-dependents");
 
   public static final int STATE_INITIAL = 0;
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java
index b49f872d8fcd..92e24a4e976e 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java
@@ -617,7 +617,7 @@ public class MavenProject {
 
   @NotNull
   public Set<String> getSupportedPackagings() {
-    Set<String> result = CollectionFactory.newSet(MavenConstants.TYPE_POM,
+    Set<String> result = CollectionFactory.hashSet(MavenConstants.TYPE_POM,
                                                   MavenConstants.TYPE_JAR,
                                                   "ejb", "ejb-client", "war", "ear", "bundle", "maven-plugin");
     for (MavenImporter each : getSuitableImporters()) {
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java b/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java
index 85793f8269a1..f0e5e67fae0b 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java
@@ -37,7 +37,7 @@ class AddToCompositeCollectionInvocation implements Invocation {
   }
 
   public Object invoke(final DomInvocationHandler<?> handler, final Object[] args) throws Throwable {
-    Set<XmlTag> set = CollectionFactory.newTroveSet();
+    Set<XmlTag> set = CollectionFactory.troveSet();
     for (final CollectionChildDescriptionImpl qname : myQnames) {
       set.addAll(qname.getTagsGetter().fun(handler));
     }