Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 2 Jul 2010 12:45:14 +0000 (16:45 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 2 Jul 2010 12:45:14 +0000 (16:45 +0400)
763 files changed:
.idea/misc.xml
.idea/uiDesigner.xml
RegExpSupport/src/META-INF/RegExpPlugin.xml
RegExpSupport/src/org/intellij/lang/regexp/RegExpColorsPage.java [new file with mode: 0644]
images/src/org/intellij/images/editor/impl/ImageEditorUI.java
images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java
java/compiler/impl/src/com/intellij/compiler/actions/GenerateAntBuildDialog.java
java/compiler/impl/src/com/intellij/compiler/ant/LibraryDefinitionsGeneratorFactory.java
java/compiler/impl/src/com/intellij/compiler/ant/ModuleChunkClasspath.java
java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/ModuleChunk.java
java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java
java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java
java/compiler/impl/src/com/intellij/compiler/options/ProcessedModulesTable.java
java/compiler/impl/src/com/intellij/openapi/projectRoots/impl/MockJdkWrapper.java
java/compiler/javac2/src/com/intellij/ant/Javac2.java
java/compiler/notNull/src/com/intellij/compiler/notNullVerification/NotNullVerifyingInstrumenter.java
java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
java/debugger/impl/src/com/intellij/debugger/settings/CompoundRendererConfigurable.java
java/debugger/impl/src/com/intellij/debugger/ui/ExportDialog.java
java/debugger/impl/src/com/intellij/debugger/ui/FramesPanel.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeBase.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/InspectPanel.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/ThreadsPanel.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/VariablesPanel.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/WatchPanel.java
java/debugger/impl/src/com/intellij/debugger/ui/tree/render/configurables/NamedChildrenConfigurable.form
java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.form
java/execution/openapi/src/com/intellij/execution/configurations/JavaParameters.java
java/idea-ui/src/com/intellij/facet/impl/autodetecting/facetsTree/DetectedFacetsDialog.form
java/idea-ui/src/com/intellij/facet/impl/ui/facetType/FacetAutodetectionConfigurable.form
java/idea-ui/src/com/intellij/facet/impl/ui/libraries/FacetLibrariesValidatorImpl.java
java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java
java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectNameWithTypeStep.form
java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/SidePanel.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/nodes/CompositePackagingElementNode.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/SourceItemNodeBase.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/DetectedSourceRootsDialog.java
java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form
java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form
java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertToBasicLatinAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java
java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java
java/java-impl/src/com/intellij/codeInspection/internal/InternalInspectionToolsProvider.java [new file with mode: 0644]
java/java-impl/src/com/intellij/codeInspection/internal/UndesirableClassUsageInspection.java [new file with mode: 0644]
java/java-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java
java/java-impl/src/com/intellij/codeInspection/reference/RefMethodImpl.java
java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java
java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java
java/java-impl/src/com/intellij/ide/util/PackageUtil.java
java/java-impl/src/com/intellij/ide/util/PsiClassListCellRenderer.java
java/java-impl/src/com/intellij/ide/util/TreeClassChooserDialog.java
java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java
java/java-impl/src/com/intellij/openapi/options/colors/pages/JavaColorSettingsPage.java
java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
java/java-impl/src/com/intellij/openapi/roots/impl/CompilerModuleExtensionImpl.java
java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java
java/java-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceListImpl.java
java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
java/java-impl/src/com/intellij/psi/impl/source/PsiImmediateClassType.java
java/java-impl/src/com/intellij/psi/impl/source/parsing/DeclarationParsing.java
java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FilePathReferenceProvider.java
java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java
java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/CallerChooser.java
java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java [deleted file]
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java
java/java-impl/src/com/intellij/refactoring/extractSuperclass/JavaExtractSuperBaseDialog.java [new file with mode: 0644]
java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java
java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java
java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java
java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.form
java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java
java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java
java/java-impl/src/com/intellij/refactoring/typeMigration/ui/FailedConversionsDialog.java
java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
java/java-impl/src/com/intellij/slicer/SlicePanel.java
java/java-impl/src/com/intellij/testIntegration/TestIntegrationUtils.java
java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java
java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java
java/java-impl/src/com/intellij/util/JarClasspathHelper.java
java/java-tests/testData/codeInsight/convertToBasicLatin/DocComment_after.java
java/java-tests/testData/codeInsight/convertToBasicLatin/PlainComment_after.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromParameter/afterBoundListTypeParameter.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromParameter/afterListClassTypeParameter.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromParameter/afterListTypeParameter.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromParameter/beforeBoundListTypeParameter.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromParameter/beforeListClassTypeParameter.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromParameter/beforeListTypeParameter.java [new file with mode: 0644]
java/java-tests/testData/inspection/deadCode/enumInstantiation/ext_src/Test1.java
java/java-tests/testData/refactoring/introduceParameter/beforeIncompleteVararg.java [new file with mode: 0644]
java/java-tests/testData/refactoring/makeMethodStatic/afterPreserveTypeParams.java [new file with mode: 0644]
java/java-tests/testData/refactoring/makeMethodStatic/beforePreserveTypeParams.java [new file with mode: 0644]
java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/after/ComponentCaller.java
java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/before/ComponentCaller.java
java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java
java/java-tests/testSrc/com/intellij/codeInsight/completion/CompletionSortingTestCase.java
java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavySmartTypeCompletion15Test.java
java/java-tests/testSrc/com/intellij/codeInsight/completion/SecondSmartTypeCompletionTest.java
java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/AdvHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/JavadocHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingPerformanceTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/SuppressWarningsTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateFieldFromParameterTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFix15TestCase.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodReturnTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceAddAllArrayToCollectionsFixTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithArrayFixTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithIfFixTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableTypeFromCallTest.java
java/java-tests/testSrc/com/intellij/codeInsight/intention/ConvertToBasicLatinTest.java
java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceBackwardTest.java
java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceForwardTest.java
java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java
java/java-tests/testSrc/com/intellij/codeInspection/UnusedDeclarationTest.java
java/java-tests/testSrc/com/intellij/dependencies/CyclicDependenciesTest.java
java/java-tests/testSrc/com/intellij/dependencies/UsagesInAnalyzingDependenciesTest.java
java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java
java/java-tests/testSrc/com/intellij/projectView/JavaTreeStructureTest.java
java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java
java/java-tests/testSrc/com/intellij/projectView/ProjectViewSwitchingTest.java
java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java
java/java-tests/testSrc/com/intellij/psi/ArrayIndexOutOfBoundsTest.java
java/java-tests/testSrc/com/intellij/psi/ClsBuilderTest.java
java/java-tests/testSrc/com/intellij/psi/ModifyAnnotationsTest.java
java/java-tests/testSrc/com/intellij/refactoring/AnonymousToInnerTest.java
java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTargetTest.java
java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethod15Test.java
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java
java/java-tests/testSrc/com/intellij/refactoring/FindMethodDuplicatesBaseTest.java
java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java
java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java
java/java-tests/testSrc/com/intellij/refactoring/IntroduceConstantTest.java
java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java
java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java
java/java-tests/testSrc/com/intellij/refactoring/MakeMethodStaticTest.java
java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java
java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java
java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java
java/java-tests/testSrc/com/intellij/refactoring/PushDownMultifileTest.java
java/java-tests/testSrc/com/intellij/refactoring/RenameClassTest.java
java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java
java/java-tests/testSrc/com/intellij/refactoring/SuggestedParamTypesTest.java
java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java
java/java-tests/testSrc/com/intellij/refactoring/TypeCookTest.java
java/java-tests/testSrc/com/intellij/refactoring/WrapReturnValueTest.java
java/java-tests/testSrc/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureTest.java
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineConstantFieldTest.java
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineParameterTest.java
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassTest.java
java/java-tests/testSrc/com/intellij/roots/DependencyScopeTest.java
java/java-tests/testSrc/com/intellij/roots/InheritedJdkTest.java
java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java
java/java-tests/testSrc/com/intellij/roots/OrderEntriesTest.java
java/java-tests/testSrc/com/intellij/roots/OrderEnumeratorTest.java
java/java-tests/testSrc/com/intellij/roots/ProjectRootsTraversingTest.java
java/java-tests/testSrc/com/intellij/roots/RootsChangedTest.java
java/jsp-spi/src/com/intellij/psi/jsp/JspSpiUtil.java
java/mockJDK-1.4/jre/lib/rt.jar [new file with mode: 0644]
java/mockJDK-1.4/src.zip [new file with mode: 0644]
java/mockJDK-1.7/jre/lib/rt.jar
java/mockJDK-1.7/lib/jsp-api.jar [deleted file]
java/mockJDK-1.7/lib/servlet-api.jar [deleted file]
java/mockJDK/jre/lib/annotations.jar [deleted file]
java/mockJDK/jre/lib/rt.jar [deleted file]
java/mockJDK/src.zip [deleted file]
java/openapi/src/com/intellij/openapi/roots/AnnotationOrderRootType.java
java/openapi/src/com/intellij/psi/PsiExpression.java
java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java
java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java
java/testFramework/src/com/intellij/testFramework/LightIdeaTestCase.java
java/testFramework/src/com/intellij/testFramework/PsiTestCase.java
java/testFramework/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java
java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java
java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaModuleFixtureBuilderImpl.java
lib/asm-commons.jar
lib/asm.jar
lib/src/asm-src.zip
platform/lang-api/src/com/intellij/codeInsight/intention/PsiElementBaseIntentionAction.java
platform/lang-api/src/com/intellij/execution/runners/ExecutionUtil.java
platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java
platform/lang-api/src/com/intellij/openapi/roots/CompilerModuleExtension.java
platform/lang-api/src/com/intellij/openapi/roots/ModuleRootManager.java
platform/lang-api/src/com/intellij/openapi/roots/ModuleRootModel.java
platform/lang-api/src/com/intellij/openapi/roots/OrderEnumerationHandler.java
platform/lang-api/src/com/intellij/openapi/roots/OrderEnumerator.java
platform/lang-api/src/com/intellij/openapi/roots/OrderRootType.java
platform/lang-api/src/com/intellij/openapi/roots/OrderRootsEnumerator.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/openapi/roots/ProjectRootManager.java
platform/lang-api/src/com/intellij/openapi/roots/RecursiveRootPolicy.java
platform/lang-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java
platform/lang-api/src/com/intellij/patterns/compiler/PatternCompilerFactory.java
platform/lang-api/src/com/intellij/psi/search/DelegatingGlobalSearchScope.java
platform/lang-api/src/com/intellij/psi/search/GlobalSearchScope.java
platform/lang-api/src/com/intellij/util/PathsList.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java
platform/lang-impl/src/com/intellij/application/options/colors/OptionsPanelImpl.java
platform/lang-impl/src/com/intellij/codeInsight/completion/impl/CompletionServiceImpl.java
platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java
platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java
platform/lang-impl/src/com/intellij/codeInsight/generation/SelfManagingCommenter.java
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.form
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsTree.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/DefaultLookupItemRenderer.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoImplementationHandler.java
platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java
platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java
platform/lang-impl/src/com/intellij/codeInspection/reference/RefElementImpl.java
platform/lang-impl/src/com/intellij/codeInspection/ui/Browser.java
platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java
platform/lang-impl/src/com/intellij/execution/impl/BaseExecuteBeforeRunDialog.java
platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditor.form
platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form
platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
platform/lang-impl/src/com/intellij/find/impl/RegExHelpPopup.java
platform/lang-impl/src/com/intellij/formatting/BlockDebugUtil.java
platform/lang-impl/src/com/intellij/ide/commander/CommanderPanel.java
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateConfigurable.java
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/FileTemplateManagerImpl.java
platform/lang-impl/src/com/intellij/ide/fileTemplates/ui/CreateFromTemplatePanel.java
platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
platform/lang-impl/src/com/intellij/ide/macro/MacrosDialog.java
platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarRootPaneExtension.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPSIPane.java
platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewComponent.java
platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java
platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java
platform/lang-impl/src/com/intellij/ide/util/TreeFileChooserDialog.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
platform/lang-impl/src/com/intellij/injected/editor/EditorWindow.java
platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java
platform/lang-impl/src/com/intellij/lang/LanguagePerFileMappings.java
platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffOptionsPanel.form
platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/PatternsPanel.form
platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/RecognizedFileTypes.form
platform/lang-impl/src/com/intellij/openapi/module/impl/RemoveInvalidElementsDialog.form
platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java
platform/lang-impl/src/com/intellij/openapi/module/impl/scopes/ModuleRuntimeClasspathScope.java
platform/lang-impl/src/com/intellij/openapi/options/colors/pages/CustomColorsPage.java
platform/lang-impl/src/com/intellij/openapi/projectRoots/ex/ProjectRootContainer.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/projectRoots/impl/ProjectRootContainerImpl.java
platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/ProjectRootUtil.java
platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SimpleProjectRoot.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleOrderEntryImpl.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleOrderEnumerator.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleRootManagerImpl.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEntryUtil.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEnumeratorBase.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderRootsCache.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderRootsEnumeratorImpl.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectOrderEnumerator.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java
platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java
platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.form
platform/lang-impl/src/com/intellij/patterns/compiler/PatternClassBean.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/patterns/compiler/PatternCompilerFactoryImpl.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
platform/lang-impl/src/com/intellij/psi/PsiReferenceProviderBean.java
platform/lang-impl/src/com/intellij/psi/impl/PsiManagerImpl.java
platform/lang-impl/src/com/intellij/psi/impl/source/resolve/ResolveCache.java
platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/ReferenceProvidersRegistry.java
platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java
platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstactExtractMethodDialog.form
platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstractParameterTablePanel.java
platform/lang-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesUtil.java
platform/lang-impl/src/com/intellij/refactoring/rename/AutomaticRenamingDialog.form
platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java
platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java
platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java
platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java
platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java
platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java
platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java
platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
platform/lang-impl/src/com/intellij/util/ui/classpath/SimpleClasspathPanel.java
platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.form
platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RevisionsList.java
platform/platform-api/platform-api.iml
platform/platform-api/src/com/intellij/execution/util/ExecutionErrorDialog.java
platform/platform-api/src/com/intellij/ide/BrowserUtil.java
platform/platform-api/src/com/intellij/openapi/actionSystem/AnAction.java
platform/platform-api/src/com/intellij/openapi/actionSystem/CommonShortcuts.java
platform/platform-api/src/com/intellij/openapi/actionSystem/CustomShortcutSet.java
platform/platform-api/src/com/intellij/openapi/actionSystem/Shortcut.java
platform/platform-api/src/com/intellij/openapi/editor/EditorModificationUtil.java
platform/platform-api/src/com/intellij/openapi/editor/LogicalPosition.java
platform/platform-api/src/com/intellij/openapi/editor/SoftWrapModel.java
platform/platform-api/src/com/intellij/openapi/editor/actions/ContentChooser.java
platform/platform-api/src/com/intellij/openapi/options/StreamProvider.java
platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
platform/platform-api/src/com/intellij/openapi/ui/StripeTable.java
platform/platform-api/src/com/intellij/openapi/ui/ThreeComponentsSplitter.java
platform/platform-api/src/com/intellij/openapi/ui/popup/PopupChooserBuilder.java
platform/platform-api/src/com/intellij/ui/AbstractFieldPanel.java
platform/platform-api/src/com/intellij/ui/ExpandableItemsHandlerFactory.java
platform/platform-api/src/com/intellij/ui/JScrollPane2.java [deleted file]
platform/platform-api/src/com/intellij/ui/OptionalChooserComponent.form
platform/platform-api/src/com/intellij/ui/PathsChooserComponent.form
platform/platform-api/src/com/intellij/ui/ScrollPaneFactory.java
platform/platform-api/src/com/intellij/ui/SizedIcon.java [moved from platform/platform-api/src/com/intellij/ui/TruncatingIcon.java with 56% similarity]
platform/platform-api/src/com/intellij/ui/components/JBScrollBar.java [new file with mode: 0644]
platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java [new file with mode: 0644]
platform/platform-api/src/com/intellij/ui/speedSearch/ListWithFilter.java
platform/platform-api/src/com/intellij/ui/switcher/ApplySwitchAction.java
platform/platform-api/src/com/intellij/ui/switcher/SwitchManager.java
platform/platform-api/src/com/intellij/ui/switcher/SwitchingSession.java
platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsTest.java
platform/platform-api/src/com/intellij/ui/tabs/impl/TabsBorder.java
platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/SingleRowLayout.java
platform/platform-api/src/com/intellij/ui/tabs/impl/table/TableLayout.java
platform/platform-api/src/com/intellij/ui/treeStructure/SimpleMutableNode.java
platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeStructure.java
platform/platform-api/src/com/intellij/util/net/AuthenticationPanel.java
platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java
platform/platform-api/testSrc/com/intellij/openapi/editor/TextChangeTest.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/application/options/SelectFontDialog.java
platform/platform-impl/src/com/intellij/application/options/ShareSchemePanel.form
platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.form
platform/platform-impl/src/com/intellij/diagnostic/EAPSendErrorForm.form
platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java
platform/platform-impl/src/com/intellij/featureStatistics/ui/AdaptiveTipDialog.java
platform/platform-impl/src/com/intellij/featureStatistics/ui/ProgressTipPanel.form
platform/platform-impl/src/com/intellij/ide/actionMacro/EditMacrosConfiguration.form
platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsButActiveAction.java
platform/platform-impl/src/com/intellij/ide/actions/OpenProjectFileChooserDescriptor.java
platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form
platform/platform-impl/src/com/intellij/ide/startupWizard/SelectPluginsStep.form
platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.form
platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java
platform/platform-impl/src/com/intellij/ide/util/TipPanel.java
platform/platform-impl/src/com/intellij/internal/encodings/ClasspathList.form
platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsListPanel.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionMenuItem.java
platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
platform/platform-impl/src/com/intellij/openapi/command/impl/CannotUndoReportDialog.form
platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java
platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorEx.java
platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/LeftHandScrollbarLayout.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/SoftWrapsStorage.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/openapi/editor/textarea/TextComponentSoftWrapModel.java
platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileChooserDialogImpl.java
platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeChooserPanel.form
platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.form
platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerFactoryImpl.java
platform/platform-impl/src/com/intellij/openapi/options/ex/ControlPanelSettingsEditor.java
platform/platform-impl/src/com/intellij/openapi/options/ex/ExplorerSettingsEditor.java
platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditorContext.java
platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java
platform/platform-impl/src/com/intellij/openapi/project/impl/DefineMacrosDialog.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NoUpdatesPanel.form
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form
platform/platform-impl/src/com/intellij/openapi/vcs/readOnlyHandler/ReadOnlyStatusDialog.form
platform/platform-impl/src/com/intellij/openapi/vfs/encoding/ChooseEncodingDialog.form
platform/platform-impl/src/com/intellij/openapi/vfs/ex/temp/TempFileSystem.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeGlassPaneImpl.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/TitlePanel.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ProcessPopup.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeScreen.java
platform/platform-impl/src/com/intellij/patterns/compiler/PatternCompilerImpl.java
platform/platform-impl/src/com/intellij/platform/FilesystemToolwindow.java
platform/platform-impl/src/com/intellij/ui/ListExpandableItemsHandler.java
platform/platform-impl/src/com/intellij/ui/ListToolTipHandler.java [moved from xml/dom-impl/src/com/intellij/util/dom/generator/DGNamespace.java with 68% similarity]
platform/platform-impl/src/com/intellij/ui/MultilineTreeCellRenderer.java
platform/platform-impl/src/com/intellij/ui/TableExpandableItemsHandler.java
platform/platform-impl/src/com/intellij/ui/TableToolTipHandler.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/ui/TreeExpandableItemsHandler.java
platform/platform-impl/src/com/intellij/ui/TreeToolTipHandler.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/ui/TreeUIHelperImpl.java
platform/platform-impl/src/com/intellij/ui/plaf/beg/BegBorders.java
platform/platform-impl/src/com/intellij/ui/popup/WizardPopup.java
platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.form
platform/platform-impl/testSrc/com/intellij/ide/util/treeView/FilteringTreeBuilderTest.java
platform/platform-impl/testSrc/com/intellij/openapi/editor/impl/SoftWrapModelImplTest.java [new file with mode: 0644]
platform/platform-resources-en/src/messages/RefactoringBundle.properties
platform/platform-resources-en/src/misc/registry.properties
platform/platform-resources/src/META-INF/LangExtensionPoints.xml
platform/platform-resources/src/META-INF/XmlPlugin.xml
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.form
platform/testFramework/src/com/intellij/mock/MockFoldRegion.java [new file with mode: 0644]
platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.java
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/LightTempDirTestFixtureImpl.java
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/ModuleFixtureBuilderImpl.java
platform/util/src/com/intellij/openapi/util/text/StringUtil.java
platform/util/src/com/intellij/util/containers/CoModifiableList.java [deleted file]
platform/util/src/com/intellij/util/io/fs/IoFile.java
platform/util/src/com/intellij/util/text/VersionComparatorUtil.java
platform/util/src/com/intellij/util/ui/UIUtil.java
platform/util/testSrc/com/intellij/util/containers/CoModifiableListTest.java [deleted file]
platform/util/testSrc/com/intellij/util/containers/ContainerUtilTest.java
platform/util/testSrc/com/intellij/util/containers/WeakListTest.java
platform/util/testSrc/com/intellij/util/containers/WeakReferenceArrayTest.java
platform/util/testSrc/com/intellij/util/containers/WeaksTestCase.java
platform/vcs-api/src/com/intellij/openapi/vcs/ui/CommitMessage.java
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/CompareWithSelectedRevisionAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UnversionedViewDialog.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangeListDetailsAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/StructureFilteringStrategy.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.form
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictDialog.form
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChangesViewManager.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangeListViewerDialog.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/EditChangelistPanel.form
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsPanel.form
platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.form
platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsConfigurationsDialog.form
platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.form
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspection.form
plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionCaught.form
plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionDeclared.form
plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionThrown.form
plugins/InspectionGadgets/src/com/siyeh/ig/j2me/SimplifiableIfStatementInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.Form.form
plugins/InspectionGadgets/src/com/siyeh/ig/naming/BooleanMethodNameMustStartWithQuestionInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/naming/ConventionInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonBooleanMethodNameMayNotStartWithQuestionInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/naming/QuestionableName.form
plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/WeakestTypeFinder.java
plugins/InspectionGadgets/src/com/siyeh/ig/resources/IOResourceInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/serialization/Serializable.form
plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplayImpl.form
plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplayImpl.java
plugins/InspectionGadgets/src/com/siyeh/ig/threading/AccessToNonThreadSafeStaticFieldFromInstanceForm.form
plugins/InspectionGadgets/test/com/siyeh/igtest/encapsulation/ReturnOfCollectionFieldInspection.java
plugins/InspectionGadgets/test/com/siyeh/igtest/j2me/simplifiable_if_statement/SimplifiableIfStatement.java [moved from plugins/InspectionGadgets/test/com/siyeh/igtest/verbose/SimplifiableIfStatementInspection.java with 83% similarity]
plugins/InspectionGadgets/test/com/siyeh/igtest/j2me/simplifiable_if_statement/expected.xml [new file with mode: 0644]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/j2me/SimplifiableIfStatementInspectionTest.java [new file with mode: 0644]
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.form
plugins/IntelliLang/xml-support/resources/xmlInjections.xml
plugins/IntentionPowerPak/src/com/siyeh/ipp/psiutils/VariableAccessUtils.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanIntention.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/trivialif/ExpandBooleanPredicate.java
plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java
plugins/ant/src/com/intellij/lang/ant/config/explorer/SaveMetaTargetDialog.java
plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AnActionListEditor.form
plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntClasspathEditorPanel.form
plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/FiltersTab.form
plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/PropertiesTab.form
plugins/ant/src/com/intellij/lang/ant/doc/AntDomDocumentationProvider.java [new file with mode: 0644]
plugins/ant/src/com/intellij/lang/ant/dom/AntDomDirSet.java
plugins/ant/src/com/intellij/lang/ant/dom/AntDomElement.java
plugins/ant/src/com/intellij/lang/ant/dom/AntDomExtender.java
plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileList.java
plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileSet.java
plugins/ant/src/com/intellij/lang/ant/dom/AntDomFilesProviderImpl.java
plugins/ant/src/com/intellij/lang/ant/dom/AntDomPath.java
plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java
plugins/ant/src/com/intellij/lang/ant/dom/AntDomTarget.java
plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightEditorForm.form
plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java
plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.form
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsTree.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportSettingsStep.form
plugins/cvs/javacvs-src/org/netbeans/lib/cvsclient/command/FileSystemScanner.java
plugins/cvs/smartcvs-src/org/netbeans/lib/cvsclient/admin/AdminReader.java
plugins/devkit/resources/inspectionDescriptions/InspectionDescriptionNotFoundInspection.html [moved from plugins/devkit/resources/inspectionDescriptions/DescriptionNotFoundInspection.html with 94% similarity]
plugins/devkit/resources/inspectionDescriptions/IntentionDescriptionNotFoundInspection.html [new file with mode: 0644]
plugins/devkit/src/DevKitInspectionToolProvider.java
plugins/devkit/src/actions/NewActionForm.form
plugins/devkit/src/build/PluginBuildUtil.java
plugins/devkit/src/inspections/InspectionDescriptionNotFoundInspection.java [moved from plugins/devkit/src/inspections/DescriptionNotFoundInspection.java with 97% similarity]
plugins/devkit/src/inspections/IntentionDescriptionNotFoundInspection.java [new file with mode: 0644]
plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java
plugins/devkit/src/util/ChooseModulesDialog.java
plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java
plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EPathUtil.java
plugins/eclipse/testData/modification/replacedWithVariablesNoSrcExistOnDisc/expected/.classpath [new file with mode: 0644]
plugins/eclipse/testData/modification/replacedWithVariablesNoSrcExistOnDisc/srcvariableidea/dontdeletedir.txt [new file with mode: 0644]
plugins/eclipse/testData/modification/replacedWithVariablesNoSrcExistOnDisc/test/.classpath [new file with mode: 0644]
plugins/eclipse/testData/modification/replacedWithVariablesNoSrcExistOnDisc/test/.project [new file with mode: 0644]
plugins/eclipse/testData/modification/replacedWithVariablesNoSrcExistOnDisc/variableidea/test.jar [new file with mode: 0644]
plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseLibrariesModificationsTest.java
plugins/git4idea/src/git4idea/GitContentRevision.java
plugins/git4idea/src/git4idea/GitFileRevision.java
plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.form
plugins/git4idea/src/git4idea/commands/GitBinaryHandler.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/commands/GitFileUtils.java
plugins/git4idea/src/git4idea/commands/GitHandler.java
plugins/git4idea/src/git4idea/commands/GitLineHandler.java
plugins/git4idea/src/git4idea/commands/GitSimpleHandler.java
plugins/git4idea/src/git4idea/commands/GitTextHandler.java [new file with mode: 0644]
plugins/git4idea/src/git4idea/history/browser/GitLogTree.java
plugins/git4idea/src/git4idea/history/browser/GitLogTreeFileSelector.java
plugins/git4idea/src/git4idea/rebase/GitRebaseEditor.form
plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.form
plugins/git4idea/src/git4idea/ui/GitConvertFilesDialog.form
plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.form
plugins/git4idea/src/git4idea/ui/GitRefspecPanel.form
plugins/git4idea/src/git4idea/ui/GitTagDialog.form
plugins/git4idea/src/git4idea/ui/GitUnstashDialog.form
plugins/git4idea/src/git4idea/update/GitBaseRebaseProcess.java
plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.form
plugins/git4idea/src/git4idea/vfs/GitFixRootsDialog.form
plugins/groovy/groovypp/src/org/jetbrains/plugins/groovy/gpp/GppTypeConverter.java
plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java
plugins/groovy/src/META-INF/plugin.xml
plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/PatternEditorContextMembersProvider.java
plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java
plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovycOSProcessHandler.java
plugins/groovy/src/org/jetbrains/plugins/groovy/config/ui/ManagedLibrariesEditor.form
plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyClassDescriptor.java
plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslFileIndex.java
plugins/groovy/src/org/jetbrains/plugins/groovy/gant/AntTasksProvider.java
plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantRunner.java
plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleLibraryManager.java
plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/GradleScriptType.java
plugins/groovy/src/org/jetbrains/plugins/groovy/gradle/ui/GradleSetupPanel.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/parameterInfo/GroovyParameterInfoHandler.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GdkMembersContributor.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrLiteralClassType.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyFileImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrCatchClauseImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrForStatementImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/blocks/GrBlockImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/blocks/GrClosableBlockImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrMethodCallExpressionImpl.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/impl/synthetic/GroovyScriptClass.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/toplevel/imports/GrImportStatementImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureDialog.form
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/TableWithButtons.form
plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java
plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunner.java
plugins/groovy/src/org/jetbrains/plugins/groovy/util/LibrariesUtil.java
plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.java
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java
plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/RemoveUnnecessaryBracesInGStringTest.java [moved from plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/RemoveUnnecasseryBracesInGStringTest.java with 95% similarity]
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GppFunctionalTest.groovy
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.java
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.java
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveClassTest.java
plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/move/GroovyMoveScriptTest.java
plugins/groovy/testdata/groovy/controlFlow/try1.test
plugins/groovy/testdata/groovy/controlFlow/try5.test
plugins/groovy/testdata/groovy/controlFlow/try6.test
plugins/groovy/testdata/groovy/controlFlow/while1.test
plugins/groovy/testdata/groovy/controlFlow/while2.test
plugins/groovy/testdata/groovy/controlFlow/whileNonConstant.test
plugins/groovy/testdata/groovy/oldCompletion/keyword/imp4.test
plugins/groovy/testdata/groovy/oldCompletion/keyword/var3.test
plugins/groovy/testdata/highlighting/TupleTypeAssignments.groovy [new file with mode: 0644]
plugins/groovy/testdata/highlighting/UnusedImports.groovy [new file with mode: 0644]
plugins/groovy/testdata/highlighting/UnusedImportsForImportsOnDemand.groovy [new file with mode: 0644]
plugins/groovy/testdata/highlighting/missingReturn/EndlessLoop2.groovy [new file with mode: 0644]
plugins/groovy/testdata/resolve/class/twoStaticImports/Test.groovy [new file with mode: 0644]
plugins/groovy/testdata/resolve/class/twoStaticImports/a/b/C.groovy [new file with mode: 0644]
plugins/groovy/testdata/resolve/class/twoStaticImports/x/y/Z.groovy [new file with mode: 0644]
plugins/hg4idea/resources/org/zmlx/hg4idea/HgVcsMessages.properties
plugins/hg4idea/src/META-INF/plugin.xml
plugins/hg4idea/src/org/zmlx/hg4idea/HgExecutableValidator.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgIdeConfigurable.java [deleted file]
plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectConfigurable.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectSettings.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgUtil.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCloneCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandAuthenticator.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgIdentifyCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgConfigurationIdePanel.form [deleted file]
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgConfigurationIdePanel.java [deleted file]
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgConfigurationProjectPanel.form
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgConfigurationProjectPanel.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.form
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgGlobalStatusDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgPushDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgRunConflictResolverDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgSetExecutableDialog.form
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgSwitchDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgTagDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUsernamePasswordDialog.form [deleted file]
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUsernamePasswordDialog.java
plugins/java-i18n/src/com/intellij/spellchecker/DocCommentTokenizer.java
plugins/java-i18n/src/com/intellij/spellchecker/JavaSpellcheckingStrategy.java
plugins/java-i18n/src/com/intellij/spellchecker/PsiTypeTokenizer.java
plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
plugins/maven/facade-impl/src/org/jetbrains/idea/maven/facade/embedder/MavenModelConverter.java
plugins/maven/facade-impl/test/org/jetbrains/idea/maven/embedder/MavenFacadeEmbedderTest.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenOrderEnumeratorHandler.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndicesConfigurable.form
plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorPanel.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/SelectFromMavenProjectsDialog.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.form
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/OpenOrCreateSettingsXmlAction.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/ChooserDialog.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.form
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenPerformanceTest.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesManagerTest.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigatorTest.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectReaderTest.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeIgnoresTest.java
plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleEditor.java
plugins/properties/src/com/intellij/psi/impl/search/PropertyReferenceViaLastWordSearcher.java
plugins/spellchecker/src/com/intellij/spellchecker/jetbrains.dic
plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/Token.java
plugins/spellchecker/testData/inspection/java/GenericTest.java [new file with mode: 0644]
plugins/spellchecker/testData/inspection/java/GenericTestt.java [new file with mode: 0644]
plugins/spellchecker/testSrc/com/intellij/spellchecker/inspection/JavaSpellcheckingTest.java [new file with mode: 0644]
plugins/svn4idea/src/org/jetbrains/idea/svn/config/ConfigureProxiesOptionsPanel.form
plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/BranchConfigurationDialog.form
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.form
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/LockDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SelectFilesDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ServerSSLDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SetPropertyDialog.form
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnMapDialog.form
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/CheckoutOptionsDialog.form
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/CopyOptionsDialog.form
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/DeleteOptionsDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/ImportOptionsDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browser/MkdirOptionsDialog.form
plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegratedSelectedOptionsDialog.form
plugins/svn4idea/src/org/jetbrains/idea/svn/update/MultipleRootsEditor.form
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form
plugins/ui-designer/src/com/intellij/uiDesigner/LoaderFactory.java
plugins/ui-designer/src/com/intellij/uiDesigner/clientProperties/ConfigureClientPropertiesDialog.form
plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspector.java
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ColorEditor.java
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/FontEditorDialog.form
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/ListEditorDialog.form
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditorDialog.form
plugins/ui-designer/src/com/intellij/uiDesigner/radComponents/RadScrollPane.java
plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotForm.form
plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.form
plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java
plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.form
plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToNewBeanStep.java
plugins/ui-designer/testData/ChainedConstructorTest.java
plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormEnumUsageTest.java
plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormPropertyUsageTest.java
plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java
plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/EditAssociations.form
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltNamespaceContext.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltImplicitUsagesProvider.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/refactoring/introduceParameter/IntroduceParameterProcessor.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltCommandLineState.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/util/ParamMatcher.java
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/HistoryElement.java
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/FindByXPathAction.java
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/SearchScope.java
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/support/jaxen/PsiDocumentNavigator.java
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/support/jaxen/extensions/XPathFunctionProviderImpl.java
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/EditContextDialog.java
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/InputExpressionDialog.java
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/util/HighlighterUtil.java
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/util/NamespaceCollector.java
resources-en/src/inspectionDescriptions/UndesirableClassUsage.html [new file with mode: 0644]
resources/src/META-INF/IdeaPlugin.xml
resources/src/idea/Palette2.xml
xml/dom-impl/src/META-INF/DomPlugin.xml
xml/dom-impl/src/com/intellij/util/dom/generator/DTDModelLoader.java
xml/dom-impl/src/com/intellij/util/dom/generator/DomGenDialog.java
xml/dom-impl/src/com/intellij/util/dom/generator/DomGenPanel.form
xml/dom-impl/src/com/intellij/util/dom/generator/DomGenPanel.java
xml/dom-impl/src/com/intellij/util/dom/generator/Emitter.java
xml/dom-impl/src/com/intellij/util/dom/generator/FieldDesc.java
xml/dom-impl/src/com/intellij/util/dom/generator/FileManager.java
xml/dom-impl/src/com/intellij/util/dom/generator/JetBrainsEmitter.java
xml/dom-impl/src/com/intellij/util/dom/generator/Main.java
xml/dom-impl/src/com/intellij/util/dom/generator/MergingFileManager.java
xml/dom-impl/src/com/intellij/util/dom/generator/ModelDesc.java
xml/dom-impl/src/com/intellij/util/dom/generator/ModelGen.java
xml/dom-impl/src/com/intellij/util/dom/generator/ModelLoader.java
xml/dom-impl/src/com/intellij/util/dom/generator/NamespaceDesc.java
xml/dom-impl/src/com/intellij/util/dom/generator/TypeDesc.java
xml/dom-impl/src/com/intellij/util/dom/generator/Util.java
xml/dom-impl/src/com/intellij/util/dom/generator/XSDModelLoader.java
xml/dom-impl/src/com/intellij/util/xml/impl/AbstractDomChildDescriptionImpl.java
xml/dom-impl/src/com/intellij/util/xml/impl/CustomDomChildrenDescriptionImpl.java
xml/dom-impl/src/com/intellij/util/xml/impl/DomChildDescriptionImpl.java
xml/dom-impl/src/com/intellij/util/xml/impl/DynamicGenericInfo.java
xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionImpl.java
xml/dom-impl/src/com/intellij/util/xml/reflect/DomExtensionsRegistrarImpl.java
xml/dom-impl/src/com/intellij/xml/impl/dom/AbstractDomChildrenDescriptor.java [new file with mode: 0644]
xml/dom-impl/src/com/intellij/xml/impl/dom/DomElementXmlDescriptor.java
xml/dom-openapi/src/com/intellij/util/xml/reflect/AbstractDomChildrenDescription.java
xml/dom-openapi/src/com/intellij/util/xml/reflect/CustomDomChildrenDescription.java
xml/dom-openapi/src/com/intellij/util/xml/reflect/DomExtensionsRegistrar.java
xml/impl/src/com/intellij/application/options/TagListDialog.java
xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java
xml/impl/src/com/intellij/psi/formatter/xml/AbstractSyntheticBlock.java
xml/impl/src/com/intellij/psi/impl/source/xml/SchemaPrefix.java
xml/impl/src/com/intellij/psi/impl/source/xml/SchemaPrefixReference.java
xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagValueImpl.java
xml/impl/src/com/intellij/xml/actions/xmlbeans/GenerateInstanceDocumentFromSchemaDialog.java
xml/impl/src/com/intellij/xml/util/XmlUtil.java
xml/impl/src/com/intellij/xml/util/XsdUtil.java [new file with mode: 0644]
xml/openapi/src/com/intellij/psi/xml/XmlText.java

index 0b3844b53da6cd3d9c33ac68848e82d9ad38d3be..a79bafffabe3ac0e68d045fbaa057d201b5a8c92 100644 (file)
@@ -27,7 +27,7 @@
   <component name="ProjectKey">
     <option name="state" value="$PROJECT_DIR$/.idea/misc.xml" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA jdk" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA jdk" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SvnBranchConfigurationManager">
index 3b0002030884f78f1562177d81eb2f42c5acbd43..a73f663833c77b6a761093b562a14fe439b24413 100644 (file)
@@ -2,6 +2,18 @@
 <project version="4">
   <component name="Palette2">
     <group name="Swing">
+      <item class="com.intellij.ui.treeStructure.Tree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="0" />
+      </item>
+      <item class="com.intellij.ui.table.JBTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="0" />
+      </item>
+      <item class="com.intellij.ui.components.JBList" icon="/com/intellij/uiDesigner/icons/list.png" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="0" />
+      </item>
+      <item class="com.intellij.ui.components.JBScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="0" />
+      </item>
       <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
       </item>
@@ -11,9 +23,6 @@
       <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
       </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
       <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
         <initial-values>
       <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
         <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
       </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
       <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
           <preferred-size width="200" height="200" />
       <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
       </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      <item class="com.intellij.openapi.ui.TextFieldWithBrowseButton" icon="" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="0" />
       </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      <item class="com.intellij.ui.RawCommandLineEditor" icon="" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="7" anchor="0" fill="0" />
+      </item>
+      <item class="com.intellij.ui.ComboboxWithBrowseButton" icon="" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="0" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="7" hsize-policy="0" anchor="0" fill="0" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="" removable="true" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="7" anchor="0" fill="0" />
+      </item>
+      <item class="com.intellij.openapi.progress.util.TitlePanel" icon="" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="7" anchor="0" fill="0" />
       </item>
       <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
       </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
         <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
       </item>
       <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
         <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
       </item>
+      <item class="com.intellij.util.xml.impl.ui.BigStringComponent" icon="" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="0" />
+      </item>
+      <item class="com.intellij.ui.EditorTextField" icon="" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="0" />
+      </item>
+      <item class="com.intellij.ui.TitledSeparator" icon="/com/intellij/uiDesigner/icons/panel.png" removable="true" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="0" />
+      </item>
+      <item class="com.intellij.ui.ReferenceEditorComboWithBrowseButton" icon="/com/intellij/uiDesigner/icons/panel.png" removable="true" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="7" anchor="0" fill="1" />
+      </item>
     </group>
   </component>
+  <component name="uidesigner-configuration">
+    <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="false" />
+  </component>
 </project>
 
index 2f1803fad272d280643669a8ee3983a5f0cb0cd5..54f6f622997a3ccf8631b87cfef79fe503a7ef2e 100644 (file)
@@ -8,5 +8,6 @@
     <lang.syntaxHighlighterFactory key="RegExp" implementationClass="org.intellij.lang.regexp.RegExpSyntaxHighlighterFactory"/>
     <lang.braceMatcher language="RegExp" implementationClass="org.intellij.lang.regexp.RegExpBraceMatcher"/>
     <lang.surroundDescriptor language="RegExp" implementationClass="org.intellij.lang.regexp.surroundWith.SimpleSurroundDescriptor"/>
+    <colorSettingsPage implementation="org.intellij.lang.regexp.RegExpColorsPage"/>
   </extensions>
 </idea-plugin>
diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpColorsPage.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpColorsPage.java
new file mode 100644 (file)
index 0000000..8afcb73
--- /dev/null
@@ -0,0 +1,81 @@
+/*
+ * 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 org.intellij.lang.regexp;
+
+import com.intellij.application.options.colors.InspectionColorSettingsPage;
+import com.intellij.openapi.editor.colors.TextAttributesKey;
+import com.intellij.openapi.fileTypes.SyntaxHighlighter;
+import com.intellij.openapi.options.colors.AttributesDescriptor;
+import com.intellij.openapi.options.colors.ColorDescriptor;
+import com.intellij.openapi.options.colors.ColorSettingsPage;
+import com.intellij.util.containers.HashMap;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+import java.util.Map;
+
+/**
+ * @author traff
+ */
+public class RegExpColorsPage implements ColorSettingsPage, InspectionColorSettingsPage {
+  private static final AttributesDescriptor[] ATTRS = new AttributesDescriptor[] {
+    new AttributesDescriptor("Keywords",  RegExpHighlighter.META),
+    new AttributesDescriptor("Escaped characters",  RegExpHighlighter.ESC_CHARACTER),
+    new AttributesDescriptor("Braces",  RegExpHighlighter.BRACES),
+    new AttributesDescriptor("Brackets",  RegExpHighlighter.BRACKETS),
+    new AttributesDescriptor("Parenthesis",  RegExpHighlighter.PARENTHS),
+  };
+
+  @NonNls private static final HashMap<String,TextAttributesKey> ourTagToDescriptorMap = new HashMap<String, TextAttributesKey>();
+
+  @NotNull
+  public String getDisplayName() {
+    return "RegExp";
+  }
+
+  public Icon getIcon() {
+    return RegExpFileType.INSTANCE.getIcon();
+  }
+
+  @NotNull
+  public AttributesDescriptor[] getAttributeDescriptors() {
+    return ATTRS;
+  }
+
+  @NotNull
+  public ColorDescriptor[] getColorDescriptors() {
+    return ColorDescriptor.EMPTY_ARRAY;
+  }
+
+  @NotNull
+  public SyntaxHighlighter getHighlighter() {
+    final SyntaxHighlighter highlighter = SyntaxHighlighter.PROVIDER.create(RegExpFileType.INSTANCE, null, null);
+    assert highlighter != null;
+    return highlighter;
+  }
+
+  @NotNull
+  public String getDemoText() {
+    return
+      "^[\\w\\.-]+@([\\w\\-]+\\.)+[A-Z]{2,4}$";
+
+  }
+
+  public Map<String, TextAttributesKey> getAdditionalHighlightingTagToDescriptorMap() {
+    return ourTagToDescriptorMap;
+  }
+}
index 1a93527258d2fa76b9446ad982c74f57274f69fd..c4f80c1742cfb98b58b36c9c9873212b89644934 100644 (file)
@@ -24,6 +24,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiManager;
+import com.intellij.ui.ScrollPaneFactory;
 import org.intellij.images.ImagesBundle;
 import org.intellij.images.editor.ImageDocument;
 import org.intellij.images.editor.ImageEditor;
@@ -97,7 +98,7 @@ final class ImageEditorUI extends JPanel implements DataProvider {
         view.addMouseListener(new EditorMouseAdapter());
         view.addMouseListener(new FocusRequester());
 
-        JScrollPane scrollPane = new JScrollPane(view);
+      JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(view);
         scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
         scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 
index c32a1893a5f305e151e0907bc884ab2858d1af35..dfc69947a51b6f700711096505081aa1aa7c3fcd 100644 (file)
@@ -32,6 +32,7 @@ import com.intellij.pom.Navigatable;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
+import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.components.JBList;
 import org.intellij.images.fileTypes.ImageFileTypeManager;
 import org.intellij.images.options.*;
@@ -135,9 +136,8 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable {
             list.setFixedCellHeight(preferredSize.height);
 
 
-            JScrollPane scrollPane = new JScrollPane(
-                    list, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER
-            );
+          JScrollPane scrollPane =
+            ScrollPaneFactory.createScrollPane(list, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 
             ActionManager actionManager = ActionManager.getInstance();
             ActionGroup actionGroup = (ActionGroup) actionManager.getAction(ThumbnailViewActions.GROUP_TOOLBAR);
index 8bf2dba3161b8f2e878fd4f22c5d4016be900717..c121779066ba8c33b21a9f4064efbdd080f5f24c 100644 (file)
@@ -27,6 +27,7 @@ import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.MultiLineLabelUI;
 import com.intellij.openapi.util.Pair;
 import com.intellij.ui.IdeBorderFactory;
+import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Chunk;
 import com.intellij.util.ListWithSelection;
@@ -176,7 +177,7 @@ public class GenerateAntBuildDialog extends DialogWrapper {
         final Dimension preferredSize = new Dimension(myTable.getPreferredSize());
         preferredSize.height = (myTableModel.getRowCount() + 2) * myTable.getRowHeight() + myTable.getTableHeader().getHeight();
 
-        final JScrollPane scrollPane = new JScrollPane(myTable);
+      final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable);
         scrollPane.setPreferredSize(preferredSize);
         myChunksPanel.add(scrollPane, BorderLayout.CENTER);
     }
index 6500385b6bb57a3cfa624b1caab5adc1f1ad0145..32304df2c309032372df44482625f374129f6eff 100644 (file)
@@ -22,15 +22,14 @@ import com.intellij.compiler.ant.taskdefs.PatternSetRef;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.ex.ProjectEx;
-import com.intellij.openapi.roots.LibraryOrderEntry;
 import com.intellij.openapi.roots.ModuleRootManager;
-import com.intellij.openapi.roots.OrderEntry;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.roots.libraries.LibraryTable;
 import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.Processor;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -51,18 +50,16 @@ public class LibraryDefinitionsGeneratorFactory {
     final ModuleManager moduleManager = ModuleManager.getInstance(project);
     final Module[] modules = moduleManager.getModules();
     for (Module module : modules) {
-      final OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries();
-      for (OrderEntry orderEntry : orderEntries) {
-        if (orderEntry instanceof LibraryOrderEntry && orderEntry.isValid()) {
-          Library library = ((LibraryOrderEntry)orderEntry).getLibrary();
-          if (library != null) {
-            final String name = library.getName();
-            if (name != null) {
-              myUsedLibraries.add(name);
-            }
+      ModuleRootManager.getInstance(module).orderEntries().forEachLibrary(new Processor<Library>() {
+        @Override
+        public boolean process(Library library) {
+          final String name = library.getName();
+          if (name != null) {
+            myUsedLibraries.add(name);
           }
+          return true;
         }
-      }
+      });
     }
   }
 
index d9ff911ebcb33ef9af7ca47734956703b9f21c45..203d7b0e9f9bcb83e4a4a21ed3f88a094c37e388 100644 (file)
@@ -24,6 +24,7 @@ import com.intellij.openapi.roots.*;
 import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.util.ArrayUtil;
+import com.intellij.util.Processor;
 import com.intellij.util.containers.OrderedSet;
 import gnu.trove.TObjectHashingStrategy;
 
@@ -85,116 +86,103 @@ public class ModuleChunkClasspath extends Path {
           processedModules.add(module);
           final ProjectEx project = (ProjectEx)chunk.getProject();
           final File baseDir = BuildProperties.getProjectBaseDir(project);
-          for (final OrderEntry orderEntry : ModuleRootManager.getInstance(module).getOrderEntries()) {
-            if (!orderEntry.isValid()) {
-              continue;
-            }
-            if (orderEntry instanceof ExportableOrderEntry) {
-              ExportableOrderEntry e = (ExportableOrderEntry)orderEntry;
-              switch (e.getScope()) {
-                case COMPILE:
-                  break;
-                case PROVIDED:
-                  if (generateRuntimeClasspath && !generateTestClasspath) {
-                    continue;
-                  }
-                  break;
-                case RUNTIME:
-                  if (!generateRuntimeClasspath) {
-                    continue;
-                  }
-                  break;
-                case TEST:
-                  if (!generateTestClasspath) {
-                    continue;
-                  }
-                  break;
-              }
+          OrderEnumerator enumerator = ModuleRootManager.getInstance(module).orderEntries();
+          if (generateRuntimeClasspath) {
+            enumerator = enumerator.runtimeOnly();
+          }
+          else {
+            enumerator = enumerator.compileOnly();
+            if (!generateTestClasspath && (dependencyLevel == 0 || chunk.contains(module))) {
+              // this is the entry for outpath of the currently processed module
+              // the root module is never included
+              enumerator = enumerator.withoutModuleSourceEntries();
             }
-            if (!generateRuntimeClasspath) {
-              // needed for compilation classpath only
-              if ((orderEntry instanceof ModuleSourceOrderEntry)) {
-                // this is the entry for outpath of the currently processed module
-                if (!generateTestClasspath && (dependencyLevel == 0 || chunk.contains(module))) {
-                  // the root module is never included
-                  continue;
-                }
+          }
+          if (!generateTestClasspath) {
+            enumerator = enumerator.productionOnly();
+          }
+          enumerator.forEach(new Processor<OrderEntry>() {
+            @Override
+            public boolean process(OrderEntry orderEntry) {
+              if (!orderEntry.isValid()) {
+                return true;
               }
-              else {
+
+              if (!generateRuntimeClasspath && !(orderEntry instanceof ModuleOrderEntry)) {
+                // needed for compilation classpath only
                 final boolean isExported = (orderEntry instanceof ExportableOrderEntry) && ((ExportableOrderEntry)orderEntry).isExported();
                 if (dependencyLevel > 0 && !isExported) {
-                  if (!(orderEntry instanceof ModuleOrderEntry)) {
-                    // non-exported dependencies are excluded and not processed
-                    continue;
-                  }
+                  // non-exported dependencies are excluded and not processed
+                  return true;
                 }
               }
-            }
-            if (orderEntry instanceof JdkOrderEntry) {
-              if (genOptions.forceTargetJdk && !generateRuntimeClasspath) {
-                pathItems
-                  .add(new PathRefItem(BuildProperties.propertyRef(BuildProperties.getModuleChunkJdkClasspathProperty(chunk.getName()))));
+
+              if (orderEntry instanceof JdkOrderEntry) {
+                if (genOptions.forceTargetJdk && !generateRuntimeClasspath) {
+                  pathItems.add(new PathRefItem(BuildProperties.propertyRef(BuildProperties.getModuleChunkJdkClasspathProperty(chunk.getName()))));
+                }
               }
-            }
-            else if (orderEntry instanceof ModuleOrderEntry) {
-              final ModuleOrderEntry moduleOrderEntry = (ModuleOrderEntry)orderEntry;
-              final Module dependentModule = moduleOrderEntry.getModule();
-              if (!chunk.contains(dependentModule)) {
-                if (generateRuntimeClasspath && !genOptions.inlineRuntimeClasspath) {
-                  // in case of runtime classpath, just an referenced to corresponding classpath is created
-                  final ModuleChunk depChunk = genOptions.getChunkByModule(dependentModule);
-                  if (!processedChunks.contains(depChunk)) {
-                    // chunk references are included in the runtime classpath only once
-                    processedChunks.add(depChunk);
-                    String property = generateTestClasspath ? BuildProperties.getTestRuntimeClasspathProperty(depChunk.getName())
-                                                            : BuildProperties.getRuntimeClasspathProperty(depChunk.getName());
-                    pathItems.add(new PathRefItem(property));
+              else if (orderEntry instanceof ModuleOrderEntry) {
+                final ModuleOrderEntry moduleOrderEntry = (ModuleOrderEntry)orderEntry;
+                final Module dependentModule = moduleOrderEntry.getModule();
+                if (!chunk.contains(dependentModule)) {
+                  if (generateRuntimeClasspath && !genOptions.inlineRuntimeClasspath) {
+                    // in case of runtime classpath, just an referenced to corresponding classpath is created
+                    final ModuleChunk depChunk = genOptions.getChunkByModule(dependentModule);
+                    if (!processedChunks.contains(depChunk)) {
+                      // chunk references are included in the runtime classpath only once
+                      processedChunks.add(depChunk);
+                      String property = generateTestClasspath ? BuildProperties.getTestRuntimeClasspathProperty(depChunk.getName())
+                                                              : BuildProperties.getRuntimeClasspathProperty(depChunk.getName());
+                      pathItems.add(new PathRefItem(property));
+                    }
+                  }
+                  else {
+                    // in case of compile classpath or inlined runtime classpath,
+                    // the referenced module is processed recursively
+                    processModule(dependentModule, dependencyLevel + 1, moduleOrderEntry.isExported());
                   }
                 }
+              }
+              else if (orderEntry instanceof LibraryOrderEntry) {
+                final LibraryOrderEntry libraryOrderEntry = (LibraryOrderEntry)orderEntry;
+                final String libraryName = libraryOrderEntry.getLibraryName();
+                if (((LibraryOrderEntry)orderEntry).isModuleLevel()) {
+                  CompositeGenerator gen = new CompositeGenerator();
+                  gen.setHasLeadingNewline(false);
+                  LibraryDefinitionsGeneratorFactory.genLibraryContent(project, genOptions, libraryOrderEntry.getLibrary(), baseDir, gen);
+                  pathItems.add(new GeneratorItem(libraryName, gen));
+                }
                 else {
-                  // in case of compile classpath or inlined runtime classpath,
-                  // the referenced module is processed recursively
-                  processModule(dependentModule, dependencyLevel + 1, moduleOrderEntry.isExported());
+                  pathItems.add(new PathRefItem(BuildProperties.getLibraryPathId(libraryName)));
                 }
               }
-            }
-            else if (orderEntry instanceof LibraryOrderEntry) {
-              final LibraryOrderEntry libraryOrderEntry = (LibraryOrderEntry)orderEntry;
-              final String libraryName = libraryOrderEntry.getLibraryName();
-              if (((LibraryOrderEntry)orderEntry).isModuleLevel()) {
-                CompositeGenerator gen = new CompositeGenerator();
-                gen.setHasLeadingNewline(false);
-                LibraryDefinitionsGeneratorFactory.genLibraryContent(project, genOptions, libraryOrderEntry.getLibrary(), baseDir, gen);
-                pathItems.add(new GeneratorItem(libraryName, gen));
+              else if (orderEntry instanceof ModuleSourceOrderEntry) {
+                // Module source entry?
+                for (String url : getCompilationClasses(module, ((GenerationOptionsImpl)genOptions), generateRuntimeClasspath,
+                                                        generateTestClasspath, dependencyLevel == 0)) {
+                  if (url.endsWith(JarFileSystem.JAR_SEPARATOR)) {
+                    url = url.substring(0, url.length() - JarFileSystem.JAR_SEPARATOR.length());
+                  }
+                  final String propertyRef = genOptions.getPropertyRefForUrl(url);
+                  if (propertyRef != null) {
+                    pathItems.add(new PathElementItem(propertyRef));
+                  }
+                  else {
+                    final String path = VirtualFileManager.extractPath(url);
+                    pathItems.add(new PathElementItem(
+                      GenerationUtils.toRelativePath(path, chunk.getBaseDir(), moduleChunkBasedirProperty, genOptions)));
+                  }
+                }
               }
               else {
-                pathItems.add(new PathRefItem(BuildProperties.getLibraryPathId(libraryName)));
-              }
-            }
-            else if (orderEntry instanceof ModuleSourceOrderEntry) {
-              // Module source entry?
-              for (String url : getCompilationClasses(orderEntry, ((GenerationOptionsImpl)genOptions), generateRuntimeClasspath,
-                                                      generateTestClasspath, dependencyLevel == 0)) {
-                if (url.endsWith(JarFileSystem.JAR_SEPARATOR)) {
-                  url = url.substring(0, url.length() - JarFileSystem.JAR_SEPARATOR.length());
-                }
-                final String propertyRef = genOptions.getPropertyRefForUrl(url);
-                if (propertyRef != null) {
-                  pathItems.add(new PathElementItem(propertyRef));
-                }
-                else {
-                  final String path = VirtualFileManager.extractPath(url);
-                  pathItems.add(new PathElementItem(
-                    GenerationUtils.toRelativePath(path, chunk.getBaseDir(), moduleChunkBasedirProperty, genOptions)));
-                }
+                // Unknown order entry type. If it is actually encountered, extension point should be implemented
+                pathItems.add(new GeneratorItem(orderEntry.getClass().getName(),
+                                                new Comment("Unknown OrderEntryType: " + orderEntry.getClass().getName())));
               }
+              return true;
             }
-            else {
-              // Unknown order entry type. If it is actually encountered, extension point should be implemented
-              pathItems.add(new GeneratorItem(orderEntry.getClass().getName(),
-                                              new Comment("Unknown OrderEntryType: " + orderEntry.getClass().getName())));
-            }
-          }
+          });
         }
       }.processModule(module, 0, false);
     }
@@ -225,24 +213,26 @@ public class ModuleChunkClasspath extends Path {
     }
   }
 
-  private static String[] getCompilationClasses(final OrderEntry orderEntry,
+  private static String[] getCompilationClasses(final Module module,
                                                 final GenerationOptionsImpl options,
                                                 final boolean forRuntime,
                                                 final boolean forTest,
                                                 final boolean firstLevel) {
+    final CompilerModuleExtension extension = CompilerModuleExtension.getInstance(module);
+    if (extension == null) return ArrayUtil.EMPTY_STRING_ARRAY;
+
     if (!forRuntime) {
       if (forTest) {
-        return orderEntry.getUrls(firstLevel ? OrderRootType.PRODUCTION_COMPILATION_CLASSES : OrderRootType.COMPILATION_CLASSES);
+        return extension.getOutputRootUrls(!firstLevel);
       }
       else {
-        return firstLevel ? new String[0] : orderEntry.getUrls(OrderRootType.PRODUCTION_COMPILATION_CLASSES);
+        return firstLevel ? ArrayUtil.EMPTY_STRING_ARRAY : extension.getOutputRootUrls(false);
       }
     }
     final Set<String> jdkUrls = options.getAllJdkUrls();
 
     final OrderedSet<String> urls = new OrderedSet<String>();
-    urls.addAll(Arrays.asList(orderEntry.getUrls(forTest ? OrderRootType.COMPILATION_CLASSES
-                                                         : OrderRootType.PRODUCTION_COMPILATION_CLASSES)));
+    urls.addAll(Arrays.asList(extension.getOutputRootUrls(forTest)));
     urls.removeAll(jdkUrls);
     return ArrayUtil.toStringArray(urls);
   }
index 4faa3870e213aa0c8a421173f9d63826060bd159..d507c2b13dfb425b38f16bce019c35ccc55f8a01 100644 (file)
@@ -25,13 +25,11 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.*;
 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.Chunk;
-import com.intellij.util.JarClasspathHelper;
-import com.intellij.util.PathUtil;
-import com.intellij.util.StringBuilderSpinAllocator;
+import com.intellij.util.*;
 import com.intellij.util.containers.OrderedSet;
 import gnu.trove.THashMap;
 import gnu.trove.TObjectHashingStrategy;
@@ -194,28 +192,16 @@ public class ModuleChunk extends Chunk<Module> {
   public OrderedSet<VirtualFile> getCompilationClasspathFiles() {
     final Set<Module> modules = getNodes();
 
-    final OrderedSet<VirtualFile> cpFiles = new OrderedSet<VirtualFile>(TObjectHashingStrategy.CANONICAL);
+    OrderedSet<VirtualFile> cpFiles = new OrderedSet<VirtualFile>(TObjectHashingStrategy.CANONICAL);
     for (final Module module : modules) {
-
-      final OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries();
-      boolean skip = true;
-      for (OrderEntry orderEntry : orderEntries) {
-        if (orderEntry instanceof JdkOrderEntry) {
-          skip = false;
-          continue;
-        }
-        if (skip) {
-          continue;
-        }
-
-        VirtualFile[] files = orderEntry.getFiles((mySourcesFilter & TEST_SOURCES) == 0 ? OrderRootType.PRODUCTION_COMPILATION_CLASSES : OrderRootType.COMPILATION_CLASSES);
-        if (orderEntry instanceof ModuleOrderEntry) {
-          Project project = module.getProject();
-          JarClasspathHelper.patchFiles(files, project);
-        }
-        cpFiles.addAll(Arrays.asList(files));
+      OrderEnumerator enumerator = OrderEnumerator.orderEntries(module).compileOnly().satisfying(new AfterJdkOrderEntryCondition());
+      if ((mySourcesFilter & TEST_SOURCES) == 0) {
+        enumerator = enumerator.productionOnly();
       }
+      Collections.addAll(cpFiles, enumerator.recursively().exportedOnly().getClassesRoots());
     }
+    cpFiles = JarClasspathHelper.patchFiles(cpFiles, myContext.getProject());
+
     return cpFiles;
   }
 
@@ -228,52 +214,21 @@ public class ModuleChunk extends Chunk<Module> {
     final OrderedSet<VirtualFile> cpFiles = new OrderedSet<VirtualFile>(TObjectHashingStrategy.CANONICAL);
     final OrderedSet<VirtualFile> jdkFiles = new OrderedSet<VirtualFile>(TObjectHashingStrategy.CANONICAL);
     for (final Module module : modules) {
-      final OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries();
-      for (OrderEntry orderEntry : orderEntries) {
-        if (orderEntry instanceof JdkOrderEntry) {
-          jdkFiles.addAll(Arrays.asList(orderEntry.getFiles(OrderRootType.CLASSES)));
-          break;
-        }
-        else {
-          if ((mySourcesFilter & TEST_SOURCES) == 0) {
-            cpFiles.addAll(Arrays.asList(orderEntry.getFiles(OrderRootType.PRODUCTION_COMPILATION_CLASSES)));
-          }
-          else {
-            cpFiles.addAll(Arrays.asList(orderEntry.getFiles(OrderRootType.COMPILATION_CLASSES)));
-          }
-        }
+      OrderEnumerator enumerator = OrderEnumerator.orderEntries(module).compileOnly().satisfying(new BeforeJdkOrderEntryCondition());
+      if ((mySourcesFilter & TEST_SOURCES) == 0) {
+        enumerator = enumerator.productionOnly();
       }
+      Collections.addAll(cpFiles, enumerator.recursively().exportedOnly().getClassesRoots());
+      Collections.addAll(jdkFiles, OrderEnumerator.orderEntries(module).sdkOnly().getClassesRoots());
     }
     cpFiles.addAll(jdkFiles);
     return cpFiles;
   }
 
   private static String convertToStringPath(final OrderedSet<VirtualFile> cpFiles) {
-    final StringBuilder classpathBuffer = StringBuilderSpinAllocator.alloc();
-    try {
-      for (final VirtualFile file : cpFiles) {
-        final String path = PathUtil.getLocalPath(file);
-        //if (file.getFileSystem() instanceof LocalFileSystem && file.isDirectory()) {
-        //  path = tryZipFor(file.getPath());
-        //}
-        //else {
-        //  path = PathUtil.getLocalPath(file);
-        //}
-
-        if (path == null) {
-          continue;
-        }
-        if (classpathBuffer.length() > 0) {
-          classpathBuffer.append(File.pathSeparatorChar);
-        }
-        classpathBuffer.append(path);
-      }
-
-      return classpathBuffer.toString();
-    }
-    finally {
-      StringBuilderSpinAllocator.dispose(classpathBuffer);
-    }
+    PathsList classpath = new PathsList();
+    classpath.addVirtualFiles(cpFiles);
+    return classpath.getPathsString();
   }
 
   //private String tryZipFor(String outputDir) {
@@ -327,4 +282,29 @@ public class ModuleChunk extends Chunk<Module> {
   public LanguageLevel getLanguageLevel() {
     return LanguageLevelUtil.getEffectiveLanguageLevel(getModules()[0]);
   }
+
+  private static class BeforeJdkOrderEntryCondition implements Condition<OrderEntry> {
+    private boolean myJdkFound;
+
+    @Override
+    public boolean value(OrderEntry orderEntry) {
+      if (orderEntry instanceof JdkOrderEntry) {
+        myJdkFound = true;
+      }
+      return !myJdkFound;
+    }
+  }
+
+  private static class AfterJdkOrderEntryCondition implements Condition<OrderEntry> {
+    private boolean myJdkFound;
+
+    @Override
+    public boolean value(OrderEntry orderEntry) {
+      if (orderEntry instanceof JdkOrderEntry) {
+        myJdkFound = true;
+        return false;
+      }
+      return myJdkFound;
+    }
+  }
 }
index 04972a1e68f313fd3fb5666b753ab2c6d1bbb713..7b25a94add967300f9fa5f0917cc6c9383b2cc9f 100644 (file)
@@ -31,7 +31,10 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
-import com.intellij.openapi.roots.*;
+import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.roots.OrderEnumerator;
+import com.intellij.openapi.roots.ProjectFileIndex;
+import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.io.FileUtil;
@@ -39,8 +42,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.PathUtil;
-import com.intellij.util.StringBuilderSpinAllocator;
+import com.intellij.util.PathsList;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -385,35 +387,9 @@ public class RmicCompiler implements ClassPostProcessingCompiler{
   }
 
   private static String getCompilationClasspath(Module module) {
-    final StringBuilder classpathBuffer = StringBuilderSpinAllocator.alloc();
-    try {
-      final OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries();
-      final Set<VirtualFile> processedFiles = new HashSet<VirtualFile>();
-      for (final OrderEntry orderEntry : orderEntries) {
-        if (orderEntry instanceof JdkOrderEntry) {
-          continue;
-        }
-        final VirtualFile[] files = orderEntry.getFiles(OrderRootType.COMPILATION_CLASSES);
-        for (VirtualFile file : files) {
-          if (processedFiles.contains(file)) {
-            continue;
-          }
-          processedFiles.add(file);
-          final String path = PathUtil.getLocalPath(file);
-          if (path == null) {
-            continue;
-          }
-          if (classpathBuffer.length() > 0) {
-            classpathBuffer.append(File.pathSeparatorChar);
-          }
-          classpathBuffer.append(path);
-        }
-      }
-      return classpathBuffer.toString();
-    }
-    finally {
-      StringBuilderSpinAllocator.dispose(classpathBuffer);
-    }
+    final OrderEnumerator enumerator = ModuleRootManager.getInstance(module).orderEntries().withoutSdk().compileOnly().recursively().exportedOnly();
+    final PathsList pathsList = enumerator.getPathsList();
+    return pathsList.getPathsString();
   }
 
   private static final class RemoteClassValidityState implements ValidityState {
index 8bd01c0e2215b26a369ff0ceaffb8c30b1740587..3e39d0280ef001292edf40aea2d4f2206ae6f181 100644 (file)
@@ -13,6 +13,7 @@ import com.intellij.openapi.ui.ex.MultiLineLabel;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.TableUtil;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.ui.ItemRemovable;
@@ -108,7 +109,7 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable
     myProcessorsModel = new ProcessorTableModel();
     processorTablePanel.setBorder(new TitledBorder("Annotation Processors"));
     myProcessorTable = new Table(myProcessorsModel);
-    processorTablePanel.add(new JScrollPane(myProcessorTable), BorderLayout.CENTER);
+    processorTablePanel.add(ScrollPaneFactory.createScrollPane(myProcessorTable), BorderLayout.CENTER);
     final JPanel buttons = new JPanel(new GridBagLayout());
     myAddButton = new JButton("Add");
     buttons.add(myAddButton, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, new Insets(0, 5, 0, 0), 0, 0));
@@ -387,4 +388,4 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable
       this.options = options != null? options : "";
     }
   }
-}
\ No newline at end of file
+}
index f6dceaba6c7efbd5e3b396e5a584b6882203916f..7a7c97e71e48f9dd6cd65070e4ab53e005886435 100644 (file)
@@ -433,4 +433,4 @@ public class ProcessedModulesTable extends JPanel {
       return component;
     }
   }
-}
\ No newline at end of file
+}
index 5cf32bef72a9bea7ee614acafc24698a76a1477f..e10139310ba2cb99054c1197e20f72b8452fc67e 100644 (file)
@@ -90,4 +90,8 @@ public final class MockJdkWrapper implements Sdk {
   public SdkModificator getSdkModificator() {
     return null;
   }
+
+  public Sdk getDelegate() {
+    return myDelegate;
+  }
 }
\ No newline at end of file
index ded6d5abd5e7418549a64bdd0dafdc4f1f8de0b9..1eebd0171750950668bee77fb17d003bdd594288 100644 (file)
@@ -39,6 +39,7 @@ import java.util.StringTokenizer;
 
 public class Javac2 extends Javac {
     private ArrayList myFormFiles;
+    private Path myNestedFormDirs;
 
     public Javac2() {
     }
@@ -166,6 +167,39 @@ public class Javac2 extends Javac {
         super.setCompiler(compiler);
     }
 
+    /**
+     * Sets the nested form directories that will be used during the
+     * compilation.
+     * @param nestedformdirs a path
+     */
+    public void setNestedformdirs(Path nestedformdirs) {
+        if (myNestedFormDirs == null) {
+            myNestedFormDirs = nestedformdirs;
+        } else {
+           myNestedFormDirs.append(nestedformdirs);
+        }
+    }
+
+    /**
+     * Gets the nested form directories that will be used during the
+     * compilation.
+     * @return the extension directories as a path
+     */
+    public Path getNestedformdirs() {
+        return myNestedFormDirs;
+    }
+
+    /**
+     * Adds a path to nested form directories.
+     * @return a path to be configured
+     */
+    public Path createNestedformdirs() {
+        if (myNestedFormDirs == null) {
+            myNestedFormDirs = new Path(getProject());
+        }
+        return myNestedFormDirs.createPath();
+    }
+
     /**
      * The overriden compile method that does not actually compiles java sources but only instruments
      * class files.
@@ -253,7 +287,7 @@ public class Javac2 extends Javac {
                 finally {
                     stream.close();
                 }
-                final AsmCodeGenerator codeGenerator = new AsmCodeGenerator(rootContainer, loader, new AntNestedFormLoader(loader), false,
+                final AsmCodeGenerator codeGenerator = new AsmCodeGenerator(rootContainer, loader, new AntNestedFormLoader(loader, myNestedFormDirs), false,
                                                                             new AntClassWriter(getAsmClassWriterFlags(version), loader));
                 codeGenerator.patchFile(classFile);
                 final FormErrorInfo[] warnings = codeGenerator.getWarnings();
@@ -459,10 +493,12 @@ public class Javac2 extends Javac {
 
     private class AntNestedFormLoader implements NestedFormLoader {
         private final ClassLoader myLoader;
+        private final Path myNestedFormDirs;
         private final HashMap myFormCache = new HashMap();
 
-        public AntNestedFormLoader(final ClassLoader loader) {
+        public AntNestedFormLoader(final ClassLoader loader, Path nestedFormDirs) {
             myLoader = loader;
+            myNestedFormDirs = nestedFormDirs; 
         }
 
         public LwRootContainer loadForm(String formFileName) throws Exception {
@@ -476,21 +512,30 @@ public class Javac2 extends Javac {
                 String name = file.getAbsolutePath().replace(File.separatorChar, '/').toLowerCase();
                 log("Comparing with " + name, Project.MSG_VERBOSE);
                 if (name.endsWith(formFileFullName)) {
-                    InputStream formInputStream = new FileInputStream(file);
-                    final LwRootContainer container = Utils.getRootContainer(formInputStream, null);
-                    myFormCache.put(formFileName, container);
-                    return container;
+                  return loadForm(formFileName, new FileInputStream(file));
+                }
+            }
+            if (myNestedFormDirs != null) {
+                for(Iterator it = myNestedFormDirs.iterator(); it.hasNext(); ) {
+                    String path = (String) it.next();
+                    if (path.replace(File.separatorChar, '/').toLowerCase().endsWith(formFileFullName)) {
+                        return loadForm(formFileName, new FileInputStream(path));
+                    }
                 }
             }
             InputStream resourceStream = myLoader.getResourceAsStream(formFileName);
             if (resourceStream != null) {
-                final LwRootContainer container = Utils.getRootContainer(resourceStream, null);
-                myFormCache.put(formFileName, container);
-                return container;
+              return loadForm(formFileName, resourceStream);
             }
             throw new Exception("Cannot find nested form file " + formFileName);
         }
 
+        private LwRootContainer loadForm(String formFileName, InputStream resourceStream) throws Exception {
+            final LwRootContainer container = Utils.getRootContainer(resourceStream, null);
+            myFormCache.put(formFileName, container);
+            return container;
+        }
+
         public String getClassToBindName(LwRootContainer container) {
             final String className = container.getClassToBind();
             String result = getClassOrInnerName(className.replace('.', '/'));
index a53ae7b17b2e34765e444e88d938877f331c3f92..d6bcc68bbe76c64f2699b895c55f0865037e8b8c 100644 (file)
@@ -78,6 +78,7 @@ public class NotNullVerifyingInstrumenter extends ClassAdapter implements Opcode
     return new MethodAdapter(v) {
 
       private final ArrayList myNotNullParams = new ArrayList();
+      private int mySyntheticCount = 0;
       private boolean myIsNotNull = false;
       //private boolean myIsUnmodifiable = false;
       public Label myThrowLabel;
@@ -92,9 +93,15 @@ public class NotNullVerifyingInstrumenter extends ClassAdapter implements Opcode
         av = mv.visitParameterAnnotation(parameter,
                                          anno,
                                          visible);
-        if (isReferenceType(args[parameter]) &&
-            anno.equals(NOT_NULL_ANNO)) {
-          myNotNullParams.add(new Integer(parameter));
+        if (isReferenceType(args[parameter])) {
+          if (anno.equals(NOT_NULL_ANNO)) {
+            myNotNullParams.add(new Integer(parameter));
+          }
+          else if (anno.equals("Ljava/lang/Synthetic;")) {
+            // See asm r1278 for what we do this,
+            // http://forge.objectweb.org/tracker/index.php?func=detail&aid=307392&group_id=23&atid=100023
+            mySyntheticCount++;
+          }
         }
         return av;
       }
@@ -117,7 +124,7 @@ public class NotNullVerifyingInstrumenter extends ClassAdapter implements Opcode
         }
         for (int p = 0; p < myNotNullParams.size(); ++p) {
           int var = ((access & ACC_STATIC) == 0) ? 1 : 0;
-          int param = ((Integer)myNotNullParams.get(p)).intValue();
+          int param = ((Integer)myNotNullParams.get(p)).intValue() - mySyntheticCount;
           for (int i = 0; i < param + startParameter; ++i) {
             var += args[i].getSize();
           }
index 97eb5afd45a1d4075a27e268acb6d608c173a5ce..d933dca6b60ba46d4eec5b8cbfca73767bb50b98 100644 (file)
@@ -69,6 +69,7 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.Ref;
+import com.intellij.openapi.wm.ToolWindowId;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
@@ -1743,7 +1744,7 @@ public abstract class DebugProcessImpl implements DebugProcess {
                   if (runProfile != null) {
                     SwingUtilities.invokeLater(new Runnable() {
                       public void run() {
-                        ExecutionUtil.handleExecutionError(myProject, runProfile, e);
+                        ExecutionUtil.handleExecutionError(myProject, ToolWindowId.DEBUG, runProfile, e);
                       }
                     });
                   }
index 14ef39900cc560bea98bc6e224e03985bbe6275e..d28dbb4a02ec2cba077c07fede8b2f39092fde76 100644 (file)
@@ -32,6 +32,7 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.TableUtil;
 import com.intellij.util.ui.AbstractTableCellEditor;
 import com.intellij.util.ui.Table;
@@ -265,7 +266,7 @@ public class CompoundRendererConfigurable implements UnnamedConfigurable{
         myDownButton.setEnabled(enabled);
       }
     };
-    final JScrollPane scrollPane = new JScrollPane(myTable);
+    final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable);
     panel.add(scrollPane, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 4, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
     panel.add(myAddButton, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(0, 4, 4, 0), 0, 0));
     panel.add(myRemoveButton, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(0, 4, 4, 0), 0, 0));
index c08839f1108012559f6e7fce87c7c89ff49d364c..914146fc772a5ab1da5386686fc803716ce01c0f 100644 (file)
@@ -38,6 +38,7 @@ import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.ui.ScrollPaneFactory;
 import com.sun.jdi.*;
 import org.jetbrains.annotations.NonNls;
 
@@ -97,7 +98,7 @@ public class ExportDialog extends DialogWrapper {
 
   protected JComponent createCenterPanel() {
     myTextArea.setEditable(false);
-    JScrollPane pane = new JScrollPane(myTextArea);
+    JScrollPane pane = ScrollPaneFactory.createScrollPane(myTextArea);
     pane.setPreferredSize(new Dimension(400, 300));
     return pane;
   }
index e049aea72fc78e0b15b9654ac6bf7cbdd58630f3..1d6ac280bc4e0c96d657e7242451262d90cc9821 100644 (file)
@@ -47,6 +47,7 @@ import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.ComboBoxWithWidePopup;
 import com.intellij.ui.PopupHandler;
+import com.intellij.ui.ScrollPaneFactory;
 import com.sun.jdi.ObjectCollectedException;
 
 import javax.swing.*;
@@ -96,7 +97,7 @@ public class FramesPanel extends UpdatableDebuggerView {
 
     setBorder(null);
     add(myThreadsCombo, BorderLayout.NORTH);
-    add(new JScrollPane(myFramesList), BorderLayout.CENTER);
+    add(ScrollPaneFactory.createScrollPane(myFramesList), BorderLayout.CENTER);
   }
 
   public DebuggerStateManager getContextManager() {
index 5585eb9be34154bd36e805d4bc17b7fc8a71307e..5bdff11a9185ee73e64a1b143f797819388a275f 100644 (file)
@@ -32,6 +32,7 @@ import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.ui.ScreenUtil;
+import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.util.text.StringTokenizer;
 import com.intellij.util.ui.GeometryUtil;
 import com.intellij.util.ui.UIUtil;
@@ -188,7 +189,7 @@ public class DebuggerTreeBase extends DnDAwareTree implements Disposable {
     }
 
     final JComponent tipContent = createTipContent(toolTipText, node);
-    final JScrollPane scrollPane = new JScrollPane(tipContent);
+    final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(tipContent);
     scrollPane.setBorder(null);
     scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
     scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
index f397326bc4876dd3193747a3dc1e2eb52196aaa5..5ebe1cbe28c465e9a5ca902acdfa46cbf2fe78af 100644 (file)
@@ -28,9 +28,9 @@ import com.intellij.debugger.ui.impl.watch.NodeDescriptorImpl;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.ActionPopupMenu;
 import com.intellij.openapi.project.Project;
+import com.intellij.ui.ScrollPaneFactory;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
 import java.awt.*;
 
 public class InspectPanel extends DebuggerTreePanel {
@@ -39,7 +39,7 @@ public class InspectPanel extends DebuggerTreePanel {
 
     getInspectTree().setInspectDescriptor(inspectDescriptor);
 
-    add(new JScrollPane(getInspectTree()), BorderLayout.CENTER);
+    add(ScrollPaneFactory.createScrollPane(getInspectTree()), BorderLayout.CENTER);
     final Disposable disposable = DebuggerAction.installEditAction(getInspectTree(), DebuggerActions.EDIT_NODE_SOURCE);
     registerDisposable(disposable);
     setUpdateEnabled(true);
@@ -57,4 +57,4 @@ public class InspectPanel extends DebuggerTreePanel {
   public InspectDebuggerTree getInspectTree() {
     return (InspectDebuggerTree)getTree();
   }
-}
\ No newline at end of file
+}
index e63cd8f42886f7b25e7665f266577ca303f38c8b..2f8e6e118c4e8ccc7fd35b97964aa7262fb10be4 100644 (file)
@@ -30,9 +30,9 @@ import com.intellij.openapi.actionSystem.ActionPopupMenu;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
+import com.intellij.ui.ScrollPaneFactory;
 import org.jetbrains.annotations.NonNls;
 
-import javax.swing.*;
 import java.awt.*;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
@@ -59,7 +59,7 @@ public class ThreadsPanel extends DebuggerTreePanel{
         }
       }
     });
-    add(new JScrollPane(getThreadsTree()), BorderLayout.CENTER);
+    add(ScrollPaneFactory.createScrollPane(getThreadsTree()), BorderLayout.CENTER);
   }
 
   protected DebuggerTree createTreeView() {
index 5250b408d575daa32fd462cb12627d0b3fa003e1..08f65ac0a10b5d7ec5d4068daad09a7d9a6a99dc 100644 (file)
@@ -22,6 +22,7 @@ import com.intellij.debugger.ui.impl.watch.DebuggerTree;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.project.Project;
+import com.intellij.ui.ScrollPaneFactory;
 import org.jetbrains.annotations.NonNls;
 
 import javax.swing.*;
@@ -39,7 +40,7 @@ public class VariablesPanel extends DebuggerTreePanel implements DataProvider{
 
     final FrameDebuggerTree frameTree = getFrameTree();
 
-    add(new JScrollPane(frameTree), BorderLayout.CENTER);
+    add(ScrollPaneFactory.createScrollPane(frameTree), BorderLayout.CENTER);
     registerDisposable(DebuggerAction.installEditAction(frameTree, DebuggerActions.EDIT_NODE_SOURCE));
 
     overrideShortcut(frameTree, DebuggerActions.SET_VALUE, new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0)));
index e0564ac1c7be2c2999804da64aa5b7efff323a2c..a961cdf15a47ab0303d401a992910e900d5d4c14 100644 (file)
@@ -32,9 +32,9 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.ActionPopupMenu;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
+import com.intellij.ui.ScrollPaneFactory;
 import org.jetbrains.annotations.NonNls;
 
-import javax.swing.*;
 import java.awt.*;
 import java.util.Enumeration;
 
@@ -43,7 +43,7 @@ public abstract class WatchPanel extends DebuggerTreePanel {
 
   public WatchPanel(Project project, DebuggerStateManager stateManager) {
     super(project, stateManager);
-    add(new JScrollPane(getWatchTree()), BorderLayout.CENTER);
+    add(ScrollPaneFactory.createScrollPane(getWatchTree()), BorderLayout.CENTER);
     final Disposable disposable = DebuggerAction.installEditAction(getWatchTree(), DebuggerActions.EDIT_NODE_SOURCE);
     registerDisposable(disposable);
   }
index e657dd9084a229f39d6fe50d04144965f01dc5aa..419e226cedba9f21fafa733024dceeb68044c723 100644 (file)
@@ -27,7 +27,7 @@
         <properties/>
         <border type="none"/>
         <children>
-          <scrollpane id="68272">
+          <scrollpane class="com.intellij.ui.components.JBScrollPane" id="68272">
             <constraints>
               <xy x="0" y="0" width="188" height="227"/>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="3"/>
index eea6a8731525826a62dd08075a0b4d6ae1cbfd6a..b5e4157642b5789c94d53ce7e958b3b5944d7938 100644 (file)
@@ -17,7 +17,7 @@
           <text resource-bundle="messages/ExecutionBundle" key="environment.variables.helper.use.arguments.label"/>
         </properties>
       </component>
-      <scrollpane id="f35c0">
+      <scrollpane class="com.intellij.ui.components.JBScrollPane" id="f35c0">
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
           <gridbag weightx="1.0" weighty="1.0"/>
index e137c332dfe095b8180f8d7300d942c2e35a0118..e46254a68ea1c8db0887a82ce1cdd5c7daaaa4b9 100644 (file)
@@ -64,7 +64,8 @@ public class JavaParameters extends SimpleJavaParameters {
     }
 
     setDefaultCharset(module.getProject());
-    configureEnumerator(OrderEnumerator.orderEntries(module).runtimeOnly().recursively(), classPathType).collectPaths(getClassPath());
+    configureEnumerator(OrderEnumerator.orderEntries(module).runtimeOnly().recursively(), classPathType)
+      .classes().collectPaths(getClassPath());
   }
 
   public void setDefaultCharset(final Project project) {
@@ -102,7 +103,7 @@ public class JavaParameters extends SimpleJavaParameters {
       return;
     }
 
-    configureEnumerator(OrderEnumerator.orderEntries(project).runtimeOnly(), classPathType).collectPaths(getClassPath());
+    configureEnumerator(OrderEnumerator.orderEntries(project).runtimeOnly(), classPathType).classes().collectPaths(getClassPath());
   }
 
   private static OrderEnumerator configureEnumerator(OrderEnumerator enumerator, int classPathType) {
index 3a01e0f615f2be554317cea2a202c8595d0ddaa7..c1e808b35a129adc2effc1d10321bb8b336ff2bb 100644 (file)
@@ -16,7 +16,7 @@
           <text resource-bundle="messages/ProjectBundle" key="label.text.the.following.facets.are.detected.on.the.fly"/>
         </properties>
       </component>
-      <scrollpane id="41e3d">
+      <scrollpane class="com.intellij.ui.components.JBScrollPane" id="41e3d">
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
index 52761a159f9a7309c65b9c88fd614ab87180e271..87e33caaf9e875215c0f3ddbaa5774a965c5ae02 100644 (file)
@@ -84,7 +84,7 @@
                 <properties/>
                 <border type="none"/>
                 <children>
-                  <scrollpane id="c575b">
+                  <scrollpane class="com.intellij.ui.components.JBScrollPane" id="c575b">
                     <constraints>
                       <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false">
                         <preferred-size width="250" height="120"/>
                 <properties/>
                 <border type="none"/>
                 <children>
-                  <scrollpane id="4fa3">
+                  <scrollpane class="com.intellij.ui.components.JBScrollPane" id="4fa3">
                     <constraints>
                       <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false">
                         <preferred-size width="350" height="120"/>
index 2f15d98d183ff5829065084a103099d736ea00d6..9db56d737dab5f2ef14ceb1e223ab623392e5ae2 100644 (file)
@@ -22,20 +22,25 @@ import com.intellij.facet.ui.FacetValidatorsManager;
 import com.intellij.facet.ui.ValidationResult;
 import com.intellij.facet.ui.libraries.*;
 import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.roots.*;
+import com.intellij.openapi.application.Result;
+import com.intellij.openapi.application.WriteAction;
+import com.intellij.openapi.roots.ModifiableRootModel;
+import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.roots.ModuleRootModel;
+import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainer;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.application.WriteAction;
-import com.intellij.openapi.application.Result;
-import org.jetbrains.annotations.Nullable;
+import com.intellij.util.Processor;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author nik
@@ -105,36 +110,17 @@ public class FacetLibrariesValidatorImpl extends FacetLibrariesValidator {
   }
 
   private List<VirtualFile> collectRoots(final @Nullable ModuleRootModel rootModel) {
-    ArrayList<VirtualFile> roots = new ArrayList<VirtualFile>();
+    final ArrayList<VirtualFile> roots = new ArrayList<VirtualFile>();
     if (rootModel != null) {
-      RootPolicy<List<VirtualFile>> policy = new CollectingLibrariesPolicy();
-      rootModel.processOrder(policy, roots);
-    }
-    return roots;
-  }
-
-  private class CollectingLibrariesPolicy extends RootPolicy<List<VirtualFile>> {
-    private final Set<Module> myProcessedModules = new HashSet<Module>();
-
-    public List<VirtualFile> visitLibraryOrderEntry(final LibraryOrderEntry libraryOrderEntry, final List<VirtualFile> value) {
-      Library library = libraryOrderEntry.getLibrary();
-      if (library != null) {
-        value.addAll(Arrays.asList(myContext.getLibrariesContainer().getLibraryFiles(library, OrderRootType.CLASSES)));
-      }
-      return value;
-    }
-
-    public List<VirtualFile> visitModuleOrderEntry(final ModuleOrderEntry moduleOrderEntry, final List<VirtualFile> value) {
-      Module module = moduleOrderEntry.getModule();
-      if (module != null && myProcessedModules.add(module)) {
-        ModuleRootModel dependency = myContext.getModulesProvider().getRootModel(module);
-        if (dependency != null) {
-          return dependency.processOrder(this, value);
+      rootModel.orderEntries().using(myContext.getModulesProvider()).recursively().librariesOnly().forEachLibrary(new Processor<Library>() {
+        @Override
+        public boolean process(Library library) {
+          roots.addAll(Arrays.asList(myContext.getLibrariesContainer().getLibraryFiles(library, OrderRootType.CLASSES)));
+          return true;
         }
-      }
-      return value;
+      });
     }
-
+    return roots;
   }
 
   private class LibrariesQuickFix extends FacetConfigurationQuickFix {
index 7ee8a74ec77a2f80043441020a91e7d0b0360704..f6165bdc21b46b7f73e6080da5bb923ad4212dea 100644 (file)
@@ -24,6 +24,7 @@ import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.PopupHandler;
+import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.HashSet;
 import org.jetbrains.annotations.NonNls;
@@ -48,7 +49,7 @@ public class PaletteWindow extends JPanel implements DataProvider {
   private final MyPropertyChangeListener myPropertyChangeListener = new MyPropertyChangeListener();
   private final Set<PaletteGroup> myGroups = new HashSet<PaletteGroup>();
   private final JTabbedPane myTabbedPane = new JTabbedPane();
-  private final JScrollPane myScrollPane = new JScrollPane();
+  private final JScrollPane myScrollPane = ScrollPaneFactory.createScrollPane();
   private final MyListSelectionListener myListSelectionListener = new MyListSelectionListener();
   private PaletteGroupHeader myLastFocusedGroup;
 
@@ -111,7 +112,7 @@ public class PaletteWindow extends JPanel implements DataProvider {
       }
       for(String tabName: tabNames) {
         PaletteContentWindow contentWindow = new PaletteContentWindow();
-        JScrollPane scrollPane = new JScrollPane(contentWindow);
+        JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(contentWindow);
         scrollPane.addMouseListener(new MyScrollPanePopupHandler());
         myTabbedPane.add(tabName, scrollPane);
         for(PaletteGroup group: currentGroups) {
index e2d389b8638c2026ef8ca0a1f0a3fb8370413b3b..0f824ce895fbbb36ecd5a7d076af0fd4ec56cb02 100644 (file)
@@ -23,11 +23,12 @@ import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.ui.ex.MultiLineLabel;
 import com.intellij.openapi.util.IconLoader;
+import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.Icons;
 import com.intellij.util.StringBuilderSpinAllocator;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
@@ -75,12 +76,12 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
     myDependenciesList = createList();
 
     final Splitter splitter = new Splitter(false);
-    
-    final JScrollPane entriesPane = new JScrollPane(myEntriesChooser);
+
+    final JScrollPane entriesPane = ScrollPaneFactory.createScrollPane(myEntriesChooser);
     entriesPane.setBorder(BorderFactory.createTitledBorder(getEntriesChooserTitle()));
     splitter.setFirstComponent(entriesPane);
-    
-    final JScrollPane depsPane = new JScrollPane(myDependenciesList);
+
+    final JScrollPane depsPane = ScrollPaneFactory.createScrollPane(myDependenciesList);
     depsPane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(getDependenciesTitle()), depsPane.getBorder()));
     splitter.setSecondComponent(depsPane);
     
@@ -498,7 +499,7 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
 
       final JPanel labelChooser = new JPanel(new BorderLayout());
       labelChooser.add(new JLabel(getSplitDialogChooseFilesPrompt()), BorderLayout.NORTH);
-      labelChooser.add(new JScrollPane(myChooser), BorderLayout.CENTER);
+      labelChooser.add(ScrollPaneFactory.createScrollPane(myChooser), BorderLayout.CENTER);
       labelChooser.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 
       panel.add(labelNameField, BorderLayout.NORTH);
index 1867d97754a83dc62dcfa65c94934f183ad64c73..b6bb1234a643a4502214c0615cb695f8f58feaae 100644 (file)
@@ -73,7 +73,7 @@
               <preferredSize width="280" height="20"/>
             </properties>
           </component>
-          <scrollpane id="d8de8">
+          <scrollpane class="com.intellij.ui.components.JBScrollPane" id="d8de8">
             <constraints>
               <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
               <gridbag top="0" left="4" bottom="0" right="0" weightx="0.1" weighty="1.0"/>
               <text resource-bundle="messages/ProjectBundle" key="project.new.wizard.description.title"/>
             </properties>
           </component>
-          <scrollpane id="6260">
+          <scrollpane class="com.intellij.ui.components.JBScrollPane" id="6260">
             <constraints>
               <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
               <gridbag top="0" left="3" bottom="0" right="0" weightx="0.8" weighty="0.0"/>
index c86e803b19b0db28ade4f9bddd1248c8af553589..924f2f419bf74ad604cbb10a23aa6e700b8757d3 100644 (file)
@@ -30,6 +30,7 @@ import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectJdksModel;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.wm.ex.WindowManagerEx;
+import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.ArrayUtil;
 import gnu.trove.TIntArrayList;
@@ -75,7 +76,7 @@ public class JdkChooserPanel extends JPanel {
     });
 
     JPanel panel = new JPanel(new BorderLayout());
-    panel.add(new JScrollPane(myList), BorderLayout.CENTER);
+    panel.add(ScrollPaneFactory.createScrollPane(myList), BorderLayout.CENTER);
     add(panel, BorderLayout.CEN