diff --git a/idea/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java b/idea/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java index f7a389b356f..2a2f16e3c33 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java +++ b/idea/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.references; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.TextRange; import com.intellij.psi.MultiRangeReference; diff --git a/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java b/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java index 637e1c94357..568bcc9c5a5 100644 --- a/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java +++ b/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java @@ -16,9 +16,9 @@ package org.jetbrains.jet.editor.quickDoc; -import com.beust.jcommander.internal.Lists; import com.google.common.base.Predicates; import com.google.common.collect.Collections2; +import com.google.common.collect.Lists; import com.intellij.codeInsight.documentation.DocumentationManager; import com.intellij.codeInsight.navigation.CtrlMouseHandler; import com.intellij.openapi.util.io.FileUtil; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java index bb4da6dc672..171814b3756 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.highlighter; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl; import com.intellij.codeInsight.daemon.impl.HighlightInfo; diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToDecompiledLibraryTest.java b/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToDecompiledLibraryTest.java index cd4c559ecd7..2af1817f74a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToDecompiledLibraryTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToDecompiledLibraryTest.java @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.libraries; -import com.beust.jcommander.internal.Maps; +import com.google.common.collect.Maps; import com.intellij.openapi.editor.Document; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.roots.LibraryOrderEntry;