From 3d5e1282676d38b1e1f04759f41087cbe6e78ac8 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 2 Oct 2013 19:59:14 +0400
Subject: [PATCH] Remove trivial dependencies of JDR on Guava

---
 .../resolve/java/JavaBridgeConfiguration.java  | 18 ++++++++++++------
 .../java/resolver/DescriptorResolverUtils.java |  7 ++++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java
index 6df51f06241..e813715c01a 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaBridgeConfiguration.java
@@ -16,7 +16,6 @@
 
 package org.jetbrains.jet.lang.resolve.java;
 
-import com.google.common.collect.ImmutableList;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.DefaultModuleConfiguration;
 import org.jetbrains.jet.lang.ModuleConfiguration;
@@ -26,15 +25,22 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
 
 import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 public class JavaBridgeConfiguration implements ModuleConfiguration {
 
-    public static final List<ImportPath> DEFAULT_JAVA_IMPORTS = ImmutableList.of(new ImportPath("java.lang.*"));
-    public static final List<ImportPath> ALL_JAVA_IMPORTS = ImmutableList.<ImportPath>builder()
-            .addAll(DEFAULT_JAVA_IMPORTS)
-            .addAll(DefaultModuleConfiguration.DEFAULT_JET_IMPORTS)
-            .build();
+    public static final List<ImportPath> DEFAULT_JAVA_IMPORTS = Collections.unmodifiableList(Arrays.asList(new ImportPath("java.lang.*")));
+    public static final List<ImportPath> ALL_JAVA_IMPORTS;
+
+    static {
+        List<ImportPath> allJavaImports = new ArrayList<ImportPath>();
+        allJavaImports.addAll(DEFAULT_JAVA_IMPORTS);
+        allJavaImports.addAll(DefaultModuleConfiguration.DEFAULT_JET_IMPORTS);
+        ALL_JAVA_IMPORTS = Collections.unmodifiableList(allJavaImports);
+    }
 
     private JavaDescriptorResolver javaDescriptorResolver;
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
index 00ba2a5a34a..635f657cc03 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java
@@ -16,7 +16,6 @@
 
 package org.jetbrains.jet.lang.resolve.java.resolver;
 
-import com.google.common.collect.Maps;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
@@ -240,7 +239,9 @@ public final class DescriptorResolverUtils {
             @NotNull List<TypeParameterDescriptor> originalParameters,
             @Nullable DeclarationDescriptor newOwner
     ) {
-        Map<TypeParameterDescriptor, TypeParameterDescriptorImpl> result = Maps.newLinkedHashMap(); // save order of type parameters
+        // LinkedHashMap to save the order of type parameters
+        Map<TypeParameterDescriptor, TypeParameterDescriptorImpl> result =
+                new LinkedHashMap<TypeParameterDescriptor, TypeParameterDescriptorImpl>();
         for (TypeParameterDescriptor typeParameter : originalParameters) {
             result.put(typeParameter,
                        TypeParameterDescriptorImpl.createForFurtherModification(
@@ -258,7 +259,7 @@ public final class DescriptorResolverUtils {
     public static TypeSubstitutor createSubstitutorForTypeParameters(
             @NotNull Map<TypeParameterDescriptor, TypeParameterDescriptorImpl> originalToAltTypeParameters
     ) {
-        Map<TypeConstructor, TypeProjection> typeSubstitutionContext = Maps.newHashMap();
+        Map<TypeConstructor, TypeProjection> typeSubstitutionContext = new HashMap<TypeConstructor, TypeProjection>();
         for (Map.Entry<TypeParameterDescriptor, TypeParameterDescriptorImpl> originalToAltTypeParameter : originalToAltTypeParameters
                 .entrySet()) {
             typeSubstitutionContext.put(originalToAltTypeParameter.getKey().getTypeConstructor(),