diff --git a/compiler/frontend/serialization/serialization.iml b/compiler/frontend/serialization/serialization.iml index 57bfcb11a8c..fb40f79a0b6 100644 --- a/compiler/frontend/serialization/serialization.iml +++ b/compiler/frontend/serialization/serialization.iml @@ -10,7 +10,6 @@ - diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java index cf8feea814b..65204242a23 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/DescriptorSerializer.java @@ -16,12 +16,10 @@ package org.jetbrains.jet.descriptors.serialization; -import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.Annotated; import org.jetbrains.jet.lang.resolve.DescriptorFactory; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.TypeProjection; @@ -400,7 +398,7 @@ public class DescriptorSerializer { public ProtoBuf.Package.Builder packageProto(@NotNull Collection fragments) { ProtoBuf.Package.Builder builder = ProtoBuf.Package.newBuilder(); - Collection members = Lists.newArrayList(); + Collection members = new ArrayList(); for (PackageFragmentDescriptor fragment : fragments) { members.addAll(fragment.getMemberScope().getAllDescriptors()); } diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java index 169cb4f359b..c6644f16294 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedPackageMemberScope.java @@ -16,16 +16,19 @@ package org.jetbrains.jet.descriptors.serialization.descriptors; -import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.descriptors.serialization.*; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; +import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.storage.StorageManager; +import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -97,7 +100,7 @@ public class DeserializedPackageMemberScope extends DeserializedMemberScope { @NotNull MemberFilter memberFilter, @NotNull NameResolver nameResolver ) { - List result = Lists.newArrayList(); + List result = new ArrayList(); for (ProtoBuf.Callable member : packageProto.getMemberList()) { if (memberFilter.acceptPackagePartClass(packageDescriptor, member, nameResolver)) { result.add(member);