From fa513ce9766db9400260b3d9b09feccf297ac1de Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 7 Aug 2012 13:34:43 +0400 Subject: [PATCH] Fix accidental usage of closurecompiler's internal implementation of guava. Adapted from https://github.com/develar/kotlin/commit/d3521123a6e4d551b30743b68b6bb23b9678553b by develar. --- .../translate/intrinsic/functions/FunctionIntrinsics.java | 4 ++-- .../translate/intrinsic/functions/factories/ArrayFIF.java | 2 +- .../intrinsic/functions/factories/NumberConversionFIF.java | 2 +- .../intrinsic/functions/factories/TupleGetterFIF.java | 2 +- .../translate/intrinsic/functions/patterns/NamePredicate.java | 2 +- .../intrinsic/functions/patterns/PatternBuilder.java | 2 +- .../intrinsic/operation/BinaryOperationIntrinsics.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/FunctionIntrinsics.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/FunctionIntrinsics.java index 1b0cd2b301b..c186654d28f 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/FunctionIntrinsics.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/FunctionIntrinsics.java @@ -16,8 +16,8 @@ package org.jetbrains.k2js.translate.intrinsic.functions; -import closurecompiler.internal.com.google.common.collect.Lists; -import closurecompiler.internal.com.google.common.collect.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/ArrayFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/ArrayFIF.java index 9e19d6a24c7..0ac29abb5c9 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/ArrayFIF.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/ArrayFIF.java @@ -16,7 +16,7 @@ package org.jetbrains.k2js.translate.intrinsic.functions.factories; -import closurecompiler.internal.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import com.google.dart.compiler.backend.js.ast.JsArrayAccess; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.util.AstUtil; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/NumberConversionFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/NumberConversionFIF.java index 316805a7ea1..bd847c93b01 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/NumberConversionFIF.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/NumberConversionFIF.java @@ -16,7 +16,7 @@ package org.jetbrains.k2js.translate.intrinsic.functions.factories; -import closurecompiler.internal.com.google.common.collect.Sets; +import com.google.common.collect.Sets; import com.google.dart.compiler.backend.js.ast.JsBinaryOperation; import com.google.dart.compiler.backend.js.ast.JsBinaryOperator; import com.google.dart.compiler.backend.js.ast.JsExpression; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TupleGetterFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TupleGetterFIF.java index f0e9b335032..5ca8ed45205 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TupleGetterFIF.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/TupleGetterFIF.java @@ -16,8 +16,8 @@ package org.jetbrains.k2js.translate.intrinsic.functions.factories; -import closurecompiler.internal.com.google.common.collect.Lists; import com.google.common.base.Predicate; +import com.google.common.collect.Lists; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.util.AstUtil; import org.jetbrains.annotations.NotNull; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/NamePredicate.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/NamePredicate.java index 3b9aab055a9..c677f699d9c 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/NamePredicate.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/NamePredicate.java @@ -16,8 +16,8 @@ package org.jetbrains.k2js.translate.intrinsic.functions.patterns; -import closurecompiler.internal.com.google.common.collect.Lists; import com.google.common.base.Predicate; +import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java index 7d694ce5d4f..e6551c0053f 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java @@ -16,7 +16,7 @@ package org.jetbrains.k2js.translate.intrinsic.functions.patterns; -import closurecompiler.internal.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/BinaryOperationIntrinsics.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/BinaryOperationIntrinsics.java index aca40d8fc76..593cc709107 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/BinaryOperationIntrinsics.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/operation/BinaryOperationIntrinsics.java @@ -16,7 +16,7 @@ package org.jetbrains.k2js.translate.intrinsic.operation; -import closurecompiler.internal.com.google.common.collect.Lists; +import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetBinaryExpression;