diff --git a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileTypeDescriptor.java b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileTypeDescriptor.java index 90568cae6795..cc9d1ce81407 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileTypeDescriptor.java +++ b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileTypeDescriptor.java @@ -18,16 +18,17 @@ package com.intellij.openapi.fileChooser; import com.intellij.openapi.util.NlsContexts; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.containers.ImmutableList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; + /** * @author Konstantin Bulenkov */ public class FileTypeDescriptor extends FileChooserDescriptor { - private final ImmutableList myExtensions; + private final List myExtensions; public FileTypeDescriptor(@NlsContexts.DialogTitle String title, String @NotNull ... extensions) { super(true, false, false, true, false, false); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/integer/JavaNumberConversionIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/integer/JavaNumberConversionIntention.java index 21c464478d6f..3662c8964c29 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/integer/JavaNumberConversionIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/integer/JavaNumberConversionIntention.java @@ -7,7 +7,6 @@ import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; import com.intellij.util.ObjectUtils; -import com.intellij.util.containers.ImmutableList; import com.siyeh.ig.psiutils.CommentTracker; import com.siyeh.ig.psiutils.ExpressionUtils; import com.siyeh.ig.psiutils.JavaPsiMathUtil; @@ -25,11 +24,11 @@ import static com.siyeh.ipp.integer.JavaNumberConverters.*; public class JavaNumberConversionIntention extends AbstractNumberConversionIntention { private static class Holder { - static final ImmutableList JAVA_1_CONVERTERS = immutableList( + static final List JAVA_1_CONVERTERS = immutableList( INTEGER_TO_DECIMAL, INTEGER_TO_HEX, INTEGER_TO_OCTAL, FLOAT_TO_DECIMAL, FLOAT_TO_PLAIN, FLOAT_TO_SCIENTIFIC); - static final ImmutableList JAVA_5_CONVERTERS = immutableList( + static final List JAVA_5_CONVERTERS = immutableList( INTEGER_TO_DECIMAL, INTEGER_TO_HEX, INTEGER_TO_OCTAL, FLOAT_TO_DECIMAL, FLOAT_TO_PLAIN, FLOAT_TO_SCIENTIFIC, FLOAT_TO_HEX); - static final ImmutableList JAVA_7_CONVERTERS = immutableList( + static final List JAVA_7_CONVERTERS = immutableList( INTEGER_TO_DECIMAL, INTEGER_TO_HEX, INTEGER_TO_BINARY, INTEGER_TO_OCTAL, FLOAT_TO_DECIMAL, FLOAT_TO_PLAIN, FLOAT_TO_SCIENTIFIC, FLOAT_TO_HEX); }