Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 14 Jul 2010 10:06:17 +0000 (14:06 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 14 Jul 2010 10:06:17 +0000 (14:06 +0400)
296 files changed:
1  2 
java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkClasspath.java
java/compiler/impl/src/com/intellij/compiler/impl/CompositeScope.java
java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/ModuleChunk.java
java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java
java/compiler/openapi/src/com/intellij/compiler/ant/ChunkBuildExtension.java
java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java
java/idea-ui/src/com/intellij/facet/impl/autodetecting/EnableAutodetectionWorker.java
java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java
java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryCompositionOptionsPanel.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryTableEditor.java
java/java-impl/src/com/intellij/analysis/JavaAnalysisScope.java
java/java-impl/src/com/intellij/codeInsight/completion/ExpectedTypeBasedCompletionProvider.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java
java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java
java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java
java/java-impl/src/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java
java/java-impl/src/com/intellij/codeInspection/SuppressManagerImpl.java
java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalAnnotator.java
java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java
java/java-impl/src/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java
java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java
java/java-impl/src/com/intellij/ide/actions/CreateTemplateInPackageAction.java
java/java-impl/src/com/intellij/ide/hierarchy/call/CallerMethodsTreeStructure.java
java/java-impl/src/com/intellij/ide/projectView/PsiClassChildrenSource.java
java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewLibrariesNode.java
java/java-impl/src/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java
java/java-impl/src/com/intellij/psi/impl/file/JavaDirectoryServiceImpl.java
java/java-impl/src/com/intellij/psi/impl/source/javadoc/ParamDocTagInfo.java
java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java
java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FilePathReferenceProvider.java
java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassListReferenceProvider.java
java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiCompositeModifierList.java
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageSearcher.java
java/java-impl/src/com/intellij/refactoring/extractMethod/InputVariables.java
java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java
java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationRules.java
java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/suppressLocalInspection/before12.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/UnusedImportsTest.java
java/java-tests/testSrc/com/intellij/codeInsight/intention/SplitIfActionTest.java
java/java-tests/testSrc/com/intellij/psi/impl/compiled/ClassFileStubBuilderTest.java
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java
java/openapi/src/com/intellij/ui/classFilter/ClassFilterEditor.java
java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java
platform/bootstrap/src/com/intellij/ide/ClassloaderUtil.java
platform/lang-api/src/com/intellij/psi/search/LocalSearchScope.java
platform/lang-api/src/com/intellij/psi/util/PsiTreeUtil.java
platform/lang-api/src/com/intellij/refactoring/util/CommonRefactoringUtil.java
platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupItem.java
platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionToolRegistrar.java
platform/lang-impl/src/com/intellij/execution/actions/RunContextAction.java
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutUiImpl.java
platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java
platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java
platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java
platform/lang-impl/src/com/intellij/ide/structureView/impl/common/PsiTreeElementBase.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/JdkScope.java
platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java
platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleWithDependenciesScope.java
platform/lang-impl/src/com/intellij/openapi/paths/PsiDynaReference.java
platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/CompositeProjectRoot.java
platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectJdkImpl.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleSourceOrderEntryImpl.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderRootsEnumeratorImpl.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java
platform/lang-impl/src/com/intellij/psi/impl/cache/impl/CompositeCacheManager.java
platform/lang-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessorBase.java
platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteHandler.java
platform/platform-api/src/com/intellij/openapi/ui/DetailsComponent.java
platform/platform-api/src/com/intellij/openapi/ui/DialogBuilder.java
platform/platform-api/src/com/intellij/ui/EditorNotificationPanel.java
platform/platform-api/src/com/intellij/ui/switcher/QuickAccessSettings.java
platform/platform-api/src/com/intellij/util/ui/update/LazyUiDisposable.java
platform/platform-impl/src/com/intellij/diagnostic/DialogAppender.java
platform/platform-impl/src/com/intellij/ide/actions/ExportSettingsAction.java
platform/platform-impl/src/com/intellij/ide/dnd/DnDEnabler.java
platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationUtil.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/ColorProvider.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/TextBasedSoftWrapPainter.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/options/ex/ProjectConfigurablesGroup.java
platform/platform-impl/src/com/intellij/openapi/wm/ex/WindowManagerEx.java
platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
platform/platform-impl/src/com/intellij/ui/LightweightHint.java
platform/platform-impl/src/com/intellij/ui/content/impl/ContentImpl.java
platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
platform/testFramework/src/com/intellij/testFramework/TreePrintCondition.java
platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java
platform/usageView/src/com/intellij/usages/impl/ImportUsageFilteringRuleProvider.java
platform/util/src/com/intellij/openapi/util/io/FileUtil.java
platform/util/src/com/intellij/util/xmlb/PropertyAccessor.java
platform/util/src/com/intellij/util/xmlb/TagBinding.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RootsCalculator.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcesor.java
plugins/InspectionGadgets/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/resources/JDBCResourceInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesStaticMethodInspection.java
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/AnnotationUtilEx.java
plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java
plugins/IntelliLang/src/org/intellij/plugins/intelliLang/SettingsUI.java
plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.java
plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/TagPanel.java
plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/XmlAttributePanel.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/ReplaceAssertEqualsWithAssertLiteralIntention.java
plugins/ant/src/com/intellij/lang/ant/config/execution/AntCommandLineBuilder.java
plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java
plugins/ant/src/com/intellij/lang/ant/config/impl/AllJarsUnderDirEntry.java
plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntTargetReference.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ActionOnSelectedElement.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RemoveLocallyDeletedFilesAction.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/SelectedFiles.java
plugins/devkit/src/inspections/InspectionDescriptionNotFoundInspection.java
plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java
plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseLibrariesModificationsTest.java
plugins/git4idea/src/git4idea/GitVcs.java
plugins/git4idea/src/git4idea/annotate/GitFileAnnotation.java
plugins/git4idea/src/git4idea/config/GitVcsSettings.java
plugins/git4idea/src/git4idea/history/GitUsersComponent.java
plugins/git4idea/src/git4idea/rebase/GitRebaseUtils.java
plugins/git4idea/src/git4idea/update/GitSkippedCommits.java
plugins/git4idea/src/org/jetbrains/git4idea/util/ScriptGenerator.java
plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyFileTypeLoader.java
plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/generator/GroovyToJavaGenerator.java
plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerClassFilterProvider.java
plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java
plugins/groovy/src/org/jetbrains/plugins/groovy/findUsages/GroovyFindUsagesHandlerFactory.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GrTypeConverter.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/modifiers/GrModifierListImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrStubUtils.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrFieldElementType.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/surroundWith/descriptors/GroovyStmtsSurroundDescriptor.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChageSignatureUsageSearcher.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/GroovyOverrideImplementTest.groovy
plugins/hg4idea/src/META-INF/plugin.xml
plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgPushAction.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandAuthenticator.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgLogCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevertCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRepositorySelectorComponent.java
plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java
plugins/java-i18n/src/com/intellij/codeInspection/i18n/InvalidPropertyKeyInspection.java
plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitUnusedCodeExtension.java
plugins/junit/src/com/intellij/execution/junit2/states/TestState.java
plugins/maven/facade-api/src/org/jetbrains/idea/maven/facade/MavenWrapperExecutionResult.java
plugins/maven/facade-api/src/org/jetbrains/idea/maven/facade/ProfileApplicationResult.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReaderResult.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/services/MavenServicesManager.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/ApplicationLoader.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/GotoSymbolContributor.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/RngDocumentationProvider.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/ReferenceAnnotator.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/RncElementType.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/RncElementTypes.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/RncHighlighter.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/RncParserDefinition.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/RncTokenTypes.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/RngCompactLanguage.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/folding/RncFoldingBuilder.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/formatting/RncBlock.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/lexer/CompactSyntaxLexerAdapter.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/parser/AbstractParsing.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/parser/DeclarationParsing.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/parser/NameClassParsing.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/parser/PatternParsing.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/parser/RncParser.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/RncDefine.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/RncGrammar.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/RncInclude.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/RncRef.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/FollowFileHint.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/PatternReference.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncAnnotationImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDeclImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDivImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDocument.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncElementImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncExternalRefImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncFileReferenceImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncGrammarImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncIncludeImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncNameImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncNsDeclImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncParentRefImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncRefImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/util/EscapeUtil.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/util/RenameUtil.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/convert/IdeaDriver.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/convert/IdeaErrorHandler.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/inspections/BaseInspection.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/inspections/RngDomInspection.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/inspections/UnusedDefineInspection.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/ModelAnnotator.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverriddenDefineRenderer.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverriddenDefineSearcher.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverridingDefineRenderer.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/AttributeFinder.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/CompositeDescriptor.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/NamedPatternFilter.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RecursionSaveWalker.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngNsDescriptor.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngXmlAttributeDescriptor.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/DefinitionResolver.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/GrammarFactory.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxIncludeIndex.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxIncludeProvider.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/model/resolve/RelaxSymbolIndex.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/references/ResolvingVisitor.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/validation/MessageViewHelper.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/validation/Psi2SaxAdapter.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/validation/RngParser.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/validation/RngSchemaValidator.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/validation/XmlInstanceValidator.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngAttribute.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngChoice.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngData.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngDefine.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngDiv.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngDomElement.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngElement.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngEmpty.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngExternalRef.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngGrammar.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngInclude.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngNotAllowed.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngOpenPattern.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngOpenPatterns.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngParentRef.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngRef.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngText.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/RngValue.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/CreatePatternFix.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/DefinitionReference.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/RngDefineImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/RngDefineMetaData.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/RngDomElementBase.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/RngHrefConverter.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/RngIncludeImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/RngRefImpl.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/RngReferenceConverter.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/names/AnyName.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/names/Name.java
plugins/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/names/OpenNameClasses.java
plugins/relaxng/test/org/intellij/plugins/relaxNG/ElementCompletionTest.java
plugins/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java
plugins/relaxng/test/org/intellij/plugins/relaxNG/RngXmlValidationTest.java
plugins/relaxng/test/org/intellij/plugins/testUtil/ResourceUtil.java
plugins/svn4idea/src/org/jetbrains/idea/svn/annotate/SvnFileAnnotation.java
plugins/testng/src/com/theoryinpractice/testng/inspection/DependsOnGroupsInspection.java
plugins/testng/src/com/theoryinpractice/testng/inspection/TestNGUnusedCodeExtension.java
plugins/ui-designer/testData/MethodCallInSuperTest.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltNamespaceContext.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ModeReference.java
xml/dom-impl/src/com/intellij/util/dom/generator/ModelGen.java
xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationHolderImpl.java
xml/dom-impl/src/com/intellij/util/xml/impl/DomManagerImpl.java
xml/dom-impl/src/com/intellij/util/xml/impl/StableInvocationHandler.java
xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionsRegistrarImpl.java
xml/impl/src/com/intellij/codeInsight/template/zencoding/XmlZenCodingTemplate.java
xml/impl/src/com/intellij/codeInsight/template/zencoding/tokens/ClosingBraceToken.java
xml/impl/src/com/intellij/codeInsight/template/zencoding/tokens/OpeningBraceToken.java
xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java
xml/impl/src/com/intellij/lang/xml/XmlFileViewProvider.java
xml/impl/src/com/intellij/lang/xml/XmlFoldingBuilder.java
xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlTextManipulator.java
xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URIReferenceProvider.java
xml/impl/src/com/intellij/psi/impl/source/xml/SchemaPrefixReference.java
xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java
xml/impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java
xml/impl/src/com/intellij/xml/util/HtmlUtil.java
xml/impl/src/com/intellij/xml/util/XmlNSDescriptorSequence.java
xml/openapi/src/com/intellij/xml/breadcrumbs/BreadcrumbsComponent.java
xml/openapi/src/com/intellij/xml/util/XmlTagUtil.java

index 203d7b0e9f9bcb83e4a4a21ed3f88a094c37e388,9f477c12ebf8c7f27c32da3dde24e8264a4f23b6..49dca1efd178b524cb1b1d3d64e1ba69964acaa3
@@@ -29,7 -30,7 +30,6 @@@ import com.intellij.util.containers.Ord
  import gnu.trove.TObjectHashingStrategy;
  
  import java.io.File;
--import java.util.Arrays;
  import java.util.HashSet;
  import java.util.Set;
  
index 2b8195fbe55641cae9fb9e9536ea0f8ff488e7a9,0c9c73a09761e3fd47ddee627a282b1d4432742f..6a893e1db87dc27df1856d4add807e48c4b43983
@@@ -31,7 -32,7 +32,10 @@@ import com.intellij.util.containers.Con
  import gnu.trove.THashSet;
  import org.jetbrains.annotations.NotNull;
  
--import java.util.*;
++import java.util.ArrayList;
++import java.util.HashSet;
++import java.util.List;
++import java.util.Set;
  
  public class CompositeScope extends UserDataHolderBase implements CompileScope{
    private final List<CompileScope> myScopes = new ArrayList<CompileScope>();
index d507c2b13dfb425b38f16bce019c35ccc55f8a01,956a744f58ca520b1d8b868c6327e0ec9e00c224..6be70a82b99115f1a47cf6fffa2aaa26fc1fa850
@@@ -23,13 -23,14 +23,20 @@@ import com.intellij.openapi.module.Lang
  import com.intellij.openapi.module.Module;
  import com.intellij.openapi.project.Project;
  import com.intellij.openapi.projectRoots.Sdk;
--import com.intellij.openapi.roots.*;
++import com.intellij.openapi.roots.JdkOrderEntry;
++import com.intellij.openapi.roots.ModuleRootManager;
++import com.intellij.openapi.roots.OrderEntry;
++import com.intellij.openapi.roots.OrderEnumerator;
  import com.intellij.openapi.util.Computable;
  import com.intellij.openapi.util.Condition;
  import com.intellij.openapi.vfs.VfsUtil;
  import com.intellij.openapi.vfs.VirtualFile;
  import com.intellij.pom.java.LanguageLevel;
--import com.intellij.util.*;
++import com.intellij.util.Chunk;
++import com.intellij.util.JarClasspathHelper;
++import com.intellij.util.PathsList;
++import com.intellij.util.StringBuilderSpinAllocator;
+ import com.intellij.util.containers.ContainerUtil;
  import com.intellij.util.containers.OrderedSet;
  import gnu.trove.THashMap;
  import gnu.trove.TObjectHashingStrategy;
index 01a8b9d93ea137fe8418b847f0dd8ce5032e3027,33860fbdef9a026d490ad3ed974fcd330a059991..b93546665a69b60d4db65bbfd23ab1cc2dee0559
@@@ -29,7 -30,7 +30,6 @@@ import org.jetbrains.annotations.NotNul
  
  import javax.swing.*;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  /**
index ec48ecd1c038b53e26d65b721cb8daf42710ad8f,d9ad4e52143dffe212fab157e9c7c82320c1248f..9693b333fe68ccc647fb9dab831c773d4184c1bc
@@@ -25,7 -26,7 +26,6 @@@ import org.jetbrains.annotations.NonNls
  import org.jetbrains.annotations.NotNull;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  public abstract class ChunkBuildExtension {
index e46254a68ea1c8db0887a82ce1cdd5c7daaaa4b9,194812adaf4cb9a5abde4319bae204a5eef68d09..58cae05339ba6976bdcf6481df2a6155992d2dc0
@@@ -21,10 -21,13 +21,12 @@@ import com.intellij.openapi.actionSyste
  import com.intellij.openapi.module.Module;
  import com.intellij.openapi.project.Project;
  import com.intellij.openapi.projectRoots.Sdk;
- import com.intellij.openapi.roots.ModuleRootManager;
- import com.intellij.openapi.roots.OrderEnumerator;
+ import com.intellij.openapi.roots.*;
  import com.intellij.openapi.vfs.VirtualFile;
  import com.intellij.openapi.vfs.encoding.EncodingProjectManager;
 -import com.intellij.util.PairFunction;
+ import com.intellij.util.NotNullFunction;
+ import org.jetbrains.annotations.NotNull;
+ import org.jetbrains.annotations.Nullable;
  
  import java.nio.charset.Charset;
  
index cf6117ba10a38530cb71a680212d1de6b384a790,4e89eadb1cbd68472bf44b0d70df230631cddb8c..325db2644062776e7d9ee8b6ed4bc2534ce4238c
@@@ -21,8 -21,8 +21,8 @@@ import com.intellij.openapi.module.Modu
  import com.intellij.openapi.progress.ProgressManager;
  import com.intellij.openapi.project.Project;
  import com.intellij.openapi.project.ProjectBundle;
--import com.intellij.openapi.roots.ModuleRootManager;
  import com.intellij.openapi.roots.ContentIterator;
++import com.intellij.openapi.roots.ModuleRootManager;
  import com.intellij.openapi.util.MultiValuesMap;
  import com.intellij.openapi.vfs.VirtualFile;
  import com.intellij.openapi.vfs.VirtualFileManager;
index 9db56d737dab5f2ef14ceb1e223ab623392e5ae2,a579c34bc5d3ca61e344293cdfe65dbb50ccef09..8b93138d0d22a0ab5094573cb80ab65f1ff06184
@@@ -39,7 -40,7 +40,6 @@@ import org.jetbrains.annotations.Nullab
  
  import javax.swing.*;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  /**
index d8ac377ce2d65032816c98dfd8640d1dbc617301,c83ffa19e9c68fc498dd2e7fa3f5bf7c87f4fa80..dbac4734213633762a2f88fe84945153023e4c82
@@@ -34,16 -34,17 +34,19 @@@ import com.intellij.openapi.vfs.LocalFi
  import com.intellij.openapi.vfs.VfsUtil;
  import com.intellij.openapi.vfs.VirtualFile;
  import com.intellij.ui.IdeBorderFactory;
+ import com.intellij.util.containers.ContainerUtil;
  import com.intellij.util.ui.UIUtil;
--import org.jetbrains.annotations.Nullable;
  import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
  
  import javax.swing.*;
  import java.awt.*;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
--import java.util.*;
++import java.util.ArrayList;
++import java.util.HashSet;
  import java.util.List;
++import java.util.Set;
  
  /**
   * @author nik
index 4b892ac125628ea622c630cfa51d67da8192d101,7529737d2b30919f76f9a8aede3eb3a292c69fa5..9737f780ab294c11011a6a8a26d3012b3c598100
@@@ -27,8 -27,8 +27,8 @@@ import com.intellij.openapi.roots.ui.co
  import com.intellij.openapi.ui.popup.JBPopupFactory;
  import com.intellij.openapi.util.Computable;
  import com.intellij.openapi.util.Condition;
--import com.intellij.ui.SimpleTextAttributes;
  import com.intellij.ui.ScreenUtil;
++import com.intellij.ui.SimpleTextAttributes;
  import com.intellij.util.Consumer;
  
  import javax.swing.*;
index 5b5f7c5a3397a1886ba391487ba3833c77ae3322,3fc1a0f5433b8fe7ae4f99be4eebe90310333bf1..a8124ef78e0ae5df633b9995c0841978ae794b15
@@@ -30,9 -30,9 +30,7 @@@ import com.intellij.openapi.project.Pro
  import com.intellij.openapi.projectRoots.ui.Util;
  import com.intellij.openapi.roots.AnnotationOrderRootType;
  import com.intellij.openapi.roots.JavadocOrderRootType;
--import com.intellij.openapi.roots.ModuleRootManager;
  import com.intellij.openapi.roots.OrderRootType;
--import com.intellij.openapi.roots.impl.libraries.LibraryEx;
  import com.intellij.openapi.roots.impl.libraries.LibraryImpl;
  import com.intellij.openapi.roots.impl.libraries.LibraryTableImplUtil;
  import com.intellij.openapi.roots.libraries.Library;
index 04dd2497913b962c25d107fc3d56e509a08daca5,1aa96564689967e56f89df8cb57dfefe8f91ed98..fb893e7bb2589d08d409287e3b351956983d9032
@@@ -28,11 -28,12 +28,11 @@@ import com.intellij.openapi.roots.Proje
  import com.intellij.openapi.vfs.VirtualFile;
  import com.intellij.psi.*;
  import com.intellij.psi.search.GlobalSearchScope;
--import com.intellij.psi.search.SearchScope;
  import com.intellij.psi.search.PackageScope;
++import com.intellij.psi.search.SearchScope;
+ import com.intellij.util.containers.ContainerUtil;
  import org.jetbrains.annotations.NotNull;
  
--import java.util.Arrays;
  import java.util.HashSet;
  import java.util.Set;
  
index 65478857ce33c2450b1cb67f5dbb22eed1601243,0553bc9744593ba3acd85c459d500c473682b736..86f668f34910936f11462b99563c1931674a82fc
@@@ -23,7 -24,7 +24,6 @@@ import com.intellij.util.containers.Con
  import gnu.trove.THashSet;
  import org.jetbrains.annotations.NotNull;
  
--import java.util.Arrays;
  import java.util.Collection;
  
  /**
index 867393fa645b950944a79704a36c0e45cc93aa8a,93ebf645028db6f6f4f38c23b25df038bb1b806e..c05c1fd7f579f1acb8ea2d3690e37f07fa2f94ed
@@@ -32,7 -33,7 +33,6 @@@ import org.jetbrains.annotations.NonNls
  import org.jetbrains.annotations.NotNull;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  public class AddMethodFix extends IntentionAndQuickFixAction {
index 701c0d85b446c980a34fe63bb0968f17a611a2cb,c78bbb66b5793a44266e5e19e4505270accc75a9..ecc223f8601630b4d277687bb5327690db07b595
@@@ -26,13 -26,14 +26,12 @@@ import com.intellij.openapi.util.TextRa
  import com.intellij.psi.*;
  import com.intellij.psi.util.PsiTypesUtil;
  import com.intellij.util.IncorrectOperationException;
++import com.intellij.util.containers.ContainerUtil;
++import org.jetbrains.annotations.NotNull;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
 -import com.intellij.util.containers.ContainerUtil;
--import org.jetbrains.annotations.NotNull;
--
  public class AddReturnFix implements IntentionAction {
    private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.AddReturnFix");
    private final PsiMethod myMethod;
index 17b11aebe4db7dc6e54df37d972809c5b9ac0133,2b6497b47f4d29cb15e4f70fca480eb00b3f4fdc..1176657dce4a0d8672e5025a9b3b04e1ef85c498
@@@ -18,7 -18,7 +18,6 @@@ package com.intellij.codeInsight.daemon
  import com.intellij.codeInsight.*;
  import com.intellij.codeInsight.completion.proc.VariablesProcessor;
  import com.intellij.codeInsight.daemon.QuickFixBundle;
--import static com.intellij.codeInsight.daemon.impl.quickfix.CreateClassKind.*;
  import com.intellij.codeInsight.intention.impl.CreateClassDialog;
  import com.intellij.codeInsight.lookup.LookupElement;
  import com.intellij.codeInsight.lookup.LookupItemUtil;
@@@ -66,6 -66,6 +65,8 @@@ import org.jetbrains.annotations.Nullab
  
  import java.util.*;
  
++import static com.intellij.codeInsight.daemon.impl.quickfix.CreateClassKind.*;
++
  /**
   * @author mike
   */
index 4d2493a058038f009fcc37a9425f9840f66e75fd,10bf173c30e729b977871670ca4b644b40444995..fa3f7272e443d782a78eec4cd6d8e4bf8d24576c
@@@ -29,7 -30,7 +30,6 @@@ import com.intellij.util.containers.Con
  import org.jetbrains.annotations.Nullable;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  import java.util.Map;
  
index 4bde9f7011e5bf02992beeb4627c1c22d1858a61,efbaf7021f02ef47a094800c4d60c6bd8fe528ed..df55f85033f05d5eb151b041139c874320613505
@@@ -21,16 -21,16 +21,16 @@@ import com.intellij.codeInsight.CodeIns
  import com.intellij.codeInsight.daemon.ImplicitUsageProvider;
  import com.intellij.ide.util.MemberChooser;
  import com.intellij.openapi.diagnostic.Logger;
++import com.intellij.openapi.extensions.Extensions;
  import com.intellij.openapi.project.Project;
  import com.intellij.openapi.ui.Messages;
--import com.intellij.openapi.extensions.Extensions;
  import com.intellij.psi.*;
  import com.intellij.psi.codeStyle.CodeStyleManager;
  import com.intellij.psi.codeStyle.JavaCodeStyleManager;
  import com.intellij.psi.codeStyle.VariableKind;
  import com.intellij.psi.javadoc.PsiDocComment;
--import com.intellij.psi.util.TypeConversionUtil;
  import com.intellij.psi.util.PsiUtil;
++import com.intellij.psi.util.TypeConversionUtil;
  import com.intellij.util.Function;
  import com.intellij.util.IncorrectOperationException;
  import com.intellij.util.containers.ContainerUtil;
@@@ -39,7 -39,7 +39,6 @@@ import org.jetbrains.annotations.NotNul
  import org.jetbrains.annotations.Nullable;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.Collections;
  import java.util.List;
  
index 9d9da0b9233844fe40c9185203186918d5b4c338,8f0077d617412e017790bfcd8de910ad1df1610d..2ea2f1c5916d666874605454c8fbe75df49ac7f4
@@@ -24,10 -24,10 +24,10 @@@ import com.intellij.openapi.application
  import com.intellij.openapi.application.Result;
  import com.intellij.openapi.command.WriteCommandAction;
  import com.intellij.openapi.diagnostic.Logger;
++import com.intellij.openapi.editor.Document;
  import com.intellij.openapi.editor.Editor;
  import com.intellij.openapi.editor.LogicalPosition;
  import com.intellij.openapi.editor.ScrollType;
--import com.intellij.openapi.editor.Document;
  import com.intellij.openapi.editor.actions.EnterAction;
  import com.intellij.openapi.fileEditor.FileDocumentManager;
  import com.intellij.openapi.project.Project;
@@@ -42,7 -43,7 +43,6 @@@ import org.jetbrains.annotations.NotNul
  import org.jetbrains.annotations.Nullable;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  /**
index 2556bc2b1d9ec0b19d9a19674c9807d8759b57c0,ba20d25c2517df53700df95ff6ad369a7279bb8f..f11ff20b9bd900032b837259b3dc0fcd5df17e92
@@@ -32,7 -32,7 +32,6 @@@ import com.intellij.psi.codeStyle.CodeS
  import com.intellij.psi.codeStyle.JavaCodeStyleManager;
  import com.intellij.psi.codeStyle.SuggestedNameInfo;
  import com.intellij.psi.codeStyle.VariableKind;
--import com.intellij.psi.search.GlobalSearchScope;
  import com.intellij.psi.search.LocalSearchScope;
  import com.intellij.psi.search.searches.ReferencesSearch;
  import com.intellij.psi.util.PsiTreeUtil;
index a9ba2a0d4e15dc62a88d2b58819a0aed98e4d3f6,a35e0729bc12b745ff2f205bbff69d36dbe9f913..e9bda185b2c94dffdb3017ccaf4b86a07987c946
@@@ -27,7 -28,7 +28,6 @@@ import org.jetbrains.annotations.NotNul
  import org.jetbrains.annotations.Nullable;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.LinkedHashSet;
  import java.util.Set;
  
index 9f9e4d5800a440baa11453ed6d0a416de8f63ccb,e94b1d57f997667bcf10dd4770c1c16c5fc1f5ae..a88ed63d4ff66dd02ad33060499dbcb52fd52cd8
@@@ -23,8 -23,8 +23,8 @@@ package com.intellij.codeInspection
  import com.intellij.codeInsight.AnnotationUtil;
  import com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings;
  import com.intellij.codeInsight.daemon.HighlightDisplayKey;
--import com.intellij.codeInsight.daemon.impl.actions.SuppressByJavaCommentFix;
  import com.intellij.codeInsight.daemon.impl.actions.SuppressAllForClassFix;
++import com.intellij.codeInsight.daemon.impl.actions.SuppressByJavaCommentFix;
  import com.intellij.codeInsight.daemon.impl.actions.SuppressFix;
  import com.intellij.codeInsight.daemon.impl.actions.SuppressForClassFix;
  import com.intellij.openapi.application.ApplicationManager;
index bb820f68ed2e55187f0991e84448dabcb8d2873e,1d044ef57c488ac63ef7c2a320e180d2ef24ed04..56c4d9fab4fd1c452e9992156929a23e9e402161
@@@ -19,8 -19,9 +19,12 @@@ import com.intellij.codeInsight.daemon.
  import com.intellij.codeInspection.reference.*;
  import com.intellij.psi.*;
  import com.intellij.psi.controlFlow.*;
+ import com.intellij.util.containers.ContainerUtil;
  
--import java.util.*;
++import java.util.ArrayList;
++import java.util.Collection;
++import java.util.HashSet;
++import java.util.List;
  
  /**
   * User: anna
index 29e43e5ec01d52e3a86ddec7ddc60168c2576656,6f6d27acc0aaff44e011ce8b4ce37f1f44a2b6fc..285ce57ffdc0d6b01edae982afd19c8c4ed86730
@@@ -26,7 -26,7 +26,6 @@@
  package com.intellij.codeInspection.deadCode;
  
  import com.intellij.ExtensionPoints;
--import com.intellij.ui.SeparatorFactory;
  import com.intellij.analysis.AnalysisScope;
  import com.intellij.codeInsight.AnnotationUtil;
  import com.intellij.codeInsight.daemon.GroupNames;
@@@ -57,7 -57,8 +56,9 @@@ import com.intellij.psi.search.PsiSearc
  import com.intellij.psi.util.PsiMethodUtil;
  import com.intellij.psi.util.PsiTreeUtil;
  import com.intellij.refactoring.safeDelete.SafeDeleteHandler;
++import com.intellij.ui.SeparatorFactory;
  import com.intellij.util.IncorrectOperationException;
+ import com.intellij.util.containers.ContainerUtil;
  import com.intellij.util.containers.HashMap;
  import com.intellij.util.text.CharArrayUtil;
  import org.jdom.Element;
index d17847b123531c3107e5091ac3828dad76863b6a,a6d43911c17669deb9bec7a48bcb50e5c73c175a..81bfd2dac6e9e4e1bc9b336681cef97599ed410c
@@@ -22,7 -23,7 +23,6 @@@ import com.intellij.util.containers.Con
  import org.jetbrains.annotations.NotNull;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  /**
index 90ee10cf58a36e907f7f71753f5a1e07a9ce1c45,be32c0d6304f91120e79e5c184df470bf4e3cf1e..bbc0535caf89bac3a84bbfdb708e45a0f2f1585f
@@@ -49,7 -49,7 +49,10 @@@ import com.intellij.util.containers.Con
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
--import java.util.*;
++import java.util.ArrayList;
++import java.util.Collection;
++import java.util.HashSet;
++import java.util.List;
  
  /**
   * @author peter
index 5defec828c81f7d13564dcfad0362023f865dde2,877ce67594724681fe7eab40d6ff8e4522ce57d3..aa9db99da131e627541b60e53e1c1c7e68f64003
@@@ -17,7 -17,7 +17,9 @@@
  package com.intellij.ide.actions;
  
  import com.intellij.ide.IdeView;
--import com.intellij.openapi.actionSystem.*;
++import com.intellij.openapi.actionSystem.DataContext;
++import com.intellij.openapi.actionSystem.LangDataKeys;
++import com.intellij.openapi.actionSystem.PlatformDataKeys;
  import com.intellij.openapi.project.Project;
  import com.intellij.openapi.roots.ProjectFileIndex;
  import com.intellij.openapi.roots.ProjectRootManager;
index 8db99a3526b9a625e38457b68a599213fa94b999,92f02bd561b1a9dcaa154f8f6c51e172578f1e2a..5b111ecfd3c6d4dd465e374e2ba2a2ff0d8bd978
@@@ -25,9 -25,10 +25,9 @@@ import com.intellij.psi.util.PsiUtil
  import com.intellij.psi.util.TypeConversionUtil;
  import com.intellij.util.ArrayUtil;
  import com.intellij.util.Processor;
+ import com.intellij.util.containers.ContainerUtil;
  import com.intellij.util.containers.HashMap;
  
--import java.util.Arrays;
  import java.util.HashSet;
  import java.util.Map;
  import java.util.Set;
index fc22d4ee89f58757ef1375ea9af1a05c7796ebbc,88b660cc33463f0036f3a1ddeda71098717f0dc6..05fb03c40eea7262960aebffe7d79fad881a51a6
@@@ -17,8 -17,9 +17,8 @@@ package com.intellij.ide.projectView
  
  import com.intellij.psi.PsiClass;
  import com.intellij.psi.PsiElement;
+ import com.intellij.util.containers.ContainerUtil;
  
--import java.util.Arrays;
  import java.util.List;
  
  public interface PsiClassChildrenSource {
index 392af2a56520ba703bc71c1ae61ef44b616555ce,ad6c45bb560361d742252b1020fd3d64746ffd0e..d0358681dc743ee17a211d466f0dae573a8915a5
@@@ -23,7 -23,7 +23,9 @@@ import com.intellij.ide.util.treeView.A
  import com.intellij.openapi.module.Module;
  import com.intellij.openapi.module.ModuleManager;
  import com.intellij.openapi.project.Project;
--import com.intellij.openapi.roots.*;
++import com.intellij.openapi.roots.ModuleRootManager;
++import com.intellij.openapi.roots.ProjectFileIndex;
++import com.intellij.openapi.roots.ProjectRootManager;
  import com.intellij.openapi.vfs.JarFileSystem;
  import com.intellij.openapi.vfs.VirtualFile;
  import com.intellij.util.Icons;
index d1dfb59d57af9421be3c317191de7e91adff7456,0d385daa40b1888f858032c6326d833c6562b31d..af92a3512defd4e2dd5d57571ea2dc08b42f3d97
@@@ -32,7 -33,7 +33,10 @@@ import org.jetbrains.annotations.NonNls
  import org.jetbrains.annotations.NotNull;
  
  import javax.swing.*;
--import java.util.*;
++import java.util.ArrayList;
++import java.util.HashMap;
++import java.util.List;
++import java.util.Map;
  
  public class JavaColorSettingsPage implements ColorSettingsPage, InspectionColorSettingsPage {
    private static final AttributesDescriptor[] ourDescriptors = {
index 9ad79c328ef77d696cdfc4a370b4af4c440beee2,100037aa9bc82a66716230415eb7837e8dee56a1..5d790db4269356b20f9cde1f5d42b2aaa9e928bc
@@@ -41,7 -42,7 +42,6 @@@ import com.intellij.util.containers.Con
  import org.jetbrains.annotations.NotNull;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  import java.util.Properties;
  
index 4bd8be483631ddbadf866df33f995159c6b18d9d,d7cb5d811554cba4f91c48b4d20a36a2b29a6766..a6e5ef4bc54f5c44d7fc43fed2086533f54ee959
@@@ -17,12 -17,13 +17,12 @@@ package com.intellij.psi.impl.source.ja
  
  import com.intellij.codeInsight.daemon.JavaErrorMessages;
  import com.intellij.lang.ASTNode;
--import com.intellij.pom.java.LanguageLevel;
  import com.intellij.psi.*;
--import com.intellij.psi.util.PsiUtil;
  import com.intellij.psi.javadoc.JavadocTagInfo;
  import com.intellij.psi.javadoc.PsiDocTagValue;
++import com.intellij.psi.util.PsiUtil;
  import com.intellij.util.ArrayUtil;
+ import com.intellij.util.containers.ContainerUtil;
  
  import java.util.ArrayList;
  import java.util.Arrays;
index b6902af7d931ff044890115352b85774bc8ad73d,5dc1fc850453f5d6c87b992fe1206079436bd135..23dbad408018767e3e6d992125719295e2dd3057
@@@ -41,7 -42,7 +42,6 @@@ import org.jetbrains.annotations.NotNul
  import org.jetbrains.annotations.Nullable;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  /**
index 8e4d9613e170be22cd489b9835c2ad21fe19c748,20a161681a0bc2995384acf7d901b1140f28b076..5b831c1fb15088574505829ac23bca10a1464ed4
@@@ -23,9 -23,10 +23,13 @@@ import com.intellij.openapi.util.TextRa
  import com.intellij.openapi.vfs.VirtualFile;
  import com.intellij.psi.*;
  import com.intellij.util.ProcessingContext;
+ import com.intellij.util.containers.ContainerUtil;
  import org.jetbrains.annotations.NotNull;
  
--import java.util.*;
++import java.util.ArrayList;
++import java.util.Collection;
++import java.util.Collections;
++import java.util.List;
  
  /**
   * @author cdr
index d2ab61beac96eb8ef9aa2106f80cdcfd95666c11,e32df206a0ba0ca1ce4259a49748f3a3d1419132..3e4950313e26dedd37f1c05d1a7fce79a046ff21
@@@ -27,7 -27,7 +27,10 @@@ import com.intellij.psi.xml.XmlTag
  import com.intellij.util.containers.ContainerUtil;
  import org.jetbrains.annotations.NotNull;
  
--import java.util.*;
++import java.util.ArrayList;
++import java.util.HashSet;
++import java.util.List;
++import java.util.Set;
  
  /**
   * Created by IntelliJ IDEA.
index a53b0ccdfd29eaee3d685f189abb4ab7799edf58,dc40a808c6159f63851541b996a9d86664623c52..44b60dbebb646b98285fd382707f6930676510ca
@@@ -26,7 -27,7 +27,6 @@@ import com.intellij.util.containers.Con
  import org.jetbrains.annotations.NotNull;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  public class PsiCompositeModifierList extends LightModifierList {
index 0ec986ef9178210c85ec62708ec749bb046b0d24,e4fa01f147d33b48d1a5b82a375bc9353250e57f..c4e4fa3ac81524a817d6bf75eb31249ea9dfd249
@@@ -38,7 -39,7 +39,6 @@@ import com.intellij.util.containers.Con
  import com.intellij.util.containers.HashSet;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.Set;
  
  /**
index 655eba6ec29e0945dfa014d68393f239503687d6,f4f0af847677b604da7d7413c20579cedcb85029..9a7418d021ec16972b5312bb254afdd96cdc01c3
@@@ -32,8 -33,12 +33,9 @@@ import com.intellij.psi.util.TypeConver
  import com.intellij.refactoring.util.ParameterTablePanel;
  import com.intellij.refactoring.util.duplicates.DuplicatesFinder;
  import com.intellij.util.ArrayUtil;
 -import com.intellij.util.containers.*;
+ import org.jetbrains.annotations.Nullable;
  
  import java.util.*;
 -import java.util.HashMap;
 -import java.util.HashSet;
  
  public class InputVariables {
    private final List<ParameterTablePanel.VariableData> myInputVariables;
index 5c5036683675e1678e46f9a8eec435652157b7e2,8251c894ac99fed55925ca5ce8a28887b1bfa562..f0510564c98306d426582467cf337680e2206972
@@@ -48,7 -49,7 +49,6 @@@ import com.intellij.util.containers.Mul
  import org.jetbrains.annotations.NotNull;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.HashSet;
  import java.util.List;
  
index da6f08d8bd3be837368e4d39cadfd70784439ec8,ebe534526fb399691a6e250301dca5d50536875d..aa029927fd38604152aac38408dfa634919ceaad
@@@ -5,11 -5,12 +5,12 @@@ import com.intellij.openapi.util.Pair
  import com.intellij.psi.*;
  import com.intellij.psi.search.SearchScope;
  import com.intellij.psi.util.TypeConversionUtil;
--import com.intellij.refactoring.typeMigration.rules.*;
++import com.intellij.refactoring.typeMigration.rules.RootTypeConversionRule;
++import com.intellij.refactoring.typeMigration.rules.TypeConversionRule;
+ import com.intellij.util.containers.ContainerUtil;
  import org.jetbrains.annotations.NonNls;
  import org.jetbrains.annotations.Nullable;
  
--import java.util.Arrays;
  import java.util.LinkedList;
  
  /**
index 5cd57a03d9dde4afb9b5eb3b31451d90e0c1ee14,9f82d897afce1326ef2fd2773d431e961a9ac5b9..2d9a51938ce48af6af3a0166b592fc8a4fe2b931
@@@ -63,8 -64,8 +63,6 @@@ import org.jetbrains.annotations.Nullab
  
  import java.util.*;
  
--import static com.intellij.psi.JavaTokenType.*;
--
  public class RefactoringUtil {
    private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.util.RefactoringUtil");
    public static final int EXPR_COPY_SAFE = 0;
index 0000000000000000000000000000000000000000,932db34511921cb34c2722135ee5045bd10ed3a1..9ca346215c777bb0f47dcd55da088208c9efc28a
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,15 +1,16 @@@
 -import java.awt.event.ActionListener;
+ // "Suppress for class" "false"
++
+ import java.awt.event.ActionEvent;
++import java.awt.event.ActionListener;
+ class Test {
+     @javax.annotation.Generated(value = "unknown")
+     public static void main(String[] args) {
+         ActionListener listener = new ActionListener() {
+             public void actionPerformed(ActionEvent e) {
+                 int <caret>i = 0;
+                 System.out.println(i);
+             }
+         };
+     }
+ }
index e1e8c5adf29991de38105c0f9ebc8af3cb255082,be499435ea0b70cdc8c398cb92abe0a9dbcda4f9..c648204feb93cd4e9ab59614b19c1dcd18ace151
@@@ -2,8 -2,8 +2,6 @@@ package com.intellij.codeInsight.daemon
  
  import com.intellij.codeInspection.LocalInspectionTool;
  import com.intellij.codeInspection.unusedImport.UnusedImportLocalInspection;
--import com.intellij.openapi.roots.LanguageLevelProjectExtension;
--import com.intellij.pom.java.LanguageLevel;
  
  public class UnusedImportsTest extends DaemonAnalyzerTestCase {
    private static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/unusedImports";
index 9bff30635d2fe1b3dea62e0bcfae37bf9d3feebb,e6dbb1e6e0dca6f6fdf7984f75aacc212426472d..ba7002cdc621f67a409d51546b085f42e4a5d355
@@@ -1,8 -1,8 +1,8 @@@
  package com.intellij.codeInsight.intention;
  
  import com.intellij.codeInsight.intention.impl.SplitIfAction;
--import com.intellij.testFramework.LightCodeInsightTestCase;
  import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
++import com.intellij.testFramework.LightCodeInsightTestCase;
  
  /**
   * @author mike
index b5e9fa54880f3e76fe91ceb08ad12a5b9ffcbf29,04f3686b1f354211b71d359af9a02b74d48a20b4..434e454f511b1cbc7924a083fece39256d82e230
@@@ -1,8 -1,9 +1,10 @@@
  package com.intellij.psi.impl.compiled;
  
+ import com.intellij.util.containers.ContainerUtil;
  import junit.framework.TestCase;
  
--import java.util.*;
++import java.util.HashSet;
++import java.util.Set;
  
  /**
   * Pavel.Fatin, 18.02.2010
index 873f5b27ffd3c668096573da4f28512c8c7d84fb,c1dfde6cee6847f9f70af65383a053ce8bce2fca..ef41e85586f958cfdf9aa6981fa36292af0d2e89
@@@ -13,6 -14,8 +13,7 @@@ import com.intellij.psi.codeStyle.CodeS
  import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
  import com.intellij.refactoring.extractMethod.ExtractMethodProcessor;
  import com.intellij.refactoring.extractMethod.PrepareFailedException;
 -import com.intellij.refactoring.util.RefactoringUtil;
+ import com.intellij.refactoring.introduceVariable.IntroduceVariableBase;
  import com.intellij.refactoring.util.duplicates.Match;
  import com.intellij.testFramework.LightCodeInsightTestCase;
  import com.intellij.util.IncorrectOperationException;
index 9d93d39a8288daf3f34ef307f382473d00cfdcc6,8553a9634ff5e061a938c8381aec69c72a1be399..4ad546d0c7ea56cc787144e08bf605597a89ac48
@@@ -9,9 -9,10 +9,9 @@@ import com.intellij.psi.PsiMethod
  import com.intellij.psi.search.GlobalSearchScope;
  import com.intellij.refactoring.inheritanceToDelegation.InheritanceToDelegationProcessor;
  import com.intellij.util.ArrayUtil;
+ import com.intellij.util.containers.ContainerUtil;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  /**
index cb964f5b21c3714fd12af8dc568db5da5e304d58,6c93c225d4a210963eba86c3ddabb1cec89b0c65..d2ebffc8bfbdfbb0930e0bfffc0d877fdf223c3b
@@@ -43,7 -44,7 +44,6 @@@ import java.awt.*
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
  import java.awt.event.KeyEvent;
--import java.util.Arrays;
  import java.util.Iterator;
  import java.util.LinkedList;
  import java.util.List;
index fcbd332cec6d59250b6e88f7332614b01737c0ad,c9c99172d0cecb04706a0a1cc6f111cbd573b971..52872af29fcc1366fc380034712ad66160568346
   */
  package com.intellij.testFramework;
  
- import com.intellij.psi.impl.JavaPsiFacadeEx;
- import com.intellij.openapi.projectRoots.Sdk;
- import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
 +import com.intellij.openapi.module.ModuleType;
 +import com.intellij.openapi.module.StdModuleTypes;
++import com.intellij.openapi.projectRoots.Sdk;
++import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
+ import com.intellij.openapi.roots.LanguageLevelProjectExtension;
+ import com.intellij.pom.java.LanguageLevel;
+ import com.intellij.psi.impl.JavaPsiFacadeEx;
 -import com.intellij.openapi.projectRoots.Sdk;
 -import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
 -import com.intellij.openapi.module.ModuleType;
 -import com.intellij.openapi.module.StdModuleTypes;
  
  /**
   * A TestCase for single PsiFile being opened in Editor conversion. See configureXXX and checkResultXXX method docs.
index ca799298e9952a0f28580038288f7ee444701b08,ed2577ac1e1ca9444f145b2086679891756fdbd2..d521547510f4b563ac867464501ca0d2379e2af6
@@@ -37,7 -38,7 +38,6 @@@ import java.lang.reflect.InvocationTarg
  import java.net.MalformedURLException;
  import java.net.URL;
  import java.net.URLClassLoader;
--import java.util.Arrays;
  import java.util.HashMap;
  import java.util.Iterator;
  import java.util.List;
index 79436963175e1037efe6794aa2aef27350a4cc56,dc86c0ce2677d7f75db2f391b7281495b189295f..07b20d5cff787a0c2822f33d1247ea67f564ef14
@@@ -24,7 -25,7 +25,10 @@@ import com.intellij.util.containers.Con
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
--import java.util.*;
++import java.util.ArrayList;
++import java.util.LinkedHashSet;
++import java.util.List;
++import java.util.Set;
  
  public class LocalSearchScope extends SearchScope {
    private static final Logger LOG = Logger.getInstance("#com.intellij.psi.search.LocalSearchScope");
index 121d83dc1adea6587821a340f00b0acdd78ac9a8,fa6182e6679f9768e9beb55d786a86bd26ddf7b6..471c3b15720e28c4b16a43629f41ec190c039ab3
@@@ -29,7 -30,7 +30,6 @@@ import org.jetbrains.annotations.NotNul
  import org.jetbrains.annotations.Nullable;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  public class PsiTreeUtil {
index 6e9dd404fb05e806199790eb88c048469b537a62,056f2b9509638f40d42949b91041efbaa78d1181..f1fe5d61ec87792e2f51ab39dfbd35bc930c4f3f
@@@ -16,6 -16,6 +16,7 @@@
  
  package com.intellij.refactoring.util;
  
++import com.intellij.codeInsight.hint.HintManager;
  import com.intellij.openapi.application.ApplicationManager;
  import com.intellij.openapi.editor.Editor;
  import com.intellij.openapi.fileTypes.FileTypeManager;
@@@ -27,7 -27,8 +28,7 @@@ import com.intellij.openapi.vfs.Virtual
  import com.intellij.psi.*;
  import com.intellij.psi.util.PsiTreeUtil;
  import com.intellij.refactoring.RefactoringBundle;
--import com.intellij.codeInsight.hint.HintManager;
+ import com.intellij.util.containers.ContainerUtil;
  import gnu.trove.THashSet;
  import org.jetbrains.annotations.NonNls;
  import org.jetbrains.annotations.NotNull;
index 62d4b1760b1ea079cdb2b00369ef19a20752ebea,b2135c4244c8671c0e07f22457fb29ca1b0aa0fd..9c6c9f786522aa20e5717daa507786f0918ec829
@@@ -52,7 -53,7 +53,6 @@@ import org.jetbrains.annotations.Nullab
  
  import javax.swing.*;
  import java.awt.*;
--import java.util.Arrays;
  import java.util.Comparator;
  import java.util.List;
  
index 821337b7d68c3eb4ecaceda42d0a145949842614,2d4a3ba141f491d8003d8995135ae14b91ac691a..74c93cfbcd01f286d13929adfec73e49cbd04c89
@@@ -33,7 -34,7 +34,6 @@@ import org.jetbrains.annotations.NotNul
  import org.jetbrains.annotations.Nullable;
  
  import javax.swing.*;
--import java.util.Arrays;
  import java.util.Map;
  import java.util.Set;
  
index bf513ae44682c9b2a0cf815596ad9cb6823bcaf7,6ff301d55d0bc28b2f6671843e7df55127ef13fa..bb76bb4cc22d46972f1b4be4927b7512d4892bdd
@@@ -35,7 -36,7 +36,6 @@@ import org.jetbrains.annotations.NotNul
  import java.lang.reflect.Constructor;
  import java.lang.reflect.InvocationTargetException;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.Set;
  import java.util.concurrent.atomic.AtomicBoolean;
  import java.util.regex.Pattern;
index 81f00caee222d39efb22f08de84661d16f3f7019,d575cc9460c78e1141481c6cafea21a7fa7b5136..5896941b7aa504022342bfcb4d28c9621af04f75
@@@ -18,10 -18,10 +18,8 @@@ package com.intellij.execution.actions
  
  import com.intellij.execution.*;
  import com.intellij.execution.configurations.RunConfiguration;
--import com.intellij.execution.runners.ExecutionEnvironment;
  import com.intellij.execution.runners.ProgramRunner;
  import com.intellij.openapi.actionSystem.Presentation;
--import com.intellij.openapi.ui.Messages;
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
index 40e7eedad0781faf440f1311bc68d8f2b5ce5a5f,93bc1668187401e05847c202ec74fa45023df1c7..208a3efcb3768f0d806a898d1b4d38ef050b225d
@@@ -29,7 -29,7 +29,6 @@@ import com.intellij.openapi.util.Dispos
  import com.intellij.openapi.util.Ref;
  import com.intellij.openapi.wm.IdeFocusManager;
  import com.intellij.openapi.wm.ToolWindow;
--import com.intellij.ui.AppIcon;
  import com.intellij.ui.components.panels.NonOpaquePanel;
  import com.intellij.ui.components.panels.Wrapper;
  import com.intellij.ui.content.*;
index f4dc8900fe31ab589b4bd8cf4af01a0d2be5f4fb,f50e4761d81b6e354a33fbdd76558af0a8497301..d50cd520c33b768ee1ed8354bee3742f68ecedc2
@@@ -32,7 -32,7 +32,6 @@@ import com.intellij.openapi.util.Action
  import com.intellij.openapi.util.Disposer;
  import com.intellij.openapi.util.Key;
  import com.intellij.openapi.wm.IdeFocusManager;
--import com.intellij.ui.AppIcon;
  import com.intellij.ui.content.Content;
  import com.intellij.ui.content.ContentFactory;
  import com.intellij.ui.content.ContentManager;
index 5a23064d76225959a5545ab38491e7fdffa646cf,174a53bdfda56922526e60bd6a97ffdb3bb3c65e..ef43605c008d1aaebb3cb9c59551358aa5797eba
@@@ -61,7 -62,7 +62,10 @@@ import javax.swing.*
  import javax.swing.event.DocumentEvent;
  import java.awt.*;
  import java.awt.event.*;
--import java.util.*;
++import java.util.ArrayList;
++import java.util.Collections;
++import java.util.HashSet;
++import java.util.Set;
  import java.util.regex.Pattern;
  
  public class EditorSearchComponent extends JPanel implements DataProvider {
index 8670d90ba00fb9d77d1dbd6a4acead0ee968c433,cc77cad1656dbe1c8b958958de2e888470c221a2..eef660c93153ed536219b791454a7e7d799119cd
@@@ -28,9 -28,9 +28,9 @@@ import com.intellij.openapi.fileEditor.
  import com.intellij.openapi.fileTypes.FileType;
  import com.intellij.openapi.fileTypes.FileTypeManager;
  import com.intellij.openapi.fileTypes.FileTypes;
--import com.intellij.openapi.project.Project;
  import com.intellij.openapi.project.DumbAware;
  import com.intellij.openapi.project.DumbService;
++import com.intellij.openapi.project.Project;
  import com.intellij.openapi.ui.popup.JBPopup;
  import com.intellij.openapi.ui.popup.JBPopupFactory;
  import com.intellij.openapi.ui.popup.JBPopupListener;
@@@ -43,7 -44,7 +44,9 @@@ import javax.swing.*
  import java.awt.*;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
--import java.util.*;
++import java.util.ArrayList;
++import java.util.Collections;
++import java.util.Comparator;
  import java.util.List;
  
  /**
index f124f54e4491374910474adf0bb1b17c1d0f3cdc,4840cfa0d704121a6da5fc43532e9a2b98634e05..462c30c6d5666b2b4dc0327b9cbe1f00b3193118
@@@ -34,9 -34,10 +34,9 @@@ import com.intellij.usages.UsageTarget
  import com.intellij.usages.UsageView;
  import com.intellij.usages.rules.UsageInFile;
  import com.intellij.usages.rules.UsageInFiles;
+ import com.intellij.util.containers.ContainerUtil;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.HashSet;
  import java.util.Set;
  
index a3c20ee4ec22679ee07564a1940e5ffc9a5e4e33,cbcf79a9f302882ad550b265c6b0f82eac3559ea..657b7347ea2e5b7f4131198962b99799bf22a338
@@@ -47,7 -48,7 +48,6 @@@ import org.jetbrains.annotations.NotNul
  import javax.swing.*;
  import javax.swing.tree.DefaultMutableTreeNode;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  /**
index 87f4845486c9cf4e7c9a14dc8cb35464300ebebb,7a8c4dbe7284f0a9b89b43e95bae5b13efc6d087..5d7704d1da59186ea95320c019511384859e16f6
@@@ -30,7 -31,7 +31,6 @@@ import org.jetbrains.annotations.Nullab
  
  import javax.swing.*;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.Collection;
  import java.util.List;
  
index 403116e9aea5394bf6bd7a50bad8c671ff3ac349,f976b779ff7d13d8953647e2529389c280195d03..22a438d5c6e9cf044101615b06298d57d111ccf6
@@@ -20,14 -20,15 +20,18 @@@ import com.intellij.navigation.ChooseBy
  import com.intellij.navigation.NavigationItem;
  import com.intellij.openapi.diagnostic.Logger;
  import com.intellij.openapi.progress.ProcessCanceledException;
++import com.intellij.openapi.project.DumbAware;
++import com.intellij.openapi.project.DumbService;
  import com.intellij.openapi.project.IndexNotReadyException;
  import com.intellij.openapi.project.Project;
--import com.intellij.openapi.project.DumbService;
--import com.intellij.openapi.project.DumbAware;
  import com.intellij.util.ArrayUtil;
+ import com.intellij.util.containers.ContainerUtil;
  
  import javax.swing.*;
--import java.util.*;
++import java.util.ArrayList;
++import java.util.HashSet;
++import java.util.List;
++import java.util.Set;
  
  /**
   * Contributor-based goto model
index 258f50da60a376a451b8aff23700d2541a3cb900,cc13b70881732fe71403e0aec457607e1876842f..d012ddab36336dfff89d548f02f2e8e6b2e8fbce
@@@ -24,9 -24,10 +24,9 @@@ import com.intellij.openapi.roots.Proje
  import com.intellij.openapi.roots.ProjectRootManager;
  import com.intellij.openapi.vfs.VirtualFile;
  import com.intellij.psi.search.GlobalSearchScope;
+ import com.intellij.util.containers.ContainerUtil;
  import org.jetbrains.annotations.NotNull;
  
--import java.util.Arrays;
  import java.util.LinkedHashSet;
  
  /**
index 7c47c75feda8dfe6d786b1521bb9ba57d3a80271,a4fee50dacf9aa97bf9128520fd487d47ceffc85..d943f7c4b886f8f56689bf82c0cea848a6401e5a
@@@ -26,7 -27,7 +27,9 @@@ import gnu.trove.THashSet
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
--import java.util.*;
++import java.util.LinkedHashSet;
++import java.util.List;
++import java.util.Set;
  
  /**
   * @author max
index 788dd7ff3cd66d808f0352c821eed369741a0c2c,6ab0be7833eaf56bf1d03b36705a998e905df112..cf38009d519676c49b5b6b712d556368c37bc9c6
@@@ -24,7 -25,7 +25,6 @@@ import com.intellij.util.containers.Con
  import org.jetbrains.annotations.NonNls;
  import org.jetbrains.annotations.NotNull;
  
--import java.util.Arrays;
  import java.util.LinkedHashSet;
  import java.util.List;
  import java.util.Set;
index 46b156bc6888590752650a181d583fdae53ffdd6,e2d040f4147338d151eeb8856914bf5b1a434326..ff275dfa37b1a76ee78e41e8a3bc8fce04db270f
@@@ -31,7 -32,7 +32,6 @@@ import org.jetbrains.annotations.NotNul
  import org.jetbrains.annotations.Nullable;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.Collection;
  import java.util.List;
  
index 65ebc7db7e56262c238e5d0c75a591b38d63d30c,8ce9223922d5bf0024312ba7140c3763dc3db5d8..330555b55844800d99e0b5ab4278f404e10ebcc0
@@@ -26,7 -27,7 +27,6 @@@ import org.jdom.Element
  import org.jetbrains.annotations.NotNull;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.Iterator;
  import java.util.List;
  
index b58d7672ca56e007e81e25d75df4d80e1b5a9c42,39b859acae1c4a8e450c39c3450d18734e4fe8d7..15e7719d7d4d80fa31d629a77ad56992cf006b7c
@@@ -35,7 -36,7 +36,10 @@@ import org.jdom.Element
  import org.jetbrains.annotations.NonNls;
  import org.jetbrains.annotations.NotNull;
  
--import java.util.*;
++import java.util.ArrayList;
++import java.util.HashSet;
++import java.util.List;
++import java.util.Set;
  
  public class ProjectJdkImpl extends UserDataHolderBase implements JDOMExternalizable, Sdk, SdkModificator {
    private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.projectRoots.impl.ProjectJdkImpl");
index 9eb3b5a5ff9ceb82ffce9969e75ae76eb5d5141c,783b6f1d4f04b490adf572e1e75db44433766cc5..fabff756a5be18b9d18c2e706146ff06a2b25792
@@@ -29,8 -29,8 +29,6 @@@ import org.jetbrains.annotations.NonNls
  import org.jetbrains.annotations.NotNull;
  
  import java.util.ArrayList;
--import java.util.Arrays;
--import java.util.List;
  
  /**
   *  @author dsl
index 49d66c7ca08a0647035daa167c9d28c788b4ae4c,1f2d8676a847893b31793753d42605b57788c1ed..fc43f4517a50df3d07a900b7274172dbce7a3701
@@@ -24,7 -26,7 +26,9 @@@ import com.intellij.util.PathsList
  import com.intellij.util.Processor;
  import org.jetbrains.annotations.NotNull;
  
--import java.util.*;
++import java.util.Collection;
++import java.util.Collections;
++import java.util.LinkedHashSet;
  
  /**
   * @author nik
index 71db64c4e063994cf9d03dc34f2994efbec37114,382e73aa40c60e1ad594f7a45f3091af6e407834..e54ee4ccecd79d0d8a737e3cdbcaf27c8197202b
@@@ -20,6 -20,6 +20,7 @@@ import com.intellij.openapi.application
  import com.intellij.openapi.components.PathMacroManager;
  import com.intellij.openapi.components.StateStorage;
  import com.intellij.openapi.components.Storage;
++import com.intellij.openapi.diagnostic.Logger;
  import com.intellij.openapi.extensions.Extensions;
  import com.intellij.openapi.module.Module;
  import com.intellij.openapi.options.ConfigurationException;
@@@ -39,7 -39,8 +40,7 @@@ import com.intellij.openapi.vfs.Virtual
  import com.intellij.openapi.vfs.VirtualFileAdapter;
  import com.intellij.openapi.vfs.VirtualFileEvent;
  import com.intellij.openapi.vfs.tracker.VirtualFileTracker;
--import com.intellij.openapi.diagnostic.Logger;
+ import com.intellij.util.containers.ContainerUtil;
  import com.intellij.util.io.fs.FileSystem;
  import com.intellij.util.io.fs.IFile;
  import com.intellij.util.messages.MessageBus;
index cc35eab4fc07f81a65850be051dee4cbfad93fcc,49b7ee48d519bc53b982d8554b786867064dc374..264ca6adc144bcceecdc15ad63266ac2e3c3f895
@@@ -28,7 -29,7 +29,6 @@@ import com.intellij.util.containers.Con
  import org.jetbrains.annotations.NotNull;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  /**
index d89b7e9a9d008c6eb733bc68e24d4e81dbcc3849,f267ab7679a93814b1443efed98bb66f7cced60f..425e5c86fd81ff820ca744472fac25d0919711d9
@@@ -30,7 -30,7 +30,9 @@@ import com.intellij.openapi.progress.Pr
  import com.intellij.openapi.progress.ProgressManager;
  import com.intellij.openapi.roots.ProjectFileIndex;
  import com.intellij.openapi.roots.ProjectRootManager;
--import com.intellij.openapi.util.*;
++import com.intellij.openapi.util.Computable;
++import com.intellij.openapi.util.Ref;
++import com.intellij.openapi.util.TextRange;
  import com.intellij.openapi.util.text.StringUtil;
  import com.intellij.openapi.vfs.VirtualFile;
  import com.intellij.psi.*;
index 0cb5e42d89ca4910ed89cbf09c8b24afd472ef35,19da85e8789423ed4d6b17a2d4248c3d5939f679..1bfbaf318059779d225ba312be95a229e16fa803
@@@ -30,7 -31,7 +31,10 @@@ import com.intellij.util.containers.has
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
--import java.util.*;
++import java.util.ArrayList;
++import java.util.List;
++import java.util.Map;
++import java.util.Set;
  
  /**
   * @author Maxim.Medvedev
index a25d7116fae3aae18cbb682acdb16b1bcd4580fd,995f4c148897af70b1d500ac81b0c17816762430..40a538486165ff153bdbbcc3d78d3695c9e4c0f2
@@@ -27,8 -27,9 +27,11 @@@ import com.intellij.openapi.ui.DialogWr
  import com.intellij.psi.PsiElement;
  import com.intellij.psi.PsiFile;
  import com.intellij.psi.util.PsiTreeUtil;
--import com.intellij.refactoring.*;
++import com.intellij.refactoring.RefactoringActionHandler;
++import com.intellij.refactoring.RefactoringBundle;
++import com.intellij.refactoring.RefactoringSettings;
  import com.intellij.refactoring.util.CommonRefactoringUtil;
+ import com.intellij.util.containers.ContainerUtil;
  import com.intellij.util.containers.HashSet;
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
index 1fedc010c035e3f6e6ca9a71dd31225bb07e9a75,5af34c7b32feadcb00468ac87a3ed725f1eacd74..feb56220c0813f27ff72e0cba4b37d1d1286a999
@@@ -34,7 -35,7 +35,6 @@@ import java.awt.event.ActionEvent
  import java.awt.event.ActionListener;
  import java.awt.geom.GeneralPath;
  import java.util.ArrayList;
--import java.util.Arrays;
  
  public class DetailsComponent {
  
index 57bfaf1072519c73f0767863ee559601c3a1ae47,68469f1ea6ef03a93bfe69cd7a8f793f75feef5a..5783b54908b0b877ec19ca6a252252d1035f2216
@@@ -27,7 -28,7 +28,6 @@@ import javax.swing.*
  import java.awt.*;
  import java.awt.event.ActionEvent;
  import java.util.ArrayList;
--import java.util.Arrays;
  
  public class DialogBuilder {
    private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.ui.DialogBuilder");
index 782257e0b6f18a46d20796a5d4615ccbbc50d3e3,e195664cf9c6097ca2ba0b1616e023631fbe17f7..b208e04f585639f95fe151c20fbed888d1b3bd40
@@@ -20,6 -20,9 +20,8 @@@ import com.intellij.openapi.actionSyste
  import com.intellij.openapi.actionSystem.ActionPlaces;
  import com.intellij.openapi.actionSystem.AnAction;
  import com.intellij.openapi.actionSystem.AnActionEvent;
 -import com.intellij.openapi.editor.Editor;
+ import com.intellij.openapi.editor.colors.EditorColors;
+ import com.intellij.openapi.editor.colors.EditorColorsManager;
  import org.jetbrains.annotations.NonNls;
  
  import javax.swing.*;
index e0a1a65147b128f841f95d18a7c950582382b346,95814fd3a3dc30fd46bdf7bd57f034d493105e82..6b194d0742cee92c1cc3f4e9c812220e3bd97f17
@@@ -26,7 -26,7 +26,6 @@@ import com.intellij.openapi.components.
  import com.intellij.openapi.keymap.Keymap;
  import com.intellij.openapi.keymap.KeymapManager;
  import com.intellij.openapi.keymap.KeymapManagerListener;
--import com.intellij.openapi.options.Configurable;
  import com.intellij.openapi.options.ConfigurationException;
  import com.intellij.openapi.options.SearchableConfigurable;
  import com.intellij.openapi.util.Disposer;
@@@ -46,7 -47,7 +46,9 @@@ import javax.swing.*
  import javax.swing.border.TitledBorder;
  import javax.swing.event.DocumentEvent;
  import java.awt.*;
--import java.awt.event.*;
++import java.awt.event.ItemEvent;
++import java.awt.event.ItemListener;
++import java.awt.event.KeyEvent;
  import java.text.NumberFormat;
  import java.util.*;
  
index cf9f4e3a35b87e131f31ffffb8b20d6f5a4a5315,e5dabe02a04e039925d289cbe215fa504a87fa11..f2f767603fb120941a261a995031e6ff3b888087
   */
  package com.intellij.util.ui.update;
  
++import com.intellij.ide.DataManager;
  import com.intellij.openapi.Disposable;
  import com.intellij.openapi.actionSystem.DataContext;
++import com.intellij.openapi.actionSystem.DataKey;
++import com.intellij.openapi.actionSystem.PlatformDataKeys;
++import com.intellij.openapi.application.ApplicationManager;
  import com.intellij.openapi.project.Project;
  import com.intellij.openapi.util.AsyncResult;
  import com.intellij.openapi.util.Disposer;
--import com.intellij.openapi.actionSystem.PlatformDataKeys;
--import com.intellij.openapi.actionSystem.DataKey;
--import com.intellij.openapi.application.ApplicationManager;
--import com.intellij.ide.DataManager;
--import org.jetbrains.annotations.Nullable;
  import org.jetbrains.annotations.NotNull;
++import org.jetbrains.annotations.Nullable;
  
  import javax.swing.*;
  
index d27bc542ce175b55320ae07ca36092fd6aa13b3e,de842f4a04f08f9ad07fc668d347d77d9a6b346d..c685b487680ea3436a77f4c754bc4f69131c7d9d
@@@ -26,7 -27,7 +27,6 @@@ import org.apache.log4j.spi.ThrowableIn
  
  import javax.swing.*;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  /**
index c806dec90f8ac15826a1159d6a92796090ce7e31,64e183d051bb6f28b3a0d9b609335f2b589f22ed..5e858ba00ee7dfb646764cfe4ede53a53ff19aab
@@@ -25,8 -25,8 +25,8 @@@ import com.intellij.openapi.actionSyste
  import com.intellij.openapi.application.ApplicationManager;
  import com.intellij.openapi.application.PathManager;
  import com.intellij.openapi.components.ExportableApplicationComponent;
--import com.intellij.openapi.components.ServiceBean;
  import com.intellij.openapi.components.ExportableComponent;
++import com.intellij.openapi.components.ServiceBean;
  import com.intellij.openapi.diagnostic.Logger;
  import com.intellij.openapi.project.DumbAware;
  import com.intellij.openapi.ui.Messages;
index 23a0334f13e8876edc802c33cf6cd3206c2a5f9f,f5165ef3ccc6d55ba4fdbdb24f3c5f4b11ac2250..59166304d73ff4f91439acb24fd2ea75a103256e
@@@ -34,7 -35,7 +35,6 @@@ import java.awt.event.MouseEvent
  import java.awt.event.MouseListener;
  import java.lang.reflect.Field;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.EventListener;
  import java.util.List;
  
index 05a7b3512f6a88d0e28700a188a9e15010f66a43,d10cd17f6e302fe5b2e014ddb8ec5e871455b073..775faa3907d5956931f3d32c7324c6cd31946704
@@@ -35,7 -36,7 +36,6 @@@ import java.awt.*
  import java.awt.event.MouseAdapter;
  import java.awt.event.MouseListener;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.Iterator;
  import java.util.List;
  
index 3047c9753bc2f5b5561b55aa489cd73beaf12a78,f05068661394eb30d2bd34acd05a124caccefb2d..248e6f87adcfeb034c8d0d9f9ffe6b45b6dee94d
@@@ -50,7 -52,7 +52,7 @@@ import java.awt.*
  import java.awt.event.ComponentAdapter;
  import java.awt.event.ComponentEvent;
  import java.awt.event.MouseEvent;
--import java.util.*;
++import java.util.ArrayList;
  import java.util.List;
  
  public class ActionToolbarImpl extends JPanel implements ActionToolbar {
index 0000000000000000000000000000000000000000,7978c3cb6a6ad2e5243cda2180f097fedcbef09c..2b3d60b4fae25be485d6cbe5be06708d76fa0a6f
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,118 +1,120 @@@
 -import java.util.*;
+ /*
+  * Copyright 2000-2010 JetBrains s.r.o.
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ package com.intellij.openapi.editor.impl;
+ import com.intellij.openapi.editor.Editor;
+ import com.intellij.openapi.editor.colors.ColorKey;
+ import com.intellij.openapi.editor.colors.EditorColorsScheme;
+ import java.awt.*;
++import java.util.ArrayList;
++import java.util.Arrays;
++import java.util.Collections;
+ import java.util.List;
+ /**
+  * Defines common contract for target {@link Color} retrieving.
+  *
+  * @author Denis Zhdanov
+  * @since Jul 2, 2010 11:12:07 AM
+  */
+ public abstract class ColorProvider {
+   /**
+    * @return    target {@link Color} object managed by the current holder
+    */
+   public abstract Color getColor();
+   /**
+    * Factory method for creating color holder that always returns given {@link Color} object.
+    *
+    * @param color   target color to use
+    * @return        color holder that uses given color all the time
+    */
+   public static ColorProvider byColor(Color color) {
+     return new StaticColorHolder(color);
+   }
+   /**
+    * Shortcut for calling {@link #byColorsScheme(EditorColorsScheme, ColorKey...)} with colors scheme retrieved from the given editor.
+    *
+    * @param editor    target colors scheme holder
+    * @param keys      target color identifiers
+    * @return          color holder that delegates target color retrieval to the colors scheme associated
+    *                  with the given editor using given color keys
+    */
+   public static ColorProvider byColorScheme(Editor editor, ColorKey ... keys) {
+     return byColorsScheme(editor.getColorsScheme(), keys);
+   }
+   /**
+    * Factory method for creating color holder that delegates target color retrieval to the given colors scheme.
+    * It checks if particular color key has a value at the given scheme and falls back to the next key if any
+    * (i.e. the order of given arguments is significant).
+    * <p/>
+    * There is a possible case that there are no colors for all of the given color keys -
+    * {@link EditorColorsScheme#getDefaultForeground() default color} is used then.
+    *
+    * @param scheme    target colors scheme to use
+    * @param keys      target color identifiers
+    * @return          color holder that delegates target color retrieval to the given colors scheme using given color keys
+    */
+   public static ColorProvider byColorsScheme(EditorColorsScheme scheme, ColorKey ... keys) {
+     return new ColorSchemeBasedHolder(scheme, keys);
+   }
+   private static class StaticColorHolder extends ColorProvider {
+     private final Color myColor;
+     StaticColorHolder(Color color) {
+       myColor = color;
+     }
+     @Override
+     public Color getColor() {
+       return myColor;
+     }
+   }
+   private static class ColorSchemeBasedHolder extends ColorProvider {
+     private final EditorColorsScheme myScheme;
+     private final List<ColorKey> myKeys = new ArrayList<ColorKey>();
+     ColorSchemeBasedHolder(EditorColorsScheme scheme, ColorKey ... keys) {
+       myScheme = scheme;
+       myKeys.addAll(Arrays.asList(keys));
+       Collections.reverse(myKeys); // Reverse collection in order to reduce removal cost
+     }
+     @Override
+     public Color getColor() {
+       while (!myKeys.isEmpty()) {
+         ColorKey key = myKeys.get(myKeys.size() - 1);
+         Color result = myScheme.getColor(key);
+         if (result == null || result.equals(myScheme.getDefaultForeground())) {
+           myKeys.remove(myKeys.size() - 1);
+         }
+         else {
+           return result;
+         }
+       }
+       return myScheme.getDefaultForeground();
+     }
+   }
+ }
index fd68ccc3616343b01dd4dfd59260a1793899a117,366aeac94c99441c2f4bb80e3468745839f8436c..52f41be992cbe1d360a86e5150b6e026e01c2331
@@@ -15,9 -15,9 +15,9 @@@
   */
  package com.intellij.openapi.editor.impl.softwrap;
  
- import com.intellij.openapi.editor.impl.ColorHolder;
 -import com.intellij.openapi.editor.impl.ColorProvider;
  import com.intellij.openapi.editor.Editor;
  import com.intellij.openapi.editor.ex.util.EditorUtil;
++import com.intellij.openapi.editor.impl.ColorProvider;
  import com.intellij.openapi.editor.impl.FontInfo;
  import com.intellij.openapi.editor.impl.TextDrawingCallback;
  import org.jetbrains.annotations.NotNull;
index d3a690c854d660aad643f015d691d386880d0ffe,89cb3dfd4c093148239595de9af466c3cc5feaba..6b07780bd4551cbfb6b03db21299a6d11dfa011a
@@@ -75,7 -75,7 +75,6 @@@ import java.beans.PropertyChangeEvent
  import java.beans.PropertyChangeListener;
  import java.io.File;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.Collection;
  import java.util.List;
  
index 9cadef712ded1a39d6a7c76ac65f600fcf4b5b4b,c8ff36fcf9ad9416242d9d90f9b85539a6c2c8d4..6a30cb8420121f2ebc5cc12717f69a0a967c97fe
@@@ -20,7 -21,7 +21,6 @@@ import com.intellij.util.containers.Con
  import org.jetbrains.annotations.Nullable;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.Iterator;
  import java.util.List;
  
index a0cea2a06e2d1d102e04bd31861dfe032134248c,5e344ac4f8599f4354a4b86f989c92a932a59da7..6782c4a892a80ec612df771d5dcb722996b8ebac
   */
  package com.intellij.openapi.wm.ex;
  
 -import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl;
  import com.intellij.openapi.project.Project;
--import com.intellij.openapi.wm.WindowManager;
  import com.intellij.openapi.wm.IdeFrame;
++import com.intellij.openapi.wm.WindowManager;
  import com.intellij.openapi.wm.impl.CommandProcessor;
  import com.intellij.openapi.wm.impl.DesktopLayout;
  import com.intellij.openapi.wm.impl.IdeFrameImpl;
index a9842fd988afd403f07de69f9da9446275a67aa6,b06ae1c07483a37fce7c2ca863e1e873c2f1bf05..615edd73283cc6f0081bf5f48b3181b4fa6b112b
@@@ -15,7 -15,7 +15,6 @@@
   */
  package com.intellij.ui;
  
--import com.intellij.openapi.diagnostic.Logger;
  import com.intellij.openapi.util.Comparing;
  import com.intellij.util.ui.UIUtil;
  import org.jetbrains.annotations.NotNull;
index 34570a2b290c1ff75372e6b7ae5e277116d51d49,743e7bddef856c488aae123de3b32393b961920c..4487d294804a48bfda7c6cf6c713f3223e0a529c
@@@ -18,10 -18,10 +18,10 @@@ package com.intellij.ui.content.impl
  
  import com.intellij.openapi.Disposable;
  import com.intellij.openapi.actionSystem.ActionGroup;
++import com.intellij.openapi.util.Computable;
  import com.intellij.openapi.util.Disposer;
  import com.intellij.openapi.util.IconLoader;
  import com.intellij.openapi.util.UserDataHolderBase;
--import com.intellij.openapi.util.Computable;
  import com.intellij.ui.LayeredIcon;
  import com.intellij.ui.content.AlertIcon;
  import com.intellij.ui.content.Content;
index e73a52eeda4ef5362dbbef013d7eb2eda1cd4d9a,eed15a7578dfb7e9ae3577e36d01b0def5763dda..1a84a64c55dbbbf739fa7faac384fd5747a082fc
@@@ -55,7 -55,7 +55,10 @@@ import com.intellij.openapi.project.ex.
  import com.intellij.openapi.projectRoots.Sdk;
  import com.intellij.openapi.roots.*;
  import com.intellij.openapi.startup.StartupManager;
--import com.intellij.openapi.util.*;
++import com.intellij.openapi.util.Computable;
++import com.intellij.openapi.util.Disposer;
++import com.intellij.openapi.util.EmptyRunnable;
++import com.intellij.openapi.util.ShutDownTracker;
  import com.intellij.openapi.util.io.FileUtil;
  import com.intellij.openapi.vfs.LocalFileSystem;
  import com.intellij.openapi.vfs.VfsUtil;
index 40e9298520e1cd99cd1f3bd92d363d9ff0418048,429a554833a53cdc19768459c56fda73214b6184..bfebabeacaa7f6d3f77ede1e3a2d599309fdedb6
@@@ -16,8 -16,9 +16,8 @@@
  package com.intellij.testFramework;
  
  import com.intellij.openapi.util.Condition;
+ import com.intellij.util.containers.ContainerUtil;
  
--import java.util.Arrays;
  import java.util.HashSet;
  import java.util.Set;
  
index 3f5c3a2112eb3203ef42f599ebd4c6d60f2b6eb7,3e520021ec932e4cbe79702014b76f3465c14091..915da014fdea175d79462ce5da59a4cd71c43852
@@@ -40,7 -40,7 +40,6 @@@ import org.jetbrains.annotations.NonNls
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
--import java.io.IOException;
  import java.util.Collection;
  import java.util.List;
  
index 3920bdf28cff2dee2910cf5b511a26193aedb8e6,04cfd85f5a11b7edbfcc3415242fe0f99d9bdd40..fedb73315ddbefda9f9893fa0d669a467976d7b1
@@@ -22,17 -22,18 +22,17 @@@ import com.intellij.openapi.extensions.
  import com.intellij.openapi.project.Project;
  import com.intellij.openapi.util.IconLoader;
  import com.intellij.usageView.UsageViewBundle;
--import com.intellij.usages.rules.ImportFilteringRule;
  import com.intellij.usages.UsageView;
++import com.intellij.usages.rules.ImportFilteringRule;
  import com.intellij.usages.rules.UsageFilteringRule;
  import com.intellij.usages.rules.UsageFilteringRuleProvider;
+ import com.intellij.util.containers.ContainerUtil;
  import org.jetbrains.annotations.NotNull;
  
  import javax.swing.*;
  import java.awt.event.InputEvent;
  import java.awt.event.KeyEvent;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  /**
index 237287c9bf1f76e6162b531cd4b9b6c28e4cf898,660e29a741cd9f5532609455a4234c7d7c24be04..69ab692e7607111806ca2228ec000795c8b73eb4
@@@ -33,7 -34,7 +34,10 @@@ import java.io.*
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  import java.nio.channels.FileChannel;
--import java.util.*;
++import java.util.ArrayList;
++import java.util.Collection;
++import java.util.LinkedList;
++import java.util.List;
  import java.util.regex.Pattern;
  
  @SuppressWarnings({"UtilityClassWithoutPrivateConstructor"})
index 120795956c94673a02600e4203338caf69b53b00,2f49e21998f3449ca2c372bf912c3885bfbac56c..ef6ca1b65de082bdcf62e325bdde0df2b4a22db6
@@@ -23,7 -24,7 +24,6 @@@ import java.lang.annotation.Annotation
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Type;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  class PropertyAccessor implements Accessor {
index 0fe20a815db228df0fc33af3124dbd65e3849f72,dfa08a67fe9f20334b7732da4c56947b05f37d73..6137ef7e83c4ab9d091e6a949ad0832a7374ec7f
  package com.intellij.util.xmlb;
  
  import com.intellij.openapi.util.JDOMUtil;
- import com.intellij.util.xmlb.annotations.Tag;
 +import com.intellij.util.ArrayUtil;
+ import com.intellij.util.containers.ContainerUtil;
+ import com.intellij.util.xmlb.annotations.Tag;
 -import com.intellij.util.ArrayUtil;
  import org.jdom.Element;
  import org.jdom.Text;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  class TagBinding implements Binding {
index c8ab525847fdc0308d75deb7035804a05974177b,6980065ba41d96369064129ade5386f67275e93b..3e07c3d179654cd0250a83ced5debd363d948401
@@@ -17,7 -17,7 +17,6 @@@ package com.intellij.openapi.vcs.change
  
  import com.intellij.openapi.diagnostic.Logger;
  import com.intellij.openapi.project.Project;
--import com.intellij.openapi.util.Pair;
  import com.intellij.openapi.vcs.*;
  import com.intellij.openapi.vfs.LocalFileSystem;
  import com.intellij.openapi.vfs.VirtualFile;
index 9d563b3d0370d596a1904a55cf74af26b0609cdd,2d552793b0c3f55f3523565835bf54256d01bd91..98464e2ebde0f9d34f5305a5d8e96fb03ccb6c34
@@@ -22,9 -22,10 +22,13 @@@ import com.intellij.openapi.components.
  import com.intellij.openapi.diagnostic.Logger;
  import com.intellij.openapi.options.StreamProvider;
  import com.intellij.openapi.util.io.FileUtil;
+ import com.intellij.util.containers.ContainerUtil;
  
  import java.io.*;
--import java.util.*;
++import java.util.ArrayList;
++import java.util.Collection;
++import java.util.LinkedHashSet;
++import java.util.List;
  
  public class CompoundShelfFileProcesor {
    private final String mySubdirName;
index a667f4d6f5d1d29ddcac50275a2e8f872f776dd6,97d2ae73e0f3b9b791a0c0ac376e0fd368d07af0..e2d2150127d90bdf1e8f80def4872163702d5ffd
@@@ -15,6 -15,6 +15,7 @@@
   */
  package com.siyeh.ig.portability;
  
++import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
  import com.intellij.psi.PsiElement;
  import com.intellij.psi.PsiLiteralExpression;
  import com.intellij.psi.PsiMethodCallExpression;
@@@ -25,12 -26,12 +27,10 @@@ import com.siyeh.ig.BaseInspectionVisit
  import com.siyeh.ig.portability.mediatype.*;
  import com.siyeh.ig.psiutils.MethodCallUtils;
  import com.siyeh.ig.psiutils.TypeUtils;
--import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel;
  import org.jetbrains.annotations.NonNls;
  import org.jetbrains.annotations.NotNull;
  
  import javax.swing.*;
--import java.util.Arrays;
  import java.util.HashSet;
  import java.util.Set;
  import java.util.TimeZone;
index 268eef5c4d7326b48812ad9eb475a33141226d5d,5841cd2ff2be0100df1702613f07034e61c22543..c4f4e1f02010783fd3d9de9e0002f979a1bd5a8d
@@@ -21,7 -22,7 +22,6 @@@ import com.siyeh.ig.BaseInspectionVisit
  import org.jetbrains.annotations.NonNls;
  import org.jetbrains.annotations.NotNull;
  
--import java.util.Arrays;
  import java.util.HashSet;
  import java.util.Set;
  
index 9dc46a9848321d4960b9de83d9c91283b19d22db,64c632e305a8c17c4c9283da341a5bed84a77025..29f58695bd834cd93525c3af188671b32e4e9deb
   */
  package com.siyeh.ig.visibility;
  
--import com.intellij.psi.*;
++import com.intellij.psi.PsiClass;
++import com.intellij.psi.PsiMethod;
++import com.intellij.psi.PsiModifier;
++import com.intellij.psi.PsiSubstitutor;
+ import com.intellij.psi.util.MethodSignature;
  import com.siyeh.InspectionGadgetsBundle;
  import com.siyeh.ig.BaseInspection;
  import com.siyeh.ig.BaseInspectionVisitor;
index 8625c51095169e34a7e028bd8062284239c5f9c7,0f6264e6ddf33776a0a5c09bbd21cd44e7580cd3..383c5a1311618646b83382bbd2fe932b14b81431
@@@ -27,7 -28,7 +28,6 @@@ import org.jetbrains.annotations.NonNls
  import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
--import java.util.Arrays;
  import java.util.HashSet;
  import java.util.Set;
  
index 7d246d1eea3e01596cfba796b4418bb071001fd5,5cbdb6d68d7e4cc428b5db75180ecf189e48dbec..e65500c2428c8c56db9d9659b8d1fe3f5e2681eb
@@@ -44,7 -44,7 +44,10 @@@ import com.intellij.util.containers.Con
  import com.intellij.util.ui.ColumnInfo;
  import com.intellij.util.ui.ListTableModel;
  import gnu.trove.THashMap;
--import org.intellij.plugins.intelliLang.inject.*;
++import org.intellij.plugins.intelliLang.inject.AbstractLanguageInjectionSupport;
++import org.intellij.plugins.intelliLang.inject.InjectedLanguage;
++import org.intellij.plugins.intelliLang.inject.InjectorUtils;
++import org.intellij.plugins.intelliLang.inject.LanguageInjectionSupport;
  import org.intellij.plugins.intelliLang.inject.config.BaseInjection;
  import org.intellij.plugins.intelliLang.inject.config.InjectionPlace;
  import org.jetbrains.annotations.Nls;
index 1f8154389f56d99d633f855172a20e1d17e81aa6,ddfebbc5a8e4847e3b681adcd67b29e3f70a2b8c..361a2cb70c242a1c5143ce02862778b77670427e
@@@ -28,7 -29,7 +29,6 @@@ import org.jetbrains.annotations.Nullab
  import javax.swing.*;
  import java.awt.*;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.Collections;
  import java.util.Comparator;
  
index 6fb097020e42a6be45f28a3ae04c6920e3ea3fc1,d842c7d03f31996b9b8496fe4e329ec9835282cd..2aca0f99ad7e22bf0a87725095d4cb92bb9e685d
@@@ -26,10 -26,10 +26,10 @@@ import com.intellij.openapi.project.Pro
  import com.intellij.openapi.ui.ComboBox;
  import com.intellij.ui.ColoredListCellRenderer;
  import com.intellij.ui.EditorTextField;
++import com.intellij.ui.ShiftTabAction;
  import com.intellij.ui.SimpleTextAttributes;
  import org.intellij.plugins.intelliLang.inject.InjectedLanguage;
  import org.intellij.plugins.intelliLang.inject.config.BaseInjection;
- import org.intellij.plugins.intelliLang.util.ShiftTabAction;
 -import com.intellij.ui.ShiftTabAction;
  import org.jetbrains.annotations.NotNull;
  
  import javax.swing.*;
index d7218366bb48d016f1a27abb7dec470db10a0fdf,0f180ca0943b26ea982304085abab531b3777cba..42db562728ff198d08c1efeccaf00920c2a5d5ba
@@@ -24,11 -24,11 +24,11 @@@ import com.intellij.openapi.ui.ComboBox
  import com.intellij.openapi.util.Computable;
  import com.intellij.openapi.util.Key;
  import com.intellij.ui.EditorTextField;
++import com.intellij.ui.LanguageTextField;
  import org.intellij.lang.regexp.RegExpLanguage;
  import org.intellij.plugins.intelliLang.inject.config.AbstractTagInjection;
  import org.intellij.plugins.intelliLang.inject.config.JspSupportProxy;
  import org.intellij.plugins.intelliLang.inject.config.XmlTagInjection;
- import org.intellij.plugins.intelliLang.util.LanguageTextField;
 -import com.intellij.ui.LanguageTextField;
  
  import javax.swing.*;
  import java.util.ArrayList;
index ffb890b805ea3a4d1c59931b05fba959cc2c6661,9568b0450748586e8bbcc933afc84ae8beb237d5..9e8e935c39e86e7570365930b1f2b4009e2e85f8
@@@ -18,9 -18,9 +18,9 @@@ package org.intellij.plugins.intelliLan
  import com.intellij.openapi.project.Project;
  import com.intellij.openapi.ui.ComboBox;
  import com.intellij.ui.EditorTextField;
++import com.intellij.ui.LanguageTextField;
  import org.intellij.lang.regexp.RegExpLanguage;
  import org.intellij.plugins.intelliLang.inject.config.XmlAttributeInjection;
- import org.intellij.plugins.intelliLang.util.LanguageTextField;
 -import com.intellij.ui.LanguageTextField;
  
  import javax.swing.*;
  
index 663d916ff00b85a61dd2c2589ecb730fd1fe10b0,2c92bb0428f8ed40bc7c7780666c04d36194b7e6..e41ca7ecb28cb375e7baa500af63eb4a65c17f08
@@@ -19,12 -19,12 +19,12 @@@ import com.intellij.codeInsight.Annotat
  import com.intellij.psi.*;
  import com.intellij.psi.util.PsiTreeUtil;
  import com.intellij.util.IncorrectOperationException;
++import com.siyeh.IntentionPowerPackBundle;
  import com.siyeh.ipp.base.MutablyNamedIntention;
  import com.siyeh.ipp.base.PsiElementPredicate;
--import com.siyeh.IntentionPowerPackBundle;
  import com.siyeh.ipp.psiutils.ImportUtils;
--import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.NonNls;
++import org.jetbrains.annotations.NotNull;
  
  public class ReplaceAssertEqualsWithAssertLiteralIntention
          extends MutablyNamedIntention {
index 56c7d5ba7e40ec6ca250ce6da3d973b611e506d8,cc537f54cb5c24be8d7cec23a905633e26010b64..84b2b034f9969b71617186a1f87e35be69dc9c20
@@@ -38,7 -39,7 +39,6 @@@ import org.jetbrains.annotations.NonNls
  
  import java.io.File;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  public class AntCommandLineBuilder {
index 13855996e54f1d2e13560f8c6001d5895dabcd4f,d77589d95ead934fac9d4f9abb2a7a57286ff7df..9fbdd9a22d6b0120ba65a0047f5311976f514417
@@@ -66,7 -67,7 +67,6 @@@ import java.awt.event.KeyEvent
  import java.awt.event.MouseAdapter;
  import java.awt.event.MouseEvent;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  public class AntExplorer extends SimpleToolWindowPanel implements DataProvider {
index 1d2001e994be8f8e590b2e31b0c855e9d80f910c,4cb95eb5f5c4cf7a337455453e35b461a4b1a877..9aa10089fdf5e3551071f15b71df3ae6dce9a6ea
@@@ -33,7 -33,7 +33,6 @@@ import org.jetbrains.annotations.NonNls
  import javax.swing.*;
  import java.io.File;
  import java.io.FileFilter;
--import java.util.Arrays;
  import java.util.List;
  
  public class AllJarsUnderDirEntry implements AntClasspathEntry {
index 4eb610c7a65fc7de7d12ea3d5ca805a024e47409,ebaa46678cc6b81c51a7c136c01e60de960a0f70..98337b250221bc032b604afd43f295a2f7b57929
@@@ -36,7 -37,7 +37,6 @@@ import org.jetbrains.annotations.NotNul
  import org.jetbrains.annotations.Nullable;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  public class AntTargetReference extends AntGenericReference {
index 616a9baa0102bb7d5cc070f8739ff4e26f5c48fb,396d4cfcd12ceadaa83c919880aa465b132a1011..2e628e75572966ef0192c19dd0a19c1194646eb8
@@@ -32,7 -33,7 +33,6 @@@ import com.intellij.util.containers.Con
  import javax.swing.*;
  import java.io.File;
  import java.util.ArrayList;
--import java.util.Arrays;
  
  /**
   * author: lesya
index b42895585415ebb6f27dffb8092a053b7df89641,3c3366b7c44543d3f52896eab805549afdc9697d..da681a82542a5794ac9242a26023cae88443b0b1
@@@ -27,7 -28,7 +28,6 @@@ import com.intellij.util.containers.Con
  
  import java.io.File;
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.Collection;
  
  /**
index c89d9792cd18873407e7fe9eaf79e2320fd7b85c,48ae8670159ae415c968ebfeb87d56e53017f5b1..934d20a0b7988895388c22b1559981f47c1e1388
@@@ -20,7 -21,7 +21,6 @@@ import com.intellij.util.containers.Con
  
  import java.util.ArrayList;
  import java.util.Collection;
--import java.util.Arrays;
  
  /**
   * author: lesya
index ecfa584604e5037da723161b111288f948efa28b,e2d7b7ae6b8b061f2a38317aaadd601f497fd7a4..79186c19197d17d5b7247e634ec7e8d380f29e16
@@@ -35,7 -36,7 +36,6 @@@ import org.jetbrains.idea.devkit.inspec
  import org.jetbrains.idea.devkit.util.PsiUtil;
  
  import java.util.ArrayList;
--import java.util.Arrays;
  import java.util.List;
  
  /**
index 9b81c080effb2cb6f0d468fbf45cb357821638ec,ac79c5a8ee3d4536f1b1e70c0b7a9e9087556e4c..b4644219d6e4c2d8e4feb8fd6852bd4df81c68b4
@@@ -16,7 -16,7 +16,9 @@@
  
  package org.jetbrains.idea.eclipse.config;
  
--import com.intellij.openapi.components.*;
++import com.intellij.openapi.components.PersistentStateComponent;
++import com.intellij.openapi.components.State;
++import com.intellij.openapi.components.Storage;
  import com.intellij.openapi.module.Module;
  import com.intellij.openapi.module.ModuleServiceManager;
  import com.intellij.openapi.roots.impl.storage.ClasspathStorage;
@@@ -23,10 -24,7 +26,10 @@@ import com.intellij.openapi.util.text.S
  import org.jdom.Element;
  import org.jetbrains.annotations.NonNls;
  
- import java.util.HashMap;
- import java.util.HashSet;
 -import java.util.*;
++import java.util.LinkedHashMap;
++import java.util.LinkedHashSet;
 +import java.util.Map;
 +import java.util.Set;
  
  @State(
    name = "EclipseModuleManager",
index cb3db4aecdd1fc78ba648275836cc93eac97bab9,a18977e3d81d1951fbec6e3524b825982ff5e0d2..d12255428cdc2c32f61c59664e2c1ddcb84bf3ef
@@@ -29,12 -30,12 +30,9 @@@ import com.intellij.openapi.roots.libra
  import com.intellij.openapi.vfs.JarFileSystem;
  import com.intellij.openapi.vfs.VirtualFileManager;
  
--import java.util.HashMap;
--import java.util.Map;
--
  public class EclipseLibrariesModificationsTest extends EclipseVarsTest {
  
-   private void doTest(String[] classRoots, String[] sourceRoots) throws Exception {
+   private void doTestCreate(String[] classRoots, String[] sourceRoots) throws Exception {
      final Project project = getProject();
      final String path = project.getBaseDir().getPath() + "/test";
      final Module module = EclipseClasspathTest.setUpModule(path, project);
index ebcca80f8c2254bbc79d66fc091556a40b6f4374,1df5ade11f74e8238e6d2d5b1235d79b7538d8de..4fdafdd79da3991432f0192afa3821c61d80d32f
@@@ -36,10 -35,10 +35,8 @@@ import git4idea.actions.GitShowAllSubmi
  import git4idea.i18n.GitBundle;
  import org.jetbrains.annotations.NotNull;
  
--import java.awt.*;
  import java.text.SimpleDateFormat;
  import java.util.*;
--import java.util.List;
  
  /**
   * Git file annotation implementation
index 21e7bee73090058399ca6166214830155b3f3cd1,fd91def3f6b52599e0155a7ae296213647213f56..fca030c625eca5b418831b857ed9dbfa680057bd
---