From 74fcf2a62cb34e91045bd786ab63b81dbee4f86b Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Fri, 26 Jul 2019 23:43:11 -0700 Subject: [PATCH] get rid of yet another hash set GitOrigin-RevId: 404ec8e4a948025f7024dca0b8aba9b40eab5390 --- .../execution/junit/JavaRuntimeConfigurationProducerBase.java | 2 +- .../codeInsight/daemon/impl/analysis/HighlightUtil.java | 2 +- .../codeInspection/dataFlow/StringExpressionHelper.java | 2 +- .../codeInspection/java15api/Java15APIUsageInspection.java | 2 +- .../statistic/libraryJar/FUSLibraryJarUsagesCollector.java | 2 +- .../move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java | 2 +- .../rename/naming/ConstructorParameterOnFieldRenameRenamer.java | 2 +- .../psi/impl/search/ClassesWithAnnotatedMembersSearcher.java | 2 +- .../src/com/intellij/lang/folding/CustomFoldingBuilder.java | 2 +- .../dvcs-impl/src/com/intellij/dvcs/branch/DvcsTaskHandler.java | 2 +- .../application/options/TabbedLanguageCodeStylePanel.java | 2 +- .../application/options/editor/GutterIconsConfigurable.java | 2 +- .../changeSignature/ChangeSignatureProcessorBase.java | 2 +- .../com/intellij/ide/plugins/InstalledPluginsTableModel.java | 2 +- .../testSrc/com/intellij/ui/mac/touchbar/TouchbarTest.java | 2 +- .../agent/impl/RemoteAgentReflectiveProxyFactory.java | 2 +- .../vcs/changes/conflicts/ChangelistConflictTracker.java | 2 +- .../com/intellij/util/treeWithCheckedNodes/SelectedState.java | 2 +- .../ig/performance/IfStatementMissingBreakInLoopInspection.java | 2 +- .../src/com/siyeh/ig/psiutils/TestUtils.java | 2 +- .../plugins/groovy/lang/folding/GroovyFoldingBuilder.java | 2 +- .../groovy/lang/psi/typeEnhancers/ClosureParameterEnhancer.java | 2 +- .../jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java | 2 +- .../jetbrains/plugins/groovy/formatter/AlignmentProvider.java | 2 +- .../groovy/lang/completion/CompleteReferenceExpression.java | 2 +- .../plugins/groovy/lang/completion/weighers/GrKindWeigher.java | 2 +- .../groovy/lang/parameterInfo/GroovyParameterInfoHandler.java | 2 +- .../groovy/refactoring/DefaultGroovyVariableNameValidator.java | 2 +- .../refactoring/GroovyImportOptimizerRefactoringHelper.java | 2 +- .../groovy/refactoring/convertToJava/CodeBlockGenerator.java | 2 +- .../refactoring/convertToJava/ConvertToJavaProcessor.java | 2 +- .../groovy/refactoring/convertToJava/ExpressionContext.java | 2 +- .../groovy/refactoring/convertToJava/GenerationUtil.java | 2 +- .../introduce/parameter/java2groovy/OldReferencesResolver.java | 2 +- .../jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java | 2 +- .../maven/dom/generate/GenerateManagedDependencyAction.java | 2 +- .../dom/inspections/MavenDuplicateDependenciesInspection.java | 2 +- .../refactorings/extract/ExtractManagedDependenciesAction.java | 2 +- .../dom/refactorings/introduce/IntroducePropertyAction.java | 2 +- .../idea/svn/dialogs/SelectCreateExternalTargetDialog.java | 2 +- .../src/com/intellij/spellchecker/engine/Transformation.java | 2 +- .../com/intellij/xml/impl/schema/SchemaDefinitionsSearch.java | 2 +- .../com/intellij/xml/index/XmlSchemaTypeInheritanceTest.java | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/junit/JavaRuntimeConfigurationProducerBase.java b/java/execution/impl/src/com/intellij/execution/junit/JavaRuntimeConfigurationProducerBase.java index 981d7a77af7b..d8eb36b0d47e 100644 --- a/java/execution/impl/src/com/intellij/execution/junit/JavaRuntimeConfigurationProducerBase.java +++ b/java/execution/impl/src/com/intellij/execution/junit/JavaRuntimeConfigurationProducerBase.java @@ -13,7 +13,7 @@ import com.intellij.openapi.roots.*; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java index 45aa83122a40..dee9e2ba1152 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -50,7 +50,7 @@ import com.intellij.util.JavaPsiConstructorUtil; import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.util.ui.UIUtil; import com.intellij.xml.util.XmlStringUtil; import com.siyeh.ig.psiutils.ControlFlowUtils; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StringExpressionHelper.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StringExpressionHelper.java index 5319efd8e370..94e4473cf405 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StringExpressionHelper.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/StringExpressionHelper.java @@ -21,7 +21,7 @@ import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.searches.MethodReferencesSearch; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.CommonProcessors; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java b/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java index a48d9bbd3751..29bc4c5dcc8f 100644 --- a/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java @@ -29,7 +29,7 @@ import com.intellij.psi.util.PsiUtil; import com.intellij.reference.SoftReference; import com.intellij.ui.SimpleListCellRenderer; import com.intellij.util.ObjectUtils; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; import gnu.trove.THashSet; diff --git a/java/java-impl/src/com/intellij/internal/statistic/libraryJar/FUSLibraryJarUsagesCollector.java b/java/java-impl/src/com/intellij/internal/statistic/libraryJar/FUSLibraryJarUsagesCollector.java index 9997555154a1..e4b154b522de 100644 --- a/java/java-impl/src/com/intellij/internal/statistic/libraryJar/FUSLibraryJarUsagesCollector.java +++ b/java/java-impl/src/com/intellij/internal/statistic/libraryJar/FUSLibraryJarUsagesCollector.java @@ -14,7 +14,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; import com.intellij.psi.search.ProjectScope; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java index 1c164301d076..1463edf0312c 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java @@ -34,7 +34,7 @@ import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.ui.*; import com.intellij.usageView.UsageViewUtil; import com.intellij.util.IncorrectOperationException; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/java/java-impl/src/com/intellij/refactoring/rename/naming/ConstructorParameterOnFieldRenameRenamer.java b/java/java-impl/src/com/intellij/refactoring/rename/naming/ConstructorParameterOnFieldRenameRenamer.java index dce33571cccc..bd7b9a98a40f 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/naming/ConstructorParameterOnFieldRenameRenamer.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/naming/ConstructorParameterOnFieldRenameRenamer.java @@ -21,7 +21,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.impl.light.LightElement; import com.intellij.refactoring.RefactoringBundle; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NonNls; import java.util.Set; diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/ClassesWithAnnotatedMembersSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/ClassesWithAnnotatedMembersSearcher.java index df24c61f0736..be4752fcb54b 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/ClassesWithAnnotatedMembersSearcher.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/ClassesWithAnnotatedMembersSearcher.java @@ -11,7 +11,7 @@ import com.intellij.psi.search.searches.ClassesWithAnnotatedMembersSearch; import com.intellij.psi.search.searches.ScopedQueryExecutor; import com.intellij.util.Processor; import com.intellij.util.QueryExecutor; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import java.util.Set; diff --git a/platform/core-api/src/com/intellij/lang/folding/CustomFoldingBuilder.java b/platform/core-api/src/com/intellij/lang/folding/CustomFoldingBuilder.java index aa16f5bfc8ba..e0abe5d2c039 100644 --- a/platform/core-api/src/com/intellij/lang/folding/CustomFoldingBuilder.java +++ b/platform/core-api/src/com/intellij/lang/folding/CustomFoldingBuilder.java @@ -11,7 +11,7 @@ import com.intellij.openapi.util.registry.RegistryValue; import com.intellij.psi.PsiComment; import com.intellij.psi.PsiElement; import com.intellij.util.containers.Stack; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsTaskHandler.java b/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsTaskHandler.java index d62f96452562..581d04148c0f 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsTaskHandler.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/branch/DvcsTaskHandler.java @@ -26,7 +26,7 @@ import com.intellij.util.NullableFunction; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.FactoryMap; import com.intellij.util.containers.MultiMap; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java index ec05e04330ae..594c909bfea7 100644 --- a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java @@ -23,7 +23,7 @@ import com.intellij.openapi.util.Ref; import com.intellij.psi.codeStyle.*; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TabbedPaneWrapper; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.util.ui.GraphicsUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/GutterIconsConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/GutterIconsConfigurable.java index 049b23649ce2..5fa0ec3db259 100644 --- a/platform/lang-impl/src/com/intellij/application/options/editor/GutterIconsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/editor/GutterIconsConfigurable.java @@ -28,7 +28,7 @@ import com.intellij.util.NullableFunction; import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.util.ui.EmptyIcon; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java index 621485206dbe..82385d12442a 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java @@ -37,7 +37,7 @@ import com.intellij.refactoring.util.MoveRenameUsageInfo; import com.intellij.usageView.UsageInfo; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.MultiMap; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java b/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java index 380708b23c16..a795eb3782fc 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java @@ -7,7 +7,7 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.BooleanTableCellEditor; import com.intellij.ui.BooleanTableCellRenderer; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.util.ui.ColumnInfo; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/platform-tests/testSrc/com/intellij/ui/mac/touchbar/TouchbarTest.java b/platform/platform-tests/testSrc/com/intellij/ui/mac/touchbar/TouchbarTest.java index ba78649204a2..2d711f4b6c52 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/mac/touchbar/TouchbarTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/mac/touchbar/TouchbarTest.java @@ -3,7 +3,7 @@ package com.intellij.ui.mac.touchbar; import com.intellij.openapi.util.IconLoader; import com.intellij.ui.mac.foundation.Foundation; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import javax.swing.*; import java.util.Collection; diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/agent/impl/RemoteAgentReflectiveProxyFactory.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/agent/impl/RemoteAgentReflectiveProxyFactory.java index 01268e0eaf7b..6071bd8ee55b 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/agent/impl/RemoteAgentReflectiveProxyFactory.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/agent/impl/RemoteAgentReflectiveProxyFactory.java @@ -16,7 +16,7 @@ package com.intellij.remoteServer.agent.impl; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.Nullable; import java.lang.reflect.*; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java index eeab876f51aa..838bded694e9 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictTracker.java @@ -22,7 +22,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.EditorNotifications; import com.intellij.util.Alarm; import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; import org.jetbrains.annotations.NotNull; diff --git a/platform/vcs-impl/src/com/intellij/util/treeWithCheckedNodes/SelectedState.java b/platform/vcs-impl/src/com/intellij/util/treeWithCheckedNodes/SelectedState.java index 65d93ad88d36..f51ab41c3ab6 100644 --- a/platform/vcs-impl/src/com/intellij/util/treeWithCheckedNodes/SelectedState.java +++ b/platform/vcs-impl/src/com/intellij/util/treeWithCheckedNodes/SelectedState.java @@ -17,7 +17,7 @@ package com.intellij.util.treeWithCheckedNodes; import com.intellij.util.Processor; import com.intellij.util.containers.SLRUMap; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/IfStatementMissingBreakInLoopInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/IfStatementMissingBreakInLoopInspection.java index b6b84a4cec6a..8198cf655846 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/IfStatementMissingBreakInLoopInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/IfStatementMissingBreakInLoopInspection.java @@ -8,7 +8,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.util.PsiUtil; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java index e736aa9bf0f2..5a5a76d46686 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java @@ -26,7 +26,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.testIntegration.TestFramework; import com.intellij.util.ObjectUtils; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.siyeh.ig.callMatcher.CallMatcher; import com.siyeh.ig.junit.JUnitCommonClassNames; import org.jetbrains.annotations.NonNls; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/folding/GroovyFoldingBuilder.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/folding/GroovyFoldingBuilder.java index 35f5565660bf..79124b998db9 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/folding/GroovyFoldingBuilder.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/folding/GroovyFoldingBuilder.java @@ -29,7 +29,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.IElementType; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.groovydoc.parser.GroovyDocElementTypes; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/typeEnhancers/ClosureParameterEnhancer.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/typeEnhancers/ClosureParameterEnhancer.java index 4dc4197980ff..d6a4d814177c 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/typeEnhancers/ClosureParameterEnhancer.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/typeEnhancers/ClosureParameterEnhancer.java @@ -6,7 +6,7 @@ import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiUtil; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java index ab7b1971d646..9b8b042b5ccf 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java @@ -16,7 +16,7 @@ import com.intellij.psi.util.*; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MostlySingularMultiMap; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/AlignmentProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/AlignmentProvider.java index 9119552209b8..ebb7d2579157 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/AlignmentProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/AlignmentProvider.java @@ -4,7 +4,7 @@ package org.jetbrains.plugins.groovy.formatter; import com.intellij.formatting.Alignment; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/CompleteReferenceExpression.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/CompleteReferenceExpression.java index ebd1e5f8bc17..c540166e512e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/CompleteReferenceExpression.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/CompleteReferenceExpression.java @@ -14,7 +14,7 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.Consumer; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import icons.JetgroovyIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java index 03ab91282999..ca67071a6fcf 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java @@ -25,7 +25,7 @@ import com.intellij.psi.impl.light.LightElement; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.extensions.NamedArgumentDescriptor; import org.jetbrains.plugins.groovy.lang.completion.GrMainCompletionProvider; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyParameterInfoHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyParameterInfoHandler.java index ee05dee618c5..1a5f14d83bfe 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyParameterInfoHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyParameterInfoHandler.java @@ -10,7 +10,7 @@ import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.ArrayUtil; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/DefaultGroovyVariableNameValidator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/DefaultGroovyVariableNameValidator.java index f503eca75b13..612738210f50 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/DefaultGroovyVariableNameValidator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/DefaultGroovyVariableNameValidator.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiField; import com.intellij.psi.PsiModifier; import com.intellij.psi.PsiNamedElement; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.lang.psi.GrControlFlowOwner; import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyImportOptimizerRefactoringHelper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyImportOptimizerRefactoringHelper.java index 755abbe8bc83..0cd13b4bcc48 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyImportOptimizerRefactoringHelper.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyImportOptimizerRefactoringHelper.java @@ -13,7 +13,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.refactoring.RefactoringHelper; import com.intellij.usageView.UsageInfo; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import org.jetbrains.plugins.groovy.lang.psi.api.toplevel.imports.GrImportStatement; import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerator.java index a146f8f33892..d1607d5dca88 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/CodeBlockGenerator.java @@ -6,7 +6,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.util.PsiUtil; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.codeInspection.noReturnMethod.MissingReturnInspection; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ConvertToJavaProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ConvertToJavaProcessor.java index 72cde54010ff..32a910ca207e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ConvertToJavaProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ConvertToJavaProcessor.java @@ -17,7 +17,7 @@ import com.intellij.refactoring.ui.UsageViewDescriptorAdapter; import com.intellij.usageView.UsageInfo; import com.intellij.usageView.UsageViewDescriptor; import com.intellij.util.IncorrectOperationException; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import org.jetbrains.plugins.groovy.refactoring.GroovyRefactoringBundle; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionContext.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionContext.java index ab5933921ade..76b9ad074371 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionContext.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionContext.java @@ -19,7 +19,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMethod; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java index 71569736c79d..27fd3ca90049 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/GenerationUtil.java @@ -10,7 +10,7 @@ import com.intellij.psi.scope.PsiScopeProcessor; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.TypeConversionUtil; import java.util.HashMap; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java index 2290e95a00cb..0118cae053df 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java @@ -14,7 +14,7 @@ import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.ArrayUtilRt; import com.intellij.util.IncorrectOperationException; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java index 1fc2ae78635b..8d1f7fc8be3b 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomProjectProcessorUtils.java @@ -27,7 +27,7 @@ import com.intellij.util.Function; import com.intellij.util.Processor; import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.util.xml.DomUtil; import com.intellij.util.xml.GenericDomValue; import com.intellij.util.xml.impl.GenericDomValueReference; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/generate/GenerateManagedDependencyAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/generate/GenerateManagedDependencyAction.java index 69d11be36faf..87ecc588f278 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/generate/GenerateManagedDependencyAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/generate/GenerateManagedDependencyAction.java @@ -22,7 +22,7 @@ import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Processor; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.util.xml.ui.actions.generate.GenerateDomElementAction; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.maven.dom.DependencyConflictId; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenDuplicateDependenciesInspection.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenDuplicateDependenciesInspection.java index 1428dd15117c..cb13a6349506 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenDuplicateDependenciesInspection.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenDuplicateDependenciesInspection.java @@ -23,7 +23,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.xml.XmlTag; import com.intellij.util.Processor; import com.intellij.util.containers.MultiMap; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.util.xml.DomFileElement; import com.intellij.util.xml.highlighting.DomElementAnnotationHolder; import com.intellij.util.xml.highlighting.DomElementsInspection; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/ExtractManagedDependenciesAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/ExtractManagedDependenciesAction.java index 4d43c5a68069..b1958bb9545b 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/ExtractManagedDependenciesAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/ExtractManagedDependenciesAction.java @@ -29,7 +29,7 @@ import com.intellij.psi.xml.XmlElement; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.actions.BaseRefactoringAction; import com.intellij.util.Function; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.util.xml.DomUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java index 16e2e020e033..e727c724e396 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java @@ -31,7 +31,7 @@ import com.intellij.usageView.UsageInfo; import com.intellij.usageView.UsageViewContentManager; import com.intellij.usages.*; import com.intellij.util.Processor; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.dom.MavenDomProjectProcessorUtils; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectCreateExternalTargetDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectCreateExternalTargetDialog.java index 7f1e54e2cc08..e7f318654e98 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectCreateExternalTargetDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectCreateExternalTargetDialog.java @@ -7,7 +7,7 @@ import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.util.ui.JBUI; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.svn.api.Url; diff --git a/spellchecker/src/com/intellij/spellchecker/engine/Transformation.java b/spellchecker/src/com/intellij/spellchecker/engine/Transformation.java index 3c4497082d1a..5ae25574097a 100644 --- a/spellchecker/src/com/intellij/spellchecker/engine/Transformation.java +++ b/spellchecker/src/com/intellij/spellchecker/engine/Transformation.java @@ -16,7 +16,7 @@ package com.intellij.spellchecker.engine; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.jetbrains.annotations.Nullable; import java.util.Collection; diff --git a/xml/impl/src/com/intellij/xml/impl/schema/SchemaDefinitionsSearch.java b/xml/impl/src/com/intellij/xml/impl/schema/SchemaDefinitionsSearch.java index fadcd25e4f1c..3c60dbd422f7 100644 --- a/xml/impl/src/com/intellij/xml/impl/schema/SchemaDefinitionsSearch.java +++ b/xml/impl/src/com/intellij/xml/impl/schema/SchemaDefinitionsSearch.java @@ -17,7 +17,7 @@ import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; import com.intellij.util.Processor; import com.intellij.util.QueryExecutor; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import com.intellij.xml.index.SchemaTypeInfo; import com.intellij.xml.index.SchemaTypeInheritanceIndex; import com.intellij.xml.index.XmlNamespaceIndex; diff --git a/xml/tests/src/com/intellij/xml/index/XmlSchemaTypeInheritanceTest.java b/xml/tests/src/com/intellij/xml/index/XmlSchemaTypeInheritanceTest.java index 32f032e17284..1d3705827d5c 100644 --- a/xml/tests/src/com/intellij/xml/index/XmlSchemaTypeInheritanceTest.java +++ b/xml/tests/src/com/intellij/xml/index/XmlSchemaTypeInheritanceTest.java @@ -19,7 +19,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase; import com.intellij.util.containers.MultiMap; -import com.intellij.util.containers.hash.HashSet; +import java.util.HashSet; import org.junit.Assert; import java.io.File;