Merge remote-tracking branch 'origin/master' into numpy-array-view
authorAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Thu, 11 Sep 2014 12:07:36 +0000 (16:07 +0400)
committerAlexander Marchuk <Alexander.Marchuk@jetbrains.com>
Thu, 11 Sep 2014 12:07:36 +0000 (16:07 +0400)
Conflicts:
python/helpers/pydev/pydevd_vars.py
python/pydevSrc/com/jetbrains/python/debugger/PyDebugValue.java

845 files changed:
.gitignore
.idea/libraries/asm_tools.xml [new file with mode: 0644]
.idea/libraries/bouncy_castle.xml [new file with mode: 0644]
.idea/libraries/builder_model.xml [new file with mode: 0644]
.idea/libraries/commons_compress.xml [new file with mode: 0644]
.idea/libraries/easymock_tools.xml [new file with mode: 0644]
.idea/libraries/freemarker_2_3_20.xml [new file with mode: 0644]
.idea/libraries/guava_tools.xml [new file with mode: 0644]
.idea/libraries/javawriter.xml [new file with mode: 0644]
.idea/libraries/kxml2.xml [new file with mode: 0644]
.idea/libraries/lombok_ast.xml [new file with mode: 0644]
.idea/libraries/mockito.xml [new file with mode: 0644]
.idea/modules.xml
.idea/vcs.xml
bin/scripts/unix/idea.sh
build/conf/mac/Contents/Info.plist
build/conf/mac/Contents/MacOS/idea
build/scripts/layouts.gant
build/scripts/utils.gant
getPlugins.bat [new file with mode: 0644]
getPlugins.sh [new file with mode: 0755]
images/src/org/intellij/images/editor/impl/ImageEditorUI.java
java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.form
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactType.java
java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java
java/debugger/impl/src/com/intellij/debugger/DebugUIEnvironment.java
java/debugger/impl/src/com/intellij/debugger/DefaultDebugUIEnvironment.java
java/debugger/impl/src/com/intellij/debugger/actions/JavaMarkObjectActionHandler.java
java/debugger/impl/src/com/intellij/debugger/actions/PopFrameAction.java
java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessEvents.java
java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
java/debugger/impl/src/com/intellij/debugger/engine/JVMNameUtil.java
java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluationContextImpl.java
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/EvaluatorBuilderImpl.java
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MethodEvaluator.java
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/NewClassInstanceEvaluator.java
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/UnsupportedExpressionException.java [moved from python/src/com/jetbrains/python/hierarchy/call/PyStaticCallDataManager.java with 61% similarity]
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ArgumentValueDescriptorImpl.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/CompilingEvaluator.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/EvaluationDescriptor.java
java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcess.java
java/debugger/openapi/src/com/intellij/debugger/engine/JSR45PositionManager.java
java/execution/impl/src/com/intellij/execution/actions/JavaRerunFailedTestsAction.java
java/execution/impl/src/com/intellij/execution/application/ApplicationConfiguration.java
java/execution/impl/src/com/intellij/execution/application/BaseJavaApplicationCommandLineState.java [new file with mode: 0644]
java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java
java/execution/impl/src/com/intellij/execution/jar/JarApplicationCommandLineState.java [new file with mode: 0644]
java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfigurable.form [new file with mode: 0644]
java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfigurable.java [new file with mode: 0644]
java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfiguration.java [new file with mode: 0644]
java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfigurationProducer.java [new file with mode: 0644]
java/execution/impl/src/com/intellij/execution/jar/JarApplicationConfigurationType.java [new file with mode: 0644]
java/execution/impl/src/com/intellij/execution/jar/JarApplicationDebuggerRunner.java [new file with mode: 0644]
java/execution/impl/src/com/intellij/execution/junit/InheritorChooser.java
java/execution/impl/src/com/intellij/execution/runners/ProcessProxyFactoryImpl.java
java/execution/impl/src/com/intellij/execution/util/JavaParametersUtil.java
java/execution/openapi/src/com/intellij/execution/configurations/CommandLineBuilder.java
java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.form
java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java
java/idea-ui/src/com/intellij/ide/palette/impl/PaletteManager.java [deleted file]
java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.form
java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaResourceRootEditHandler.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/DefaultLibraryRootsComponentDescriptor.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java
java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java
java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
java/java-impl/src/com/intellij/ide/projectView/impl/ClassesTreeStructureProvider.java
java/java-impl/src/com/intellij/ide/util/scopeChooser/ClassHierarchyScopeDescriptor.java
java/java-impl/src/com/intellij/jarFinder/FindJarFix.java
java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractLightMethodObjectHandler.java
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectHandler.java
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java
java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java
java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA114797.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/constraints/IntersectionTypeStrictSubtypingConstraint.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/FreshVariablesCreatedDuringResolveDependingOnAlreadyResolvedVariables.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/IDEA102800.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/javadocIG/clickableFieldReference.html [new file with mode: 0644]
java/java-tests/testData/codeInsight/javadocIG/clickableFieldReference.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/javadocIG/enumConstantOrdinal.html
java/java-tests/testData/codeInsight/javadocIG/enumConstantOrdinal_quick.html [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethodObject4Debugger/AnonymousClassParams.java [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethodObject4Debugger/InnerClass.java [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethodObject4Debugger/InvokeReturnType.java [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethodObject4Debugger/ResultExpr.java [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethodObject4Debugger/ResultStatements.java [new file with mode: 0644]
java/java-tests/testData/refactoring/extractMethodObject4Debugger/SimpleGeneration.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/ConstraintsInferenceMiscTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/OverloadResolutionTest.java
java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
java/java-tests/testSrc/com/intellij/codeInsight/template/LiveTemplateTest.groovy
java/java-tests/testSrc/com/intellij/execution/configurations/JavaCommandLineTest.java
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObject4DebuggerTest.java
java/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/deployment/debug/JavaDebuggerLauncherImpl.java
java/structuralsearch-java/src/com/intellij/structuralsearch/JavaReplaceHandler.java
java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java
java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ChangeClassParametersIntention.java
jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/JarsBuilder.java
lib/src/ecjsrc-4.3.2.jar [deleted file]
native/MacLauncher/Launcher.m
platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/FilePatternPackageSet.java
platform/analysis-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java
platform/analysis-impl/src/com/intellij/codeInspection/ex/InspectionProfileImpl.java
platform/analysis-impl/src/com/intellij/codeInspection/ex/ToolsImpl.java
platform/core-api/src/com/intellij/lang/folding/CustomFoldingBuilder.java
platform/core-impl/src/com/intellij/psi/impl/source/tree/CompositeElement.java
platform/core-impl/src/com/intellij/refactoring/rename/FragmentaryPsiReference.java [new file with mode: 0644]
platform/dvcs-api/src/com/intellij/dvcs/push/PushSupport.java
platform/dvcs-api/src/com/intellij/dvcs/push/PushTargetPanel.java [moved from platform/dvcs-api/src/com/intellij/dvcs/push/TargetEditor.java with 79% similarity]
platform/dvcs-api/src/com/intellij/dvcs/repo/Repository.java
platform/dvcs-impl/src/com/intellij/dvcs/DvcsCommitAdditionalComponent.java
platform/dvcs-impl/src/com/intellij/dvcs/push/PushController.java
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryNode.java
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/RepositoryWithBranchPanel.java
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/SingleRepositoryNode.java
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/VcsBranchEditorListener.java
platform/dvcs-impl/src/com/intellij/dvcs/repo/RepositoryUtil.java
platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java
platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/DefaultExternalSourceDirectorySet.java
platform/external-system-api/src/com/intellij/openapi/externalSystem/model/ExternalSourceDirectorySet.java
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/LibraryDataService.java
platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/AbstractExternalSystemTest.groovy
platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/test/ExternalSystemImportingTestCase.java
platform/indexing-api/src/com/intellij/lang/cacheBuilder/DefaultWordsScanner.java
platform/indexing-api/src/com/intellij/lang/cacheBuilder/SimpleWordsScanner.java
platform/indexing-api/src/com/intellij/lang/cacheBuilder/VersionedWordsScanner.java [new file with mode: 0644]
platform/indexing-api/src/com/intellij/psi/search/searches/DefinitionsScopedSearch.java
platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/FileTypeIdIndexer.java
platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndex.java
platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/id/IdTableBuilding.java
platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/todo/LexerBasedTodoIndexer.java
platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/todo/VersionedTodoIndexer.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/diagnostic/logging/AdditionalTabComponent.java
platform/lang-api/src/com/intellij/execution/configurations/AdditionalTabComponentManager.java
platform/lang-api/src/com/intellij/execution/configurations/LogFileOptions.java
platform/lang-api/src/com/intellij/execution/configurations/ModuleRunProfile.java
platform/lang-api/src/com/intellij/execution/configurations/RunConfigurationBase.java
platform/lang-api/src/com/intellij/execution/configurations/SearchScopeProvider.java
platform/lang-api/src/com/intellij/execution/configurations/SearchScopeProvidingRunProfile.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/execution/configurations/SimpleJavaParameters.java
platform/lang-api/src/com/intellij/execution/runners/ExecutionUtil.java
platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java
platform/lang-api/src/com/intellij/openapi/projectRoots/JdkUtil.java
platform/lang-api/src/com/intellij/psi/codeStyle/CommonCodeStyleSettings.java
platform/lang-api/src/com/intellij/psi/codeStyle/autodetect/IndentOptionsDetector.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/codeStyle/autodetect/IndentUsageInfo.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/codeStyle/autodetect/IndentUsageStatistics.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/codeStyle/autodetect/IndentUsageStatisticsImpl.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/codeStyle/autodetect/LineIndentInfo.java [new file with mode: 0644]
platform/lang-api/src/com/intellij/psi/codeStyle/autodetect/LineIndentInfoBuilder.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java
platform/lang-impl/src/com/intellij/application/options/ModuleListCellRenderer.java
platform/lang-impl/src/com/intellij/application/options/ModulesComboBox.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AbstractArrangementRuleAction.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AbstractMoveArrangementRuleAction.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/EditArrangementRuleAction.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/RemoveArrangementRuleAction.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingRulesControl.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java
platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.form
platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java
platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java
platform/lang-impl/src/com/intellij/codeInsight/documentation/QuickDocUtil.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateState.java
platform/lang-impl/src/com/intellij/codeInspection/actions/GotoInspectionModel.java
platform/lang-impl/src/com/intellij/codeInspection/actions/InspectionListCellRenderer.java
platform/lang-impl/src/com/intellij/codeInspection/actions/ViewOfflineResultsAction.java
platform/lang-impl/src/com/intellij/diagnostic/logging/DebuggerLogConsoleManager.java
platform/lang-impl/src/com/intellij/diagnostic/logging/LogConfigurationPanel.java
platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java
platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleImpl.java
platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleManager.java
platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleManagerBase.java
platform/lang-impl/src/com/intellij/diagnostic/logging/LogFilesManager.java
platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java
platform/lang-impl/src/com/intellij/execution/actions/StopAction.java
platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
platform/lang-impl/src/com/intellij/execution/runners/RunTab.java
platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreview.java
platform/lang-impl/src/com/intellij/find/impl/livePreview/LivePreviewController.java
platform/lang-impl/src/com/intellij/ide/actions/ExternalJavaDocAction.java
platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseCallHierarchyAction.java
platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseMethodHierarchyAction.java
platform/lang-impl/src/com/intellij/ide/hierarchy/actions/BrowseTypeHierarchyAction.java
platform/lang-impl/src/com/intellij/lang/customFolding/CustomFoldingRegionsPopup.java [new file with mode: 0644]
platform/lang-impl/src/com/intellij/lang/customFolding/GotoCustomRegionAction.java
platform/lang-impl/src/com/intellij/lang/customFolding/GotoCustomRegionDialog.form [deleted file]
platform/lang-impl/src/com/intellij/lang/customFolding/GotoCustomRegionDialog.java [deleted file]
platform/lang-impl/src/com/intellij/openapi/components/impl/stores/ModuleStoreImpl.java
platform/lang-impl/src/com/intellij/openapi/roots/libraries/ui/impl/RootDetectionUtil.java
platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ModulesAlphaComparator.java
platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanel.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/LevelChooser.java [deleted file]
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/InspectionsConfigTreeTable.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/table/ScopesAndSeveritiesTable.java
platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/IdIndexImpl.java
platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/PackageSetFactoryImpl.java
platform/lang-impl/src/com/intellij/refactoring/actions/RefactoringQuickListPopupAction.java
platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java
platform/lang-impl/src/com/intellij/tools/BaseExternalToolsGroup.java
platform/lang-impl/src/com/intellij/util/download/impl/FileDownloaderImpl.java
platform/lang-impl/src/com/intellij/util/indexing/ValueContainerImpl.java
platform/lang-impl/src/com/intellij/util/indexing/containers/ChangeBufferingList.java
platform/platform-api/src/com/intellij/execution/util/ExecUtil.java
platform/platform-api/src/com/intellij/ide/BrowserUtil.java
platform/platform-api/src/com/intellij/ide/actions/ContextHelpAction.java
platform/platform-api/src/com/intellij/notification/Notification.java
platform/platform-api/src/com/intellij/notification/NotificationListener.java
platform/platform-api/src/com/intellij/openapi/actionSystem/ActionPlaces.java
platform/platform-api/src/com/intellij/openapi/actionSystem/ex/CheckboxAction.java
platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
platform/platform-api/src/com/intellij/openapi/application/ApplicationStarterEx.java
platform/platform-api/src/com/intellij/openapi/diagnostic/ErrorReportSubmitter.java
platform/platform-api/src/com/intellij/openapi/diagnostic/SubmittedReportInfo.java
platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
platform/platform-api/src/com/intellij/openapi/vfs/newvfs/FileAttribute.java
platform/platform-api/src/com/intellij/ui/CollectionListModel.java
platform/platform-api/src/com/intellij/ui/SimpleColoredText.java
platform/platform-api/src/com/intellij/ui/table/JBTable.java
platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java
platform/platform-api/src/com/intellij/util/net/ssl/CertificateUtil.java
platform/platform-api/src/com/intellij/util/ui/AsyncProcessIcon.java
platform/platform-impl/src/com/intellij/designer/DesignerEditorPanelFacade.java [moved from python/src/com/jetbrains/python/hierarchy/call/PyCallDataManager.java with 61% similarity]
platform/platform-impl/src/com/intellij/designer/LightFillLayout.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/designer/LightToolWindow.java [moved from plugins/ui-designer-core/src/com/intellij/designer/LightToolWindow.java with 94% similarity]
platform/platform-impl/src/com/intellij/designer/LightToolWindowContent.java [moved from plugins/ui-designer-core/src/com/intellij/designer/LightToolWindowContent.java with 100% similarity]
platform/platform-impl/src/com/intellij/designer/LightToolWindowManager.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/designer/ToggleEditorModeAction.java [moved from plugins/ui-designer-core/src/com/intellij/designer/ToggleEditorModeAction.java with 69% similarity]
platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.java
platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java
platform/platform-impl/src/com/intellij/errorreport/ErrorReportSender.java [deleted file]
platform/platform-impl/src/com/intellij/errorreport/bean/ErrorBean.java
platform/platform-impl/src/com/intellij/errorreport/itn/ITNProxy.java
platform/platform-impl/src/com/intellij/ide/CommandLineProcessor.java
platform/platform-impl/src/com/intellij/ide/actions/AboutAction.java
platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java
platform/platform-impl/src/com/intellij/ide/actions/CreateLauncherScriptAction.java
platform/platform-impl/src/com/intellij/ide/actions/ExitAction.java
platform/platform-impl/src/com/intellij/ide/actions/OccurenceNavigatorActionBase.java
platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsAction.java
platform/platform-impl/src/com/intellij/ide/actions/ShowSettingsUtilImpl.java
platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java
platform/platform-impl/src/com/intellij/ide/dnd/aware/DnDAwareTree.java
platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf.properties
platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsConfigurablePanel.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/ComputableActionGroup.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/application/PluginPathManager.java
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/BaseFileConfigurableStoreImpl.java
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DefaultProjectStoreImpl.java
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/FileBasedStorage.java
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/ProjectStoreImpl.java
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/XmlElementStorage.java
platform/platform-impl/src/com/intellij/openapi/diff/ApplicationStarterBase.java
platform/platform-impl/src/com/intellij/openapi/diff/DiffApplication.java
platform/platform-impl/src/com/intellij/openapi/diff/MergeApplication.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/LazyRangeMarkerFactoryImpl.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/SelectionModelImpl.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorsSplitters.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/PreviewPanel.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
platform/platform-impl/src/com/intellij/openapi/options/SchemesManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableVisitor.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java
platform/platform-impl/src/com/intellij/openapi/options/ex/MixedConfigurableGroup.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/options/ex/NodeConfigurable.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/options/ex/SortedConfigurableGroup.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/openapi/options/newEditor/IdeSettingsDialog.java
platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java
platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java
platform/platform-impl/src/com/intellij/openapi/options/newEditor/SettingsTreeView.java
platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectImpl.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/CheckForUpdateAction.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/NoUpdatesPanel.form
platform/platform-impl/src/com/intellij/openapi/vfs/ex/dummy/DummyCachingFileSystem.java
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java
platform/platform-impl/src/com/intellij/ui/TableExpandableItemsHandler.java
platform/platform-impl/src/com/intellij/ui/content/impl/ContentManagerImpl.java
platform/platform-impl/src/com/intellij/ui/win/RecentProjectApplication.java
platform/platform-impl/src/com/intellij/util/IJSwingUtilities.java
platform/platform-resources-en/src/messages/ApplicationBundle.properties
platform/platform-resources-en/src/messages/ExecutionBundle.properties
platform/platform-resources-en/src/messages/FeatureStatisticsBundle.properties
platform/platform-resources-en/src/messages/IdeBundle.properties
platform/platform-resources-en/src/messages/OptionsBundle.properties
platform/platform-resources-en/src/messages/RefactoringBundle.properties
platform/platform-resources/src/META-INF/VcsExtensions.xml
platform/platform-resources/src/META-INF/XmlPlugin.xml
platform/platform-resources/src/idea/LangActions.xml
platform/platform-resources/src/launcher.py
platform/platform-tests/testData/codeStyle/autodetect/manyComments.java [new file with mode: 0644]
platform/platform-tests/testData/codeStyle/autodetect/manyZeroRelativeIndent.java [new file with mode: 0644]
platform/platform-tests/testData/codeStyle/autodetect/simpleIndent.java [new file with mode: 0644]
platform/platform-tests/testSrc/com/intellij/openapi/components/impl/XmlElementStorageTest.java
platform/platform-tests/testSrc/com/intellij/psi/autodetect/IndentAutoDetectionTest.java [new file with mode: 0644]
platform/projectModel-impl/src/com/intellij/core/CoreModuleManager.java
platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java
platform/projectModel-impl/src/com/intellij/openapi/components/TrackingPathMacroSubstitutor.java
platform/projectModel-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java
platform/projectModel-impl/src/com/intellij/openapi/components/impl/ModulePathMacroManager.java
platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/StorageData.java
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/JarDirectories.java
platform/projectModel-impl/src/messages/ProjectBundle.properties
platform/remote-servers/api/remote-servers-api.iml
platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMap.java
platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMapDecoder.java
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/BasicDebuggerViewSupport.java
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/LazyVariablesGroup.java
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/MemberFilter.java
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/VariableView.java
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/Variables.java
platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/CallFrameView.java
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/states/TestComparisionFailedState.java
platform/structuralsearch/testSource/com/intellij/structuralsearch/StructuralReplaceTest.java
platform/testFramework/src/com/intellij/mock/MockVirtualFileSystem.java
platform/testFramework/src/com/intellij/testFramework/FlyIdeaTestCase.java
platform/testFramework/src/com/intellij/testFramework/UsefulTestCase.java
platform/testFramework/src/com/intellij/testFramework/fixtures/IdeaTestFixtureFactory.java
platform/testFramework/src/com/intellij/testFramework/fixtures/TestFixtureBuilder.java
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyTestFixtureBuilderImpl.java
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/IdeaTestFixtureFactoryImpl.java
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/LightTestFixtureBuilderImpl.java
platform/testRunner/src/com/intellij/execution/testframework/AbstractTestProxy.java
platform/testRunner/src/com/intellij/execution/testframework/Filter.java
platform/testRunner/src/com/intellij/execution/testframework/TestTreeView.java
platform/testRunner/src/com/intellij/execution/testframework/TestTreeViewAction.java [new file with mode: 0644]
platform/testRunner/src/com/intellij/execution/testframework/TestTreeViewActionsPromoter.java [new file with mode: 0644]
platform/testRunner/src/com/intellij/execution/testframework/TestsUIUtil.java
platform/testRunner/src/com/intellij/execution/testframework/actions/AbstractRerunFailedTestsAction.java
platform/testRunner/src/com/intellij/execution/testframework/actions/RerunFailedTestsAction.java [new file with mode: 0644]
platform/testRunner/src/com/intellij/execution/testframework/actions/ViewAssertEqualsDiffAction.java
platform/testRunner/src/com/intellij/execution/testframework/stacktrace/DiffHyperlink.java
platform/testRunner/src/com/intellij/execution/testframework/ui/TestResultsPanel.java
platform/usageView/src/com/intellij/usages/ChunkExtractor.java
platform/util-rt/src/com/intellij/util/containers/ContainerUtilRt.java
platform/util-rt/src/com/intellij/util/containers/Stack.java
platform/util/src/com/intellij/openapi/application/PathManager.java
platform/util/src/com/intellij/openapi/util/text/StringUtil.java
platform/util/src/com/intellij/util/ReflectionUtil.java
platform/util/src/com/intellij/util/containers/ContainerUtil.java
platform/util/src/com/intellij/util/containers/FactoryMap.java
platform/util/src/com/intellij/util/io/AppendableStorageBackedByResizableMappedFile.java
platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java
platform/util/src/com/intellij/util/ui/JBSwingUtilities.java [new file with mode: 0644]
platform/util/src/com/intellij/util/ui/UIUtil.java
platform/util/testSrc/com/intellij/util/text/StringUtilTest.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
platform/vcs-impl/src/com/intellij/openapi/vcs/ex/LineStatusTracker.java
platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RollbackLineStatusAction.java
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogProvider.java
platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogProviderRequirementsEx.java
platform/vcs-log/api/vcs-log-api.iml
platform/vcs-log/impl/src/com/intellij/vcs/log/data/DataPack.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/EmptyDataPack.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/RefsModel.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogMultiRepoJoiner.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogRefresherImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsLogSorter.java
platform/vcs-log/impl/src/com/intellij/vcs/log/data/VcsUserRegistryImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/LogDataImpl.java [new file with mode: 0644]
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/RequirementsImpl.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsStructureChooser.java
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/StructureFilterPopupComponent.java
platform/vcs-log/impl/test/com/intellij/vcs/log/data/VcsLogRefresherTest.java
platform/vcs-log/impl/test/com/intellij/vcs/log/impl/TestVcsLogProvider.java
platform/xdebugger-api/src/com/intellij/xdebugger/XDebugProcess.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerManagerImpl.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XMarkObjectActionHandler.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHint.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/WatchInplaceEditor.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebugView.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebugViewSessionListener.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebuggerFramesList.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XVariablesViewBase.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XWatchesViewImpl.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchesRootNode.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueContainerNode.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/META-INF/InspectionGadgets.xml
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ResultSetIndexZeroInspection.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/ClassWithOnlyPrivateConstructorsInspectionBase.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/DoubleBraceInitializationInspection.java [new file with mode: 0644]
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/memory/AnonymousInnerClassMayBeStaticInspectionBase.java [moved from plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/j2me/AnonymousInnerClassMayBeStaticInspectionBase.java with 68% similarity]
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/memory/InnerClassMayBeStaticInspection.java [moved from plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/InnerClassMayBeStaticInspection.java with 98% similarity]
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/memory/InnerClassReferenceVisitor.java [moved from plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/InnerClassReferenceVisitor.java with 96% similarity]
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/CStyleArrayDeclarationInspection.java
plugins/InspectionGadgets/src/com/siyeh/ig/memory/AnonymousInnerClassMayBeStaticInspection.java [moved from plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AnonymousInnerClassMayBeStaticInspection.java with 92% similarity]
plugins/InspectionGadgets/src/inspectionDescriptions/AmbiguousFieldAccess.html
plugins/InspectionGadgets/src/inspectionDescriptions/AmbiguousMethodCall.html
plugins/InspectionGadgets/src/inspectionDescriptions/AnonymousInnerClassMayBeStatic.html
plugins/InspectionGadgets/src/inspectionDescriptions/CStyleArrayDeclaration.html
plugins/InspectionGadgets/src/inspectionDescriptions/DoubleBraceInitialization.html [new file with mode: 0644]
plugins/InspectionGadgets/src/inspectionDescriptions/InnerClassMayBeStatic.html
plugins/InspectionGadgets/src/inspectionDescriptions/PropertyValueSetToItself.html
plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/Argument.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/Field.after.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/Field.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/LocalVariable.after.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/initialization/double_brace_initialization/LocalVariable.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/memory/inner_class_static/Simple.after.java [moved from plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/inner_class_static/Simple.after.java with 81% similarity]
plugins/InspectionGadgets/test/com/siyeh/igfixes/memory/inner_class_static/Simple.java [moved from plugins/InspectionGadgets/test/com/siyeh/igfixes/performance/inner_class_static/Simple.java with 82% similarity]
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/FieldWithWhitespace.after.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/FieldWithWhitespace.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/SimpleMethod.after.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/cstyle_array_declaration/SimpleMethod.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/ResultSetIndexZeroInspection.java [deleted file]
plugins/InspectionGadgets/test/com/siyeh/igtest/bugs/result_set_index_zero/ResultSetIndexZero.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igtest/initialization/double_brace_initialization/DoubleBraceInitialization.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igtest/memory/anonymous_inner_class_may_be_static/AnonymousInnerClassMayBeStatic.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igtest/memory/inner_class_may_be_static/InnerClassMayBeStatic.java [moved from plugins/InspectionGadgets/test/com/siyeh/igtest/performance/inner_class_may_be_static/InnerClassMayBeStaticInspection.java with 66% similarity]
plugins/InspectionGadgets/test/com/siyeh/igtest/performance/inner_class_may_be_static/expected.xml [deleted file]
plugins/InspectionGadgets/test/com/siyeh/igtest/style/CStyleArrayDeclarationInspection.java [deleted file]
plugins/InspectionGadgets/test/com/siyeh/igtest/style/cstyle_array_declaration/CStyleArrayDeclaration.java [new file with mode: 0644]
plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/ambiguous/AmbiguousMethodCall.java
plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/ambiguous/expected.xml [deleted file]
plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/ambiguous_field_access/AmbiguousFieldAccess.java
plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/ambiguous_field_access/expected.xml [deleted file]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/IGQuickFixesTestCase.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/bugs/ResultSetIndexZeroInspectionTest.java [new file with mode: 0644]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/classlayout/ClassWithOnlyPrivateConstructorsInspectionTest.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/initialization/DoubleBraceInitializationFixTest.java [new file with mode: 0644]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/memory/InnerClassMayBeStaticFixTest.java [moved from plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/performance/InnerClassMayBeStaticFixTest.java with 86% similarity]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/style/CStyleArrayDeclarationFixTest.java [new file with mode: 0644]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/initialization/DoubleBraceInitializationInspectionTest.java [new file with mode: 0644]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/memory/AnonymousInnerClassMayBeStaticInspectionTest.java [new file with mode: 0644]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/memory/InnerClassMayBeStaticInspectionTest.java [new file with mode: 0644]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/performance/InnerClassMayBeStaticInspectionTest.java [deleted file]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/style/CStyleArrayDeclarationInspectionTest.java [new file with mode: 0644]
plugins/InspectionGadgets/testsrc/com/siyeh/ig/visibility/AmbiguousFieldAccessInspectionTest.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/visibility/AmbiguousMethodCallInspectionTest.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/decls/SimplifyVariableIntention.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/initialization/SplitDeclarationAndInitializationIntention.java
plugins/IntentionPowerPak/test/com/siyeh/ipp/decls/simplify_variable/FieldWithWhitespace.java [new file with mode: 0644]
plugins/IntentionPowerPak/test/com/siyeh/ipp/decls/simplify_variable/FieldWithWhitespace_after.java [new file with mode: 0644]
plugins/IntentionPowerPak/test/com/siyeh/ipp/initialization/Array.java [new file with mode: 0644]
plugins/IntentionPowerPak/test/com/siyeh/ipp/initialization/Array_after.java [new file with mode: 0644]
plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/decls/SimplifyVariableIntentionTest.java [new file with mode: 0644]
plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/initialization/SplitDeclarationAndInitializationIntentionTest.java
plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties
plugins/devkit/src/dom/impl/PluginXmlDomFileDescription.java
plugins/devkit/src/inspections/PluginXmlDomInspection.java
plugins/devkit/src/navigation/DescriptionTypeRelatedItemLineMarkerProvider.java
plugins/devkit/src/navigation/DevkitRelatedLineMarkerProviderBase.java [new file with mode: 0644]
plugins/devkit/src/navigation/ExtensionPointDeclarationRelatedItemLineMarkerProvider.java
plugins/devkit/src/run/PluginRunConfigurationEditor.java
plugins/devkit/src/testAssistant/NavigateToTestDataAction.java
plugins/devkit/src/testAssistant/TestDataLineMarkerProvider.java
plugins/devkit/src/util/PsiUtil.java
plugins/devkit/testData/codeInsight/ExtensionsHighlighting.xml
plugins/devkit/testData/codeInsight/deprecatedAttributes.xml
plugins/devkit/testData/codeInsight/deprecatedExtensionAttribute.xml
plugins/devkit/testSources/navigation/DescriptionTypeRelatedItemLineMarkerProviderTest.java
plugins/devkit/testSources/navigation/ExtensionPointDeclarationRelatedItemLineMarkerProviderTest.java
plugins/git4idea/git4idea.iml
plugins/git4idea/src/git4idea/GitUtil.java
plugins/git4idea/src/git4idea/branch/GitBranchUtil.java
plugins/git4idea/src/git4idea/branch/GitBranchWorker.java
plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.java
plugins/git4idea/src/git4idea/config/GitVcsPanel.form
plugins/git4idea/src/git4idea/config/GitVcsPanel.java
plugins/git4idea/src/git4idea/config/GitVcsSettings.java
plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
plugins/git4idea/src/git4idea/history/GitLogRecord.java
plugins/git4idea/src/git4idea/log/GitLogProvider.java
plugins/git4idea/src/git4idea/log/GitRefManager.java
plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java
plugins/git4idea/src/git4idea/repo/GitRepositoryUpdater.java
plugins/git4idea/src/git4idea/reset/GitResetAction.java
plugins/git4idea/src/git4idea/validators/GitNewBranchNameValidator.java
plugins/git4idea/tests/git4idea/log/GitLogProviderTest.java
plugins/git4idea/tests/git4idea/log/RefParser.java [moved from plugins/git4idea/src/git4idea/log/RefParser.java with 72% similarity]
plugins/git4idea/tests/git4idea/log/RefParserTest.java [deleted file]
plugins/github/src/org/jetbrains/plugins/github/api/GithubUser.java
plugins/github/src/org/jetbrains/plugins/github/api/GithubUserDetailed.java
plugins/github/src/org/jetbrains/plugins/github/api/GithubUserRaw.java
plugins/github/src/org/jetbrains/plugins/github/tasks/GithubComment.java
plugins/github/src/org/jetbrains/plugins/github/tasks/GithubRepository.java
plugins/gradle/resources/i18n/GradleBundle.properties
plugins/gradle/src/META-INF/plugin.xml
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/GradleInstallationManager.java
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleFoldersImportingTest.java
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleImportingTestCase.java
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.properties
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/GroovyClassDescriptor.java
plugins/groovy/src/META-INF/plugin.xml
plugins/groovy/src/org/jetbrains/plugins/groovy/ivy/AbstractAttachSourceProvider.java
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcActionBase.java
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyDebuggerTest.groovy
plugins/hg4idea/src/org/zmlx/hg4idea/log/HgHistoryUtil.java
plugins/hg4idea/src/org/zmlx/hg4idea/log/HgLogProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/push/HgPushSupport.java
plugins/hg4idea/src/org/zmlx/hg4idea/push/HgPushTargetPanel.java [moved from plugins/hg4idea/src/org/zmlx/hg4idea/push/HgTargetEditor.java with 70% similarity]
plugins/java-decompiler/engine/build.xml
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/ClassWriter.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/Fernflower.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/decompiler/BaseDecompiler.java [moved from plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/decompiler/IdeDecompiler.java with 69% similarity]
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/decompiler/PrintStreamLogger.java [new file with mode: 0644]
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/decompiler/WebDecompiler.java [deleted file]
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/decompiler/helper/PrintStreamLogger.java [deleted file]
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/extern/IResultSaver.java [moved from plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/extern/IDecompilatSaver.java with 62% similarity]
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorThread.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/StructClass.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/StructContext.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/StructMethod.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationTypeAttribute.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
plugins/java-decompiler/engine/test/org/jetbrains/java/decompiler/BulkDecompilationTest.java [new file with mode: 0644]
plugins/java-decompiler/engine/test/org/jetbrains/java/decompiler/DecompilerTestFixture.java [new file with mode: 0644]
plugins/java-decompiler/engine/test/org/jetbrains/java/decompiler/SingleClassesTest.java
plugins/java-decompiler/engine/testData/bulk.jar [new file with mode: 0644]
plugins/java-decompiler/engine/testData/bulk/META-INF/MANIFEST.MF [new file with mode: 0644]
plugins/java-decompiler/engine/testData/bulk/pkg/Main.java [new file with mode: 0644]
plugins/java-decompiler/engine/testData/bulk/pkg/res/Loader.java [new file with mode: 0644]
plugins/java-decompiler/engine/testData/bulk/pkg/res/resource.txt [new file with mode: 0644]
plugins/java-decompiler/engine/testData/classes/pkg/TestCodeConstructs.class
plugins/java-decompiler/engine/testData/classes/pkg/TestDebugSymbols.class [new file with mode: 0644]
plugins/java-decompiler/engine/testData/results/TestClassFields.dec
plugins/java-decompiler/engine/testData/results/TestClassLambda.dec
plugins/java-decompiler/engine/testData/results/TestClassLoop.dec
plugins/java-decompiler/engine/testData/results/TestClassSwitch.dec
plugins/java-decompiler/engine/testData/results/TestClassTypes.dec
plugins/java-decompiler/engine/testData/results/TestClassVar.dec
plugins/java-decompiler/engine/testData/results/TestCodeConstructs.dec
plugins/java-decompiler/engine/testData/results/TestConstants.dec
plugins/java-decompiler/engine/testData/results/TestDebugSymbols.dec [new file with mode: 0644]
plugins/java-decompiler/engine/testData/results/TestDeprecations.dec
plugins/java-decompiler/engine/testData/results/TestEnum.dec
plugins/java-decompiler/engine/testData/results/TestExtendsList.dec
plugins/java-decompiler/engine/testData/results/TestMethodParameters.dec
plugins/java-decompiler/engine/testData/src/pkg/TestCodeConstructs.java
plugins/java-decompiler/engine/testData/src/pkg/TestDebugSymbols.java [new file with mode: 0644]
plugins/java-decompiler/src/META-INF/plugin.xml
plugins/java-decompiler/src/org/jetbrains/java/decompiler/IdeaDecompiler.java
plugins/java-decompiler/src/org/jetbrains/java/decompiler/IdeaLogger.java
plugins/java-i18n/java-i18n.iml
plugins/junit/src/com/intellij/execution/ConfigurationUtil.java
plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
plugins/junit/src/com/intellij/execution/junit/TestCategory.java
plugins/junit/src/com/intellij/execution/junit/TestClass.java
plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
plugins/junit/src/com/intellij/execution/junit/TestMethod.java
plugins/junit/src/com/intellij/execution/junit/TestMethods.java
plugins/junit/src/com/intellij/execution/junit/TestObject.java
plugins/junit/src/com/intellij/execution/junit/TestPackage.java
plugins/junit/src/com/intellij/execution/junit/TestsPattern.java
plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
plugins/junit/src/com/intellij/execution/junit2/states/ComparisonFailureState.java
plugins/junit/src/com/intellij/execution/junit2/ui/ConsolePanel.java
plugins/junit/src/com/intellij/execution/junit2/ui/JUnitStatusLine.java
plugins/junit/src/com/intellij/execution/junit2/ui/JUnitTreeConsoleView.java
plugins/junit/src/com/intellij/execution/junit2/ui/actions/RerunFailedTestsAction.java
plugins/junit_rt/src/com/intellij/rt/execution/junit/JUnitForkedStarter.java
plugins/junit_rt/src/com/intellij/rt/execution/junit/JUnitStarter.java
plugins/maven/src/main/resources/META-INF/plugin.xml
plugins/properties/properties-psi-impl/src/com/intellij/lang/properties/PropertiesImplUtil.java
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/SwitchTaskCombo.java
plugins/terminal/src/org/jetbrains/plugins/terminal/JBTerminalSystemSettingsProvider.java
plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
plugins/testng/src/META-INF/plugin.xml
plugins/testng/src/com/theoryinpractice/testng/TestNGReferenceContributor.java
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
plugins/testng/src/com/theoryinpractice/testng/model/TestProxy.java
plugins/testng/src/com/theoryinpractice/testng/ui/actions/RerunFailedTestsAction.java
plugins/ui-designer-core/src/com/intellij/designer/AbstractToolWindowManager.java
plugins/ui-designer-core/src/com/intellij/designer/DesignerToolWindowManager.java
plugins/ui-designer-core/src/com/intellij/designer/PaletteToolWindowContent.java
plugins/ui-designer-core/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
plugins/ui-designer-core/src/com/intellij/designer/palette/PalettePanel.java
plugins/ui-designer-core/src/com/intellij/designer/palette/PaletteToolWindowManager.java
plugins/ui-designer/src/META-INF/plugin.xml
plugins/ui-designer/src/com/intellij/ide/palette/PaletteDragEventListener.java [moved from java/openapi/src/com/intellij/ide/palette/PaletteDragEventListener.java with 100% similarity]
plugins/ui-designer/src/com/intellij/ide/palette/PaletteGroup.java [moved from java/openapi/src/com/intellij/ide/palette/PaletteGroup.java with 100% similarity]
plugins/ui-designer/src/com/intellij/ide/palette/PaletteItem.java [moved from java/openapi/src/com/intellij/ide/palette/PaletteItem.java with 100% similarity]
plugins/ui-designer/src/com/intellij/ide/palette/PaletteItemProvider.java [moved from java/openapi/src/com/intellij/ide/palette/PaletteItemProvider.java with 100% similarity]
plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteComponentList.java [moved from java/idea-ui/src/com/intellij/ide/palette/impl/PaletteComponentList.java with 97% similarity]
plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteContentWindow.java [moved from java/idea-ui/src/com/intellij/ide/palette/impl/PaletteContentWindow.java with 100% similarity]
plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java [moved from java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java with 100% similarity]
plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteToolWindowManager.java [new file with mode: 0644]
plugins/ui-designer/src/com/intellij/ide/palette/impl/PaletteWindow.java [moved from java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java with 84% similarity]
plugins/ui-designer/src/com/intellij/uiDesigner/AbstractToolWindowManager.java [new file with mode: 0644]
plugins/ui-designer/src/com/intellij/uiDesigner/FormEditingUtil.java
plugins/ui-designer/src/com/intellij/uiDesigner/FormHighlightingPass.java
plugins/ui-designer/src/com/intellij/uiDesigner/actions/ExpandSelectionAction.java
plugins/ui-designer/src/com/intellij/uiDesigner/actions/ResetValueAction.java
plugins/ui-designer/src/com/intellij/uiDesigner/actions/SelectAllComponentsAction.java
plugins/ui-designer/src/com/intellij/uiDesigner/actions/ShrinkSelectionAction.java
plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/ComponentTreeBuilder.java
plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/DesignDropTargetListener.java
plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GlassLayer.java
plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/GuiEditor.java
plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/InsertComponentProcessor.java
plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/MainProcessor.java
plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/PassiveDecorationLayer.java
plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/QuickFixManagerImpl.java
plugins/ui-designer/src/com/intellij/uiDesigner/editor/UIFormEditor.java
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/DesignerToolWindow.java [new file with mode: 0644]
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/DesignerToolWindowManager.java [new file with mode: 0644]
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java [deleted file]
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/BindingEditor.java
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/string/StringEditor.java
plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/properties/BindingProperty.java
plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/ShowHintAction.java
plugins/ui-designer/src/messages/UIDesignerBundle.properties
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/HighlightingOutputConsole.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ShowXPathAction.java
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathAction.java
plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java
plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/AbstractTabComponent.java
python/edu/build/pycharm_edu_build.gant
python/edu/course-creator/resources/META-INF/plugin.xml
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectComponent.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCProjectService.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCRefactoringElementListenerProvider.java [new file with mode: 0644]
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCRunTests.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/AddTaskWindow.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCRename.java [new file with mode: 0644]
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCRenameLesson.java [new file with mode: 0644]
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCRenameTask.java [new file with mode: 0644]
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCShowPreview.java [new file with mode: 0644]
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CreateCourseArchive.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CreateTask.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/Course.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/Lesson.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/Task.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/format/TaskWindow.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateCourseArchivePanel.form
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowDialog.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowPanel.java
python/edu/learn-python/resources/META-INF/plugin.xml
python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java
python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyIntroductionCourse.java [new file with mode: 0644]
python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyNewProject.java
python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyRefreshTaskFileAction.java
python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyReloadCourseAction.java [new file with mode: 0644]
python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyTaskNavigationAction.java
python/edu/learn-python/src/com/jetbrains/python/edu/projectView/StudyDirectoryNode.java
python/edu/learn-python/src/com/jetbrains/python/edu/ui/StudyToolWindowFactory.java
python/helpers/pycharm/_bdd_utils.py
python/helpers/pycharm/behave_runner.py
python/helpers/pycharm/lettuce_runner.py
python/helpers/pydev/django_debug.py [deleted file]
python/helpers/pydev/django_frame.py [deleted file]
python/helpers/pydev/pydev_log.py
python/helpers/pydev/pydevd.py
python/helpers/pydev/pydevd_breakpoints.py
python/helpers/pydev/pydevd_constants.py
python/helpers/pydev/pydevd_frame.py
python/helpers/pydev/pydevd_frame_utils.py
python/helpers/pydev/pydevd_plugin_utils.py [new file with mode: 0644]
python/helpers/pydev/pydevd_plugins/__init__.py [new file with mode: 0644]
python/helpers/pydev/pydevd_plugins/django_debug.py [new file with mode: 0644]
python/helpers/pydev/pydevd_plugins/jinja2_debug.py [new file with mode: 0644]
python/helpers/pydev/pydevd_trace_api.py [new file with mode: 0644]
python/helpers/pydev/pydevd_vars.py
python/helpers/pydev/test_debug.py
python/helpers/pydev/tests/check_pydevconsole.py [new file with mode: 0644]
python/helpers/pydev/tests/test_pydev_ipython_010.py [new file with mode: 0644]
python/helpers/pydev/third_party/pkgutil_old.py [new file with mode: 0644]
python/helpers/pydev/third_party/pluginbase.py [new file with mode: 0644]
python/helpers/pydev/third_party/uuid_old.py [new file with mode: 0644]
python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java
python/ide/src/com/jetbrains/python/newProject/actions/GenerateProjectCallback.java
python/psi-api/src/com/jetbrains/python/PyNames.java
python/pydevSrc/com/jetbrains/python/debugger/IPyDebugProcess.java
python/pydevSrc/com/jetbrains/python/debugger/PyThreadInfo.java
python/pydevSrc/com/jetbrains/python/debugger/pydev/AbstractCommand.java
python/pydevSrc/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
python/src/META-INF/pycharm-core.xml
python/src/META-INF/python-core.xml
python/src/com/jetbrains/python/codeInsight/completion/PyKeywordCompletionContributor.java
python/src/com/jetbrains/python/codeInsight/editorActions/moveUpDown/PyStatementMover.java
python/src/com/jetbrains/python/codeInsight/editorActions/smartEnter/fixers/PyWithFixer.java
python/src/com/jetbrains/python/debugger/PyDebugProcess.java
python/src/com/jetbrains/python/debugger/PyDebugSupportUtils.java
python/src/com/jetbrains/python/debugger/PyExceptionBreakpointProperties.java
python/src/com/jetbrains/python/hierarchy/PyHierarchyNodeDescriptor.java [moved from python/src/com/jetbrains/python/hierarchy/PyTypeHierarchyNodeDescriptor.java with 73% similarity]
python/src/com/jetbrains/python/hierarchy/PyTypeHierarchyBrowser.java
python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyBrowser.java
python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyNodeDescriptor.java [deleted file]
python/src/com/jetbrains/python/hierarchy/call/PyCallHierarchyTreeStructureBase.java [new file with mode: 0644]
python/src/com/jetbrains/python/hierarchy/call/PyCalleeFunctionTreeStructure.java
python/src/com/jetbrains/python/hierarchy/call/PyCallerFunctionTreeStructure.java
python/src/com/jetbrains/python/hierarchy/call/PyStaticCallHierarchyUtil.java [moved from python/src/com/jetbrains/python/hierarchy/call/PyStaticCallDataManagerImpl.java with 96% similarity]
python/src/com/jetbrains/python/hierarchy/treestructures/PySubTypesHierarchyTreeStructure.java
python/src/com/jetbrains/python/hierarchy/treestructures/PySuperTypesHierarchyTreeStructure.java
python/src/com/jetbrains/python/hierarchy/treestructures/PyTypeHierarchyTreeStructure.java
python/src/com/jetbrains/python/projectView/PyElementNode.java
python/src/com/jetbrains/python/psi/PyUtil.java
python/src/com/jetbrains/python/psi/impl/PyClassImpl.java
python/src/com/jetbrains/python/psi/impl/PyElementPresentation.java [new file with mode: 0644]
python/src/com/jetbrains/python/psi/impl/PyFunctionImpl.java
python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java
python/src/com/jetbrains/python/psi/impl/PyPresentableElementImpl.java [deleted file]
python/src/com/jetbrains/python/psi/impl/PySingleStarParameterImpl.java
python/src/com/jetbrains/python/psi/impl/PyStringLiteralExpressionImpl.java
python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
python/src/com/jetbrains/python/psi/impl/PyTupleParameterImpl.java
python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureHandler.java
python/src/com/jetbrains/python/refactoring/move/PyMoveClassOrFunctionDelegate.java
python/src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java
python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java
python/src/com/jetbrains/python/sdk/skeletons/PySkeletonRefresher.java
python/src/com/jetbrains/python/structureView/PyStructureViewElement.java
python/src/com/jetbrains/python/testing/PyRerunFailedTestsAction.java
python/src/com/jetbrains/python/testing/PythonTestCommandLineStateBase.java
python/src/com/jetbrains/python/testing/TestRunConfigurationReRunResponsible.java [new file with mode: 0644]
python/testData/codeInsight/smartEnter/withOnlyColonMissing.py [new file with mode: 0644]
python/testData/codeInsight/smartEnter/withOnlyColonMissing_after.py [new file with mode: 0644]
python/testData/hierarchy/call/Static/ArgumentList/ArgumentList_callee_verification.xml
python/testData/hierarchy/call/Static/ArgumentList/ArgumentList_caller_verification.xml
python/testData/hierarchy/call/Static/Constructor/Constructor_callee_verification.xml
python/testData/hierarchy/call/Static/Constructor/Constructor_caller_verification.xml
python/testData/hierarchy/call/Static/DefaultValue/DefaultValue_callee_verification.xml
python/testData/hierarchy/call/Static/DefaultValue/DefaultValue_caller_verification.xml
python/testData/hierarchy/call/Static/Inheritance/Inheritance_callee_verification.xml
python/testData/hierarchy/call/Static/Inheritance/Inheritance_caller_verification.xml
python/testData/hierarchy/call/Static/InnerFunction/InnerFunction_callee_verification.xml
python/testData/hierarchy/call/Static/InnerFunction/InnerFunction_caller_verification.xml
python/testData/hierarchy/call/Static/Lambda/Lambda_callee_verification.xml
python/testData/hierarchy/call/Static/Lambda/Lambda_caller_verification.xml
python/testData/hierarchy/call/Static/NestedCall/NestedCall_callee_verification.xml
python/testData/hierarchy/call/Static/NestedCall/NestedCall_caller_verification.xml
python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_callee_verification.xml
python/testData/hierarchy/call/Static/OverriddenMethod/OverriddenMethod_caller_verification.xml
python/testData/hierarchy/call/Static/Parentheses/Parentheses_callee_verification.xml
python/testData/hierarchy/call/Static/Parentheses/Parentheses_caller_verification.xml
python/testData/hierarchy/call/Static/Simple/Simple_callee_verification.xml
python/testData/hierarchy/call/Static/Simple/Simple_caller_verification.xml
python/testData/mover/outsideFromDict.py [new file with mode: 0644]
python/testData/mover/outsideFromDict_afterDown.py [new file with mode: 0644]
python/testData/mover/outsideFromDict_afterUp.py [new file with mode: 0644]
python/testData/mover/sameLevelAsDict.py [new file with mode: 0644]
python/testData/mover/sameLevelAsDict_afterDown.py [new file with mode: 0644]
python/testData/mover/sameLevelAsDict_afterUp.py [new file with mode: 0644]
python/testSrc/com/jetbrains/env/python/PythonDebuggerTest.java
python/testSrc/com/jetbrains/env/ut/PyUnitTestTask.java
python/testSrc/com/jetbrains/python/PySmartEnterTest.java
python/testSrc/com/jetbrains/python/PyStatementMoverTest.java
python/testSrc/com/jetbrains/python/PythonKeywordCompletionTest.java
python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java
python/testSrc/com/jetbrains/python/hierarchy/HierarchyTreeStructureViewer.java [deleted file]
python/testSrc/com/jetbrains/python/hierarchy/PyCallHierarchyTest.java
python/testSrc/com/jetbrains/python/sdkTools/PyTestSdkTools.java
resources-en/src/messages/CompilerBundle.properties
resources-en/src/messages/DebuggerBundle.properties
resources/src/META-INF/IdeaPlugin.xml
resources/src/componentSets/IdeaComponents.xml
resources/src/componentSets/Toolwindows.xml [deleted file]
resources/src/idea/RichPlatformActions.xml
resources/src/idea/RichPlatformPlugin.xml
updater/src/com/intellij/updater/Runner.java
xml/dom-impl/src/com/intellij/util/xml/impl/IndexedElementInvocationHandler.java
xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsForm.form
xml/impl/src/com/intellij/application/options/editor/WebEditorOptionsProvider.java
xml/impl/src/com/intellij/codeInsight/editorActions/XmlEqTypedHandler.java
xml/impl/src/com/intellij/codeInsight/editorActions/XmlSlashTypedHandler.java
xml/impl/src/com/intellij/codeInsight/template/emmet/EmmetParser.java
xml/impl/src/com/intellij/codeInsight/template/emmet/XmlEmmetParser.java
xml/impl/src/com/intellij/codeInsight/template/emmet/nodes/MoreOperationNode.java
xml/impl/src/com/intellij/xml/arrangement/XmlArrangementVisitor.java
xml/impl/src/com/intellij/xml/refactoring/SchemaPrefixRenameHandler.java
xml/impl/src/com/intellij/xml/refactoring/XmlInlineHandler.java
xml/impl/src/org/jetbrains/io/fastCgi/FastCgiChannelHandler.java
xml/xml-analysis-impl/src/com/intellij/application/options/editor/WebEditorOptions.java
xml/xml-analysis-impl/src/com/intellij/xml/util/XmlRefCountHolder.java
xml/xml-psi-impl/src/com/intellij/lexer/HtmlHighlightingLexer.java
xml/xml-psi-impl/src/com/intellij/psi/XmlElementFactoryImpl.java
xml/xml-psi-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/manipulators/XmlAttributeValueManipulator.java
xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java
xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java
xml/xml-psi-impl/src/com/intellij/xml/util/XmlUtil.java

index e1a3e405ef99c08b890c07ed86d348cb2035ce34..3fb1a17163fc66fc6825b47bfe4170b88d2c87d1 100644 (file)
@@ -1,3 +1,4 @@
+/android
 /config
 /system
 .idea/workspace.xml
diff --git a/.idea/libraries/asm_tools.xml b/.idea/libraries/asm_tools.xml
new file mode 100644 (file)
index 0000000..9435a42
--- /dev/null
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="asm-tools">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/asm-4.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/asm-analysis-4.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/asm-tree-4.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/bouncy_castle.xml b/.idea/libraries/bouncy_castle.xml
new file mode 100644 (file)
index 0000000..4e4673a
--- /dev/null
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="bouncy-castle">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/bcpkix-jdk15on-1.48.jar!/" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/bcprov-jdk15on-1.48.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/builder_model.xml b/.idea/libraries/builder_model.xml
new file mode 100644 (file)
index 0000000..e50dabd
--- /dev/null
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="builder-model">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/builder-model-0.12.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/src/builder-model-0.12.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/commons_compress.xml b/.idea/libraries/commons_compress.xml
new file mode 100644 (file)
index 0000000..a77ee36
--- /dev/null
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="commons-compress">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/commons-compress-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/easymock_tools.xml b/.idea/libraries/easymock_tools.xml
new file mode 100644 (file)
index 0000000..c996385
--- /dev/null
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="easymock-tools">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/dev/easymockclassextension.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/dev/easymock.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/freemarker_2_3_20.xml b/.idea/libraries/freemarker_2_3_20.xml
new file mode 100644 (file)
index 0000000..831297d
--- /dev/null
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="freemarker-2.3.20">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/freemarker-2.3.20.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/guava_tools.xml b/.idea/libraries/guava_tools.xml
new file mode 100644 (file)
index 0000000..b492cf4
--- /dev/null
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="guava-tools">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/guava-17.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/lib/src/guava-17.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/javawriter.xml b/.idea/libraries/javawriter.xml
new file mode 100644 (file)
index 0000000..1d73b23
--- /dev/null
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="javawriter">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/javawriter-2.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/src/javawriter-2.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/kxml2.xml b/.idea/libraries/kxml2.xml
new file mode 100644 (file)
index 0000000..fe007f5
--- /dev/null
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="kxml2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/kxml2-2.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/lombok_ast.xml b/.idea/libraries/lombok_ast.xml
new file mode 100644 (file)
index 0000000..9fe1aa4
--- /dev/null
@@ -0,0 +1,16 @@
+<component name="libraryTable">
+  <library name="lombok-ast">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/lombok-ast-0.2.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/src/lombok-ast-0.2.2-src.zip!/src/main" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/src/lombok-ast-0.2.2-src.zip!/src/printer" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/src/lombok-ast-0.2.2-src.zip!/src/template" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/src/lombok-ast-0.2.2-src.zip!/src/ecjTransformer" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/src/lombok-ast-0.2.2-src.zip!/src/javacTransformer" />
+      <root url="jar://$PROJECT_DIR$/android/android/lib/src/lombok-ast-0.2.2-src.zip!/build/lombok.ast_generatedSource" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/mockito.xml b/.idea/libraries/mockito.xml
new file mode 100644 (file)
index 0000000..a1ae9af
--- /dev/null
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="mockito">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/mockito-all-1.9.5.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$PROJECT_DIR$/android/android/lib/mockito-all-1.9.5.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
index 0322352e9df9763deb9509575d8ae0b4bdea89d4..f23cddeafc3c42b8cc9751bf9fd805f4972cf40f 100644 (file)
       <module fileurl="file://$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-xml.iml" filepath="$PROJECT_DIR$/plugins/IntelliLang/IntelliLang-xml.iml" group="plugins/IntelliLang" />
       <module fileurl="file://$PROJECT_DIR$/RegExpSupport/RegExpSupport.iml" filepath="$PROJECT_DIR$/RegExpSupport/RegExpSupport.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ShortcutPromoter/ShortcutPromoter.iml" filepath="$PROJECT_DIR$/plugins/ShortcutPromoter/ShortcutPromoter.iml" group="plugins" />
+      <module fileurl="file://$PROJECT_DIR$/android/adt-branding/adt-branding.iml" filepath="$PROJECT_DIR$/android/adt-branding/adt-branding.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/platform/analysis-api/analysis-api.iml" filepath="$PROJECT_DIR$/platform/analysis-api/analysis-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" filepath="$PROJECT_DIR$/platform/analysis-impl/analysis-impl.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/android/android/android.iml" filepath="$PROJECT_DIR$/android/android/android.iml" group="android" />
+      <module fileurl="file://$PROJECT_DIR$/android/android/common/android-common.iml" filepath="$PROJECT_DIR$/android/android/common/android-common.iml" group="android" />
+      <module fileurl="file://$PROJECT_DIR$/android/android-gradle-jps/android-gradle-jps.iml" filepath="$PROJECT_DIR$/android/android-gradle-jps/android-gradle-jps.iml" group="android" />
+      <module fileurl="file://$PROJECT_DIR$/android/android/jps-plugin/android-jps-plugin.iml" filepath="$PROJECT_DIR$/android/android/jps-plugin/android-jps-plugin.iml" group="android" />
+      <module fileurl="file://$PROJECT_DIR$/android/android/rt/android-rt.iml" filepath="$PROJECT_DIR$/android/android/rt/android-rt.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/platform/annotations/annotations.iml" filepath="$PROJECT_DIR$/platform/annotations/annotations.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ant/ant.iml" filepath="$PROJECT_DIR$/plugins/ant/ant.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ant/jps-plugin/ant-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/ant/jps-plugin/ant-jps-plugin.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/jps/antLayout/antlayout.iml" filepath="$PROJECT_DIR$/jps/antLayout/antlayout.iml" group="jps" />
       <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/runtime/appEngine-runtime.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/runtime/appEngine-runtime.iml" group="plugins/GAE" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/asset-studio/assetstudio.iml" filepath="$PROJECT_DIR$/android/tools-base/asset-studio/assetstudio.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/platform/boot/boot.iml" filepath="$PROJECT_DIR$/platform/boot/boot.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" filepath="$PROJECT_DIR$/platform/bootstrap/bootstrap.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" />
       <module fileurl="file://$PROJECT_DIR$/colorSchemes/colorSchemes.iml" filepath="$PROJECT_DIR$/colorSchemes/colorSchemes.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/plugins/commander/commander.iml" filepath="$PROJECT_DIR$/plugins/commander/commander.iml" group="plugins" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/common/common.iml" filepath="$PROJECT_DIR$/android/tools-base/common/common.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/plugins/eclipse/common-eclipse-util/common-eclipse-util.iml" filepath="$PROJECT_DIR$/plugins/eclipse/common-eclipse-util/common-eclipse-util.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/javaFX/common-javaFX-plugin/common-javaFX-plugin.iml" filepath="$PROJECT_DIR$/plugins/javaFX/common-javaFX-plugin/common-javaFX-plugin.iml" group="plugins/JavaFX" />
       <module fileurl="file://$PROJECT_DIR$/community-main.iml" filepath="$PROJECT_DIR$/community-main.iml" />
@@ -39,6 +47,7 @@
       <module fileurl="file://$PROJECT_DIR$/build/cucumber-test-runner/cucumber-test-runner.iml" filepath="$PROJECT_DIR$/build/cucumber-test-runner/cucumber-test-runner.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/cvs/cvs-core/cvs-core.iml" filepath="$PROJECT_DIR$/plugins/cvs/cvs-core/cvs-core.iml" group="plugins/VCS/cvs" />
       <module fileurl="file://$PROJECT_DIR$/plugins/cvs/cvs-plugin/cvs-plugin.iml" filepath="$PROJECT_DIR$/plugins/cvs/cvs-plugin/cvs-plugin.iml" group="plugins/VCS/cvs" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/ddmlib/ddmlib.iml" filepath="$PROJECT_DIR$/android/tools-base/ddmlib/ddmlib.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/java/debugger/impl/debugger-impl.iml" filepath="$PROJECT_DIR$/java/debugger/impl/debugger-impl.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/debugger/openapi/debugger-openapi.iml" filepath="$PROJECT_DIR$/java/debugger/openapi/debugger-openapi.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/devkit.iml" filepath="$PROJECT_DIR$/plugins/devkit/devkit.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/xml/dom-impl/dom-impl.iml" filepath="$PROJECT_DIR$/xml/dom-impl/dom-impl.iml" group="xml" />
       <module fileurl="file://$PROJECT_DIR$/xml/dom-openapi/dom-openapi.iml" filepath="$PROJECT_DIR$/xml/dom-openapi/dom-openapi.iml" group="xml" />
       <module fileurl="file://$PROJECT_DIR$/xml/dom-tests/dom-tests.iml" filepath="$PROJECT_DIR$/xml/dom-tests/dom-tests.iml" group="xml" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/draw9patch/draw9patch.iml" filepath="$PROJECT_DIR$/android/tools-base/draw9patch/draw9patch.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/platform/duplicates-analysis/duplicates-analysis.iml" filepath="$PROJECT_DIR$/platform/duplicates-analysis/duplicates-analysis.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/dvcs-api/dvcs-api.iml" filepath="$PROJECT_DIR$/platform/dvcs-api/dvcs-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/dvcs-impl/dvcs-impl.iml" filepath="$PROJECT_DIR$/platform/dvcs-impl/dvcs-impl.iml" group="platform" />
-      <module fileurl="file://$PROJECT_DIR$/platform/dvcs-api/dvcs-api.iml" filepath="$PROJECT_DIR$/platform/dvcs-api/dvcs-api.iml" group="platform"/>
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/device_validator/dvlib/dvlib.iml" filepath="$PROJECT_DIR$/android/tools-base/device_validator/dvlib/dvlib.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/plugins/eclipse/eclipse.iml" filepath="$PROJECT_DIR$/plugins/eclipse/eclipse.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/eclipse/jps-plugin/eclipse-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/eclipse/jps-plugin/eclipse-jps-plugin.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/platform/editor-ui-api/editor-ui-api.iml" filepath="$PROJECT_DIR$/platform/editor-ui-api/editor-ui-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/editor-ui-ex/editor-ui-ex.iml" filepath="$PROJECT_DIR$/platform/editor-ui-ex/editor-ui-ex.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/editorconfig/editorconfig.iml" filepath="$PROJECT_DIR$/plugins/editorconfig/editorconfig.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/java/execution/impl/execution-impl.iml" filepath="$PROJECT_DIR$/java/execution/impl/execution-impl.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/execution/openapi/execution-openapi.iml" filepath="$PROJECT_DIR$/java/execution/openapi/execution-openapi.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/platform/extensions/extensions.iml" filepath="$PROJECT_DIR$/platform/extensions/extensions.iml" group="platform" />
@@ -66,6 +78,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/google-app-engine.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/google-app-engine.iml" group="plugins/GAE" />
       <module fileurl="file://$PROJECT_DIR$/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/google-app-engine/jps-plugin/google-app-engine-jps-plugin.iml" group="plugins/GAE" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/gradle.iml" filepath="$PROJECT_DIR$/plugins/gradle/gradle.iml" group="community/plugins/gradle" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/gradle-import/gradle-import.iml" filepath="$PROJECT_DIR$/android/tools-base/gradle-import/gradle-import.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/jps-plugin/gradle-jps-plugin.iml" filepath="$PROJECT_DIR$/plugins/gradle/jps-plugin/gradle-jps-plugin.iml" group="community/plugins/gradle" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml" filepath="$PROJECT_DIR$/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml" group="community/plugins/gradle" />
       <module fileurl="file://$PROJECT_DIR$/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml" filepath="$PROJECT_DIR$/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml" group="community/plugins/gradle" />
       <module fileurl="file://$PROJECT_DIR$/plugins/junit_rt/junit_rt.iml" filepath="$PROJECT_DIR$/plugins/junit_rt/junit_rt.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/platform/lang-api/lang-api.iml" filepath="$PROJECT_DIR$/platform/lang-api/lang-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/lang-impl/lang-impl.iml" filepath="$PROJECT_DIR$/platform/lang-impl/lang-impl.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/layoutlib-api/layoutlib-api.iml" filepath="$PROJECT_DIR$/android/tools-base/layoutlib-api/layoutlib-api.iml" group="android/sdktools" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/lint/libs/lint-api/lint-api.iml" filepath="$PROJECT_DIR$/android/tools-base/lint/libs/lint-api/lint-api.iml" group="android/sdktools" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/lint/libs/lint-checks/lint-checks.iml" filepath="$PROJECT_DIR$/android/tools-base/lint/libs/lint-checks/lint-checks.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/platform/lvcs-api/lvcs-api.iml" filepath="$PROJECT_DIR$/platform/lvcs-api/lvcs-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/lvcs-impl/lvcs-impl.iml" filepath="$PROJECT_DIR$/platform/lvcs-impl/lvcs-impl.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/android/android/main_AndroidStudio.iml" filepath="$PROJECT_DIR$/android/android/main_AndroidStudio.iml" group="android" />
       <module fileurl="file://$PROJECT_DIR$/python/main_idea_python_plugin.iml" filepath="$PROJECT_DIR$/python/main_idea_python_plugin.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/main_pycharm_ce.iml" filepath="$PROJECT_DIR$/python/main_pycharm_ce.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/python/edu/main_pycharm_edu.iml" filepath="$PROJECT_DIR$/python/edu/main_pycharm_edu.iml" group="python/educational" />
       <module fileurl="file://$PROJECT_DIR$/java/manifest/manifest.iml" filepath="$PROJECT_DIR$/java/manifest/manifest.iml" group="java" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/build-system/manifest-merger/manifest-merger.iml" filepath="$PROJECT_DIR$/android/tools-base/build-system/manifest-merger/manifest-merger.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven.iml" filepath="$PROJECT_DIR$/plugins/maven/maven.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/maven-artifact-resolver-m2.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m3/maven-artifact-resolver-m3.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven-server-api/maven-server-api.iml" filepath="$PROJECT_DIR$/plugins/maven/maven-server-api/maven-server-api.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven2-server-impl/maven2-server-impl.iml" filepath="$PROJECT_DIR$/plugins/maven/maven2-server-impl/maven2-server-impl.iml" group="plugins/maven" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/maven3-server-impl/maven3-server-impl.iml" filepath="$PROJECT_DIR$/plugins/maven/maven3-server-impl/maven3-server-impl.iml" group="plugins/maven" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/ninepatch/ninepatch.iml" filepath="$PROJECT_DIR$/android/tools-base/ninepatch/ninepatch.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/java/openapi/openapi.iml" filepath="$PROJECT_DIR$/java/openapi/openapi.iml" group="java" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/perflib/perflib.iml" filepath="$PROJECT_DIR$/android/tools-base/perflib/perflib.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/platform/platform-api/platform-api.iml" filepath="$PROJECT_DIR$/platform/platform-api/platform-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/platform-impl/platform-impl.iml" filepath="$PROJECT_DIR$/platform/platform-impl/platform-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/platform-main/platform-main.iml" filepath="$PROJECT_DIR$/platform/platform-main/platform-main.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/python/rest/rest.iml" filepath="$PROJECT_DIR$/python/rest/rest.iml" group="python" />
       <module fileurl="file://$PROJECT_DIR$/platform/script-debugger/backend/script-debugger-backend.iml" filepath="$PROJECT_DIR$/platform/script-debugger/backend/script-debugger-backend.iml" group="platform/script-debugger" />
       <module fileurl="file://$PROJECT_DIR$/platform/script-debugger/debugger-ui/script-debugger-ui.iml" filepath="$PROJECT_DIR$/platform/script-debugger/debugger-ui/script-debugger-ui.iml" group="platform/script-debugger" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/sdk-common/sdk-common.iml" filepath="$PROJECT_DIR$/android/tools-base/sdk-common/sdk-common.iml" group="android/sdktools" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/sdklib/sdklib.iml" filepath="$PROJECT_DIR$/android/tools-base/sdklib/sdklib.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/platform/smRunner/smRunner.iml" filepath="$PROJECT_DIR$/platform/smRunner/smRunner.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/plugins/cvs/smartcvs-src/smartcvs-src.iml" filepath="$PROJECT_DIR$/plugins/cvs/smartcvs-src/smartcvs-src.iml" group="plugins/VCS/cvs" />
       <module fileurl="file://$PROJECT_DIR$/spellchecker/spellchecker.iml" filepath="$PROJECT_DIR$/spellchecker/spellchecker.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/testng/testng.iml" filepath="$PROJECT_DIR$/plugins/testng/testng.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/testng_rt/testng_rt.iml" filepath="$PROJECT_DIR$/plugins/testng_rt/testng_rt.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/platform/testFramework/bootstrap/tests_bootstrap.iml" filepath="$PROJECT_DIR$/platform/testFramework/bootstrap/tests_bootstrap.iml" group="platform" />
+      <module fileurl="file://$PROJECT_DIR$/android/tools-base/testutils/testutils.iml" filepath="$PROJECT_DIR$/android/tools-base/testutils/testutils.iml" group="android/sdktools" />
       <module fileurl="file://$PROJECT_DIR$/java/typeMigration/typeMigration.iml" filepath="$PROJECT_DIR$/java/typeMigration/typeMigration.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ui-designer/ui-designer.iml" filepath="$PROJECT_DIR$/plugins/ui-designer/ui-designer.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/ui-designer-core/ui-designer-core.iml" filepath="$PROJECT_DIR$/plugins/ui-designer-core/ui-designer-core.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" filepath="$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/editorconfig/editorconfig.iml" filepath="$PROJECT_DIR$/plugins/editorconfig/editorconfig.iml" group="plugins"/>
-
     </modules>
   </component>
 </project>
index 275077f82558f02f5c5151cc5c676b9f5f60dce3..a1b9ce94e9025cd85107ab98e5cc2068916c2cbe 100644 (file)
@@ -2,6 +2,8 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/android" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/android/tools-base" vcs="Git" />
   </component>
 </project>
 
index 19b5e717160b3e6b39ef4c74e6d212a2eb807a36..0f451cb36a5d5cfa0afe5ccc6e1d225899d46cbf 100755 (executable)
@@ -99,7 +99,7 @@ fi
 
 VERSION_LOG=`"$MKTEMP" -t java.version.log.XXXXXX`
 "$JDK/bin/java" -version 2> "$VERSION_LOG"
-"$GREP" "64-Bit|x86_64" "$VERSION_LOG" > /dev/null
+"$GREP" "64-Bit|x86_64|amd64" "$VERSION_LOG" > /dev/null
 BITS=$?
 "$RM" -f "$VERSION_LOG"
 if [ $BITS -eq 0 ]; then
@@ -148,7 +148,7 @@ if [ "$IS_EAP" = "true" ]; then
   OS_NAME=`echo $OS_TYPE | "$TR" '[:upper:]' '[:lower:]'`
   AGENT_LIB="yjpagent-$OS_NAME$BITS"
   if [ -r "$IDE_BIN_HOME/lib$AGENT_LIB.so" ]; then
-    AGENT="-agentlib:$AGENT_LIB=disablej2ee,disablealloc,delay=10000,sessionname=@@system_selector@@"
+    AGENT="-agentpath:$AGENT_LIB=disablej2ee,disablealloc,delay=10000,sessionname=@@system_selector@@"
   fi
 fi
 
index d13854c5f77afa7a6ad69532e87aa8ab580d4e27..3f26292b969a16c02f0ecb75a6015cf58b311452 100644 (file)
@@ -86,8 +86,6 @@
       <key>VMOptions</key>
       <string>@@vmoptions@@ -Xbootclasspath/a:../lib/boot.jar</string>
 
-      <key>WorkingDirectory</key>
-      <string>$APP_PACKAGE/Contents/bin</string>
     </dict>
   </dict>
 </plist>
index 6ba553f866fdad3c43241e3d72d2b75ce3bf92cd..0699ef280f5421f794bae258f6694fe07fb46a8a 100755 (executable)
Binary files a/build/conf/mac/Contents/MacOS/idea and b/build/conf/mac/Contents/MacOS/idea differ
index 7d5698fc9aee3f8a55646d0795500fc371951e62..6eb85a76a4ae437619e90b2a54488ebb48a2b72a 100644 (file)
@@ -254,9 +254,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
 }
 
 public def layoutCommunityPlugins(String home) {
-  if (isDefined("androidPluginHome")) {
-    layoutAndroid(p("androidPluginHome"))
-  }
+  layoutAndroid("$home/android")
 
   dir("plugins") {
     def simplePlugins = ["commander", "copyright", "java-i18n", "hg4idea", "github"] //, "tasks-time-tracking"]
index b090f7a84dd52b4de71fd13b18be3833592a424e..021f55175897ff97888962461fb21c4291dc0e92 100644 (file)
@@ -64,7 +64,7 @@ binding.setVariable("vmOptions32", { "$mem32 ${vmOptions()}".trim() })
 binding.setVariable("vmOptions64", { "$mem64 ${vmOptions()}".trim() })
 
 binding.setVariable("yjpOptions", { String systemSelector, String platformSuffix = "" ->
-  "-agentlib:yjpagent$platformSuffix=probe_disable=*,disablealloc,disabletracing,onlylocal,disableexceptiontelemetry,delay=10000,sessionname=$systemSelector".trim()
+  "-agentpath:yjpagent$platformSuffix=probe_disable=*,disablealloc,disabletracing,onlylocal,disableexceptiontelemetry,delay=10000,sessionname=$systemSelector".trim()
 })
 binding.setVariable("vmOptions32yjp", { String systemSelector ->
   "${vmOptions32()} ${yjpOptions(systemSelector)}".trim()
diff --git a/getPlugins.bat b/getPlugins.bat
new file mode 100644 (file)
index 0000000..3cd8b97
--- /dev/null
@@ -0,0 +1,2 @@
+call git clone git://git.jetbrains.org/idea/android.git android
+call git clone git://git.jetbrains.org/idea/adt-tools-base.git android/tools-base
diff --git a/getPlugins.sh b/getPlugins.sh
new file mode 100755 (executable)
index 0000000..9afcebd
--- /dev/null
@@ -0,0 +1,2 @@
+git clone git://git.jetbrains.org/idea/android.git android
+git clone git://git.jetbrains.org/idea/adt-tools-base.git android/tools-base
index f3d920d3d3c3cc14d6d36397e7a5e8f6d4217446..b14296626eba09624f4c871664e94696745bf31e 100644 (file)
 package org.intellij.images.editor.impl;
 
 import com.intellij.ide.CopyPasteSupport;
+import com.intellij.ide.CopyProvider;
 import com.intellij.ide.DeleteProvider;
 import com.intellij.ide.PsiActionSupportFactory;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.ide.CopyPasteManager;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -46,12 +48,16 @@ import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
+import java.io.IOException;
 import java.util.Locale;
 
 /**
@@ -59,7 +65,7 @@ import java.util.Locale;
  *
  * @author <a href="mailto:aefimov.box@gmail.com">Alexey Efimov</a>
  */
-final class ImageEditorUI extends JPanel implements DataProvider {
+final class ImageEditorUI extends JPanel implements DataProvider, CopyProvider {
   @NonNls
   private static final String IMAGE_PANEL = "image";
   @NonNls
@@ -390,7 +396,7 @@ final class ImageEditorUI extends JPanel implements DataProvider {
     } else if (LangDataKeys.PSI_ELEMENT_ARRAY.is(dataId)) {
       return new PsiElement[]{(PsiElement)getData(CommonDataKeys.PSI_ELEMENT.getName())};
     } else if (PlatformDataKeys.COPY_PROVIDER.is(dataId) && copyPasteSupport != null) {
-      return copyPasteSupport.getCopyProvider();
+      return this;
     } else if (PlatformDataKeys.CUT_PROVIDER.is(dataId) && copyPasteSupport != null) {
       return copyPasteSupport.getCutProvider();
     } else if (PlatformDataKeys.DELETE_ELEMENT_PROVIDER.is(dataId)) {
@@ -401,4 +407,47 @@ final class ImageEditorUI extends JPanel implements DataProvider {
 
     return null;
   }
+
+  @Override
+  public void performCopy(@NotNull DataContext dataContext) {
+    ImageDocument document = imageComponent.getDocument();
+    BufferedImage image = document.getValue();
+    CopyPasteManager.getInstance().setContents(new ImageTransferable(image));
+  }
+
+  @Override
+  public boolean isCopyEnabled(@NotNull DataContext dataContext) {
+    return true;
+  }
+
+  @Override
+  public boolean isCopyVisible(@NotNull DataContext dataContext) {
+    return true;
+  }
+
+  private static class ImageTransferable implements Transferable {
+    private final BufferedImage myImage;
+
+    public ImageTransferable(@NotNull BufferedImage image) {
+      myImage = image;
+    }
+
+    @Override
+    public DataFlavor[] getTransferDataFlavors() {
+      return new DataFlavor[] { DataFlavor.imageFlavor };
+    }
+
+    @Override
+    public boolean isDataFlavorSupported(DataFlavor dataFlavor) {
+      return DataFlavor.imageFlavor.equals(dataFlavor);
+    }
+
+    @Override
+    public Object getTransferData(DataFlavor dataFlavor) throws UnsupportedFlavorException, IOException {
+      if (!DataFlavor.imageFlavor.equals(dataFlavor)) {
+        throw new UnsupportedFlavorException(dataFlavor);
+      }
+      return myImage;
+    }
+  }
 }
index 38f230f92997bafd6e1d76b82f29e7d6077783f1..542f1331d2d5daab9fb18b0fa91ef8c9df341db1 100644 (file)
@@ -110,7 +110,7 @@ public class CompileAction extends CompileActionBase {
           elementDescription = "'" + file.getName() + "'";
         }
         else {
-          if (!ActionPlaces.MAIN_MENU.equals(event.getPlace())) {
+          if (!ActionPlaces.isMainMenuOrActionSearch(event.getPlace())) {
             // the action should be invisible in popups for non-java files
             presentation.setEnabled(false);
             presentation.setVisible(false);
index eed2b888d43fe50f5a3539e7d31c19891e5696d0..aeffe083cd9ee2c213a462058517fb51108217b4 100644 (file)
@@ -67,7 +67,7 @@
         <clientProperties>
           <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
         </clientProperties>
-        <border type="none" title="Jar files from libraries"/>
+        <border type="none" title="JAR files from libraries"/>
         <children>
           <component id="f9a17" class="javax.swing.JRadioButton" binding="myExtractJarsRadioButton">
             <constraints>
@@ -75,7 +75,7 @@
             </constraints>
             <properties>
               <selected value="true"/>
-              <text value="&amp;extract to the target jar"/>
+              <text value="&amp;extract to the target JAR"/>
             </properties>
           </component>
           <hspacer id="90c4f">
index 02d9e4228eecf4fed6754c921839c58f66b968db..ea2f4a64f62288c8f689d47fa56def0c48135cef 100644 (file)
@@ -55,7 +55,7 @@ public class JarArtifactFromModulesDialog extends DialogWrapper {
   public JarArtifactFromModulesDialog(PackagingElementResolvingContext context) {
     super(context.getProject());
     myContext = context;
-    setTitle("Create Jar from Modules");
+    setTitle("Create JAR from Modules");
     myMainClassLabel.setLabelFor(myMainClassField.getTextField());
     myManifestDirLabel.setLabelFor(myManifestDirField.getTextField());
 
index 2a0af90079638ce8d4c2c0a81a8a7016a144d503..bd4494c6f4a36bf0af772e646b9f11fc8bdb7f27 100644 (file)
@@ -33,7 +33,7 @@ import java.util.List;
  */
 public class JarArtifactType extends ArtifactType {
   public JarArtifactType() {
-    super("jar", "Jar");
+    super("jar", "JAR");
   }
 
   public static JarArtifactType getInstance() {
index 0d1737b07e42a6bbda4aa15b01d09d599fd51028..7e8f6016d591cf1df2d93f435c1fc7e42e4872a4 100644 (file)
@@ -274,7 +274,7 @@ public class PackagingElementFactoryImpl extends PackagingElementFactory {
   @NotNull
   @Override
   public PackagingElement<?> createExtractedDirectory(@NotNull VirtualFile jarEntry) {
-    LOG.assertTrue(jarEntry.getFileSystem() instanceof JarFileSystem, "Expected file from jar but file from " + jarEntry.getFileSystem() + " found");
+    LOG.assertTrue(jarEntry.getFileSystem() instanceof JarFileSystem, "Expected file from JAR but file from " + jarEntry.getFileSystem() + " found");
     final String fullPath = jarEntry.getPath();
     final int jarEnd = fullPath.indexOf(JarFileSystem.JAR_SEPARATOR);
     return new ExtractedDirectoryPackagingElement(fullPath.substring(0, jarEnd), fullPath.substring(jarEnd + 1));
index 8c89bada270da40f3c4f3d9032314c1536caa926..04f4d583cf9959f3d32ff49b5bf3e4dcc09d7f01 100644 (file)
@@ -15,7 +15,6 @@
  */
 package com.intellij.debugger;
 
-import com.intellij.diagnostic.logging.LogFilesManager;
 import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.ui.RunContentDescriptor;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
@@ -37,8 +36,6 @@ public interface DebugUIEnvironment {
   @Nullable
   Icon getIcon();
 
-  void initLogs(RunContentDescriptor content, LogFilesManager logFilesManager);
-
   void initActions(RunContentDescriptor content, DefaultActionGroup actionGroup);
 
   @Nullable
index f29f3bfe572de04e0994554ec887a1f748256946..6f8b13e4d06afaeb9958a4ad4ea7d949797e8ccd 100644 (file)
  */
 package com.intellij.debugger;
 
-import com.intellij.diagnostic.logging.LogFilesManager;
-import com.intellij.diagnostic.logging.OutputFileUtil;
 import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.RemoteConnection;
-import com.intellij.execution.configurations.RunConfigurationBase;
 import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.configurations.RunProfileState;
-import com.intellij.execution.process.ProcessHandler;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.runners.RestartAction;
 import com.intellij.execution.ui.RunContentDescriptor;
@@ -63,21 +59,6 @@ public class DefaultDebugUIEnvironment implements DebugUIEnvironment {
     return getRunProfile().getIcon();
   }
 
-  @Override
-  public void initLogs(RunContentDescriptor content, LogFilesManager logFilesManager) {
-    ProcessHandler processHandler = content.getProcessHandler();
-    if (getRunProfile() instanceof RunConfigurationBase) {
-      RunConfigurationBase runConfiguration = (RunConfigurationBase)getRunProfile();
-
-      logFilesManager.registerFileMatcher(runConfiguration);
-
-      if (processHandler != null) {
-        logFilesManager.initLogConsoles(runConfiguration, processHandler);
-        OutputFileUtil.attachDumpListener(runConfiguration, processHandler, content.getExecutionConsole());
-      }
-    }
-  }
-
   @Override
   public void initActions(RunContentDescriptor content, DefaultActionGroup actionGroup) {
     Executor executor = myExecutionEnvironment.getExecutor();
index 87476cfd2ac3cd821d7a0373a4bff97730d5ff85..282a6dc9f30bb933274cc628f14b44ef2a3e4ccc 100644 (file)
@@ -50,6 +50,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import static com.intellij.openapi.actionSystem.PlatformDataKeys.CONTEXT_COMPONENT;
+
 /*
  * Class SetValueAction
  * @author Jeka
@@ -72,7 +74,7 @@ public class JavaMarkObjectActionHandler extends MarkObjectActionHandler {
     final DebuggerTree tree = node.getTree();
     tree.saveState(node);
 
-    final Component parent = event.getInputEvent().getComponent();
+    final Component parent = event.getData(CONTEXT_COMPONENT);
     final ValueDescriptorImpl valueDescriptor = ((ValueDescriptorImpl)descriptor);
     final DebuggerContextImpl debuggerContext = tree.getDebuggerContext();
     final DebugProcessImpl debugProcess = debuggerContext.getDebugProcess();
index 4d2b549d69f8dcbfc851545fef71cfdd2ec2928b..f89ae5ce8292fb13d37e8b4a2e37f040ec8a6e45 100644 (file)
@@ -270,7 +270,7 @@ public class PopFrameAction extends DebuggerAction {
       enable = virtualMachineProxy.canPopFrames();
     }
 
-    if(ActionPlaces.MAIN_MENU.equals(e.getPlace()) || ActionPlaces.DEBUGGER_TOOLBAR.equals(e.getPlace())) {
+    if(ActionPlaces.isMainMenuOrActionSearch(e.getPlace()) || ActionPlaces.DEBUGGER_TOOLBAR.equals(e.getPlace())) {
       e.getPresentation().setEnabled(enable);
     }
     else {
index 4714ca49bd06ff7fb6c51bd04f9c2486d4ebb9f1..7640a959597e7f407adfe76d9c238e23715032b9 100644 (file)
@@ -29,7 +29,6 @@ import com.intellij.debugger.requests.Requestor;
 import com.intellij.debugger.settings.DebuggerSettings;
 import com.intellij.debugger.ui.DebuggerPanelsManager;
 import com.intellij.debugger.ui.breakpoints.Breakpoint;
-import com.intellij.debugger.ui.breakpoints.BreakpointManager;
 import com.intellij.debugger.ui.breakpoints.LineBreakpoint;
 import com.intellij.execution.configurations.RemoteConnection;
 import com.intellij.openapi.application.ApplicationManager;
@@ -57,15 +56,15 @@ import com.sun.jdi.request.ThreadStartRequest;
  * @author lex
  */
 public class DebugProcessEvents extends DebugProcessImpl {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.DebugProcessEvents");
+  private static final Logger LOG = Logger.getInstance(DebugProcessEvents.class);
+
   private DebuggerEventThread myEventThread;
-  private final BreakpointManager myBreakpointManager;
 
   public DebugProcessEvents(Project project) {
     super(project);
-    myBreakpointManager = DebuggerManagerEx.getInstanceEx(getProject()).getBreakpointManager();
   }
 
+  @Override
   protected void commitVM(final VirtualMachine vm) {
     super.commitVM(vm);
     if(vm != null) {
@@ -134,18 +133,19 @@ public class DebugProcessEvents extends DebugProcessImpl {
       return myIsStopped;
     }
 
+    @Override
     public void run() {
       try {
         EventQueue eventQueue = myVmProxy.eventQueue();
         while (!isStopped()) {
           try {
             final EventSet eventSet = eventQueue.remove();
-            
+
             final boolean methodWatcherActive = myReturnValueWatcher != null && myReturnValueWatcher.isEnabled();
             int processed = 0;
             for (EventIterator eventIterator = eventSet.eventIterator(); eventIterator.hasNext();) {
               final Event event = eventIterator.nextEvent();
-              
+
               if (methodWatcherActive) {
                 if (event instanceof MethodExitEvent) {
                   if (myReturnValueWatcher.processMethodExitEvent((MethodExitEvent)event)) {
@@ -158,6 +158,7 @@ public class DebugProcessEvents extends DebugProcessImpl {
                 processed++;
                 final ThreadReference thread = ((ThreadStartEvent)event).thread();
                 getManagerThread().schedule(new DebuggerCommandImpl() {
+                  @Override
                   protected void action() throws Exception {
                     getVirtualMachineProxy().threadStarted(thread);
                     myDebugProcessDispatcher.getMulticaster().threadStarted(DebugProcessEvents.this, thread);
@@ -168,6 +169,7 @@ public class DebugProcessEvents extends DebugProcessImpl {
                 processed++;
                 final ThreadReference thread = ((ThreadDeathEvent)event).thread();
                 getManagerThread().schedule(new DebuggerCommandImpl() {
+                  @Override
                   protected void action() throws Exception {
                     getVirtualMachineProxy().threadStopped(thread);
                     myDebugProcessDispatcher.getMulticaster().threadStopped(DebugProcessEvents.this, thread);
@@ -175,15 +177,15 @@ public class DebugProcessEvents extends DebugProcessImpl {
                 });
               }
             }
-            
+
             if (processed == eventSet.size()) {
               eventSet.resume();
               continue;
             }
 
             getManagerThread().invokeAndWait(new DebuggerCommandImpl() {
+              @Override
               protected void action() throws Exception {
-                
                 if (eventSet.suspendPolicy() == EventRequest.SUSPEND_ALL && !DebuggerSession.enableBreakpointsDuringEvaluation()) {
                   // check if there is already one request with policy SUSPEND_ALL
                   for (SuspendContextImpl context : getSuspendManager().getEventContexts()) {
@@ -193,12 +195,10 @@ public class DebugProcessEvents extends DebugProcessImpl {
                     }
                   }
                 }
-                
+
                 final SuspendContextImpl suspendContext = getSuspendManager().pushSuspendContext(eventSet);
-                
                 for (EventIterator eventIterator = eventSet.eventIterator(); eventIterator.hasNext();) {
                   final Event event = eventIterator.nextEvent();
-
                   //if (LOG.isDebugEnabled()) {
                   //  LOG.debug("EVENT : " + event);
                   //}
@@ -207,10 +207,7 @@ public class DebugProcessEvents extends DebugProcessImpl {
                       //Sun WTK fails when J2ME when event set is resumed on VMStartEvent
                       processVMStartEvent(suspendContext, (VMStartEvent)event);
                     }
-                    else if (event instanceof VMDeathEvent) {
-                      processVMDeathEvent(suspendContext, event);
-                    }
-                    else if (event instanceof VMDisconnectEvent) {
+                    else if (event instanceof VMDeathEvent || event instanceof VMDisconnectEvent) {
                       processVMDeathEvent(suspendContext, event);
                     }
                     else if (event instanceof ClassPrepareEvent) {
@@ -240,7 +237,6 @@ public class DebugProcessEvents extends DebugProcessImpl {
                 }
               }
             });
-
           }
           catch (InternalException e) {
             LOG.debug(e);
@@ -264,13 +260,15 @@ public class DebugProcessEvents extends DebugProcessImpl {
       }
       catch (VMDisconnectedException e) {
         invokeVMDeathEvent();
-      } finally {
+      }
+      finally {
         Thread.interrupted(); // reset interrupted status
       }
     }
 
     private void invokeVMDeathEvent() {
       getManagerThread().invokeAndWait(new DebuggerCommandImpl() {
+        @Override
         protected void action() throws Exception {
           SuspendContextImpl suspendContext = getSuspendManager().pushSuspendContext(EventRequest.SUSPEND_NONE, 1);
           processVMDeathEvent(suspendContext, null);
@@ -307,7 +305,7 @@ public class DebugProcessEvents extends DebugProcessImpl {
     if(myState.compareAndSet(STATE_INITIAL, STATE_ATTACHED)) {
       final VirtualMachineProxyImpl machineProxy = getVirtualMachineProxy();
       final EventRequestManager requestManager = machineProxy.eventRequestManager();
-      
+
       if (machineProxy.canGetMethodReturnValues()) {
         myReturnValueWatcher = new MethodReturnValueWatcher(requestManager);
       }
@@ -378,7 +376,7 @@ public class DebugProcessEvents extends DebugProcessImpl {
     RequestHint hint = (RequestHint)event.request().getProperty("hint");
 
     deleteStepRequests(event.thread());
-    
+
     boolean shouldResume = false;
 
     final Project project = getProject();
@@ -426,8 +424,9 @@ public class DebugProcessEvents extends DebugProcessImpl {
     preprocessEvent(suspendContext, thread);
 
     //we use schedule to allow processing other events during processing this one
-    //this is especially nesessary if a method is breakpoint condition
+    //this is especially necessary if a method is breakpoint condition
     getManagerThread().schedule(new SuspendContextCommandImpl(suspendContext) {
+      @Override
       public void contextAction() throws Exception {
         final SuspendManager suspendManager = getSuspendManager();
         SuspendContextImpl evaluatingContext = SuspendManagerUtil.getEvaluatingContext(suspendManager, getSuspendContext().getThread());
@@ -441,7 +440,7 @@ public class DebugProcessEvents extends DebugProcessImpl {
         final LocatableEventRequestor requestor = (LocatableEventRequestor) getRequestsManager().findRequestor(event.request());
 
         boolean resumePreferred = requestor != null && DebuggerSettings.SUSPEND_NONE.equals(requestor.getSuspendPolicy());
-        boolean requestHit = false;
+        boolean requestHit;
         try {
           requestHit = (requestor != null) && requestor.processLocatableEvent(this, event);
         }
@@ -451,6 +450,7 @@ public class DebugProcessEvents extends DebugProcessImpl {
           }
           final boolean[] considerRequestHit = new boolean[]{true};
           DebuggerInvocationUtil.invokeAndWait(getProject(), new Runnable() {
+            @Override
             public void run() {
               DebuggerPanelsManager.getInstance(getProject()).toFront(mySession);
               final String displayName = requestor instanceof Breakpoint? ((Breakpoint)requestor).getDisplayName() : requestor.getClass().getSimpleName();
index 3d73ebe4832ca49b8c1abc603da2da9ad558a3fa..4f10e68440b9087fe31d0f15ab4d695e385fd410 100644 (file)
@@ -44,10 +44,7 @@ import com.intellij.execution.CantRunException;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.ExecutionResult;
 import com.intellij.execution.configurations.RemoteConnection;
-import com.intellij.execution.process.ProcessAdapter;
-import com.intellij.execution.process.ProcessEvent;
-import com.intellij.execution.process.ProcessListener;
-import com.intellij.execution.process.ProcessOutputTypes;
+import com.intellij.execution.process.*;
 import com.intellij.execution.runners.ExecutionUtil;
 import com.intellij.idea.ActionsBundle;
 import com.intellij.openapi.Disposable;
@@ -352,10 +349,16 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
     return new CompoundPositionManager(new PositionManagerImpl(this));
   }
 
+  @Override
   public void printToConsole(final String text) {
     myExecutionResult.getProcessHandler().notifyTextAvailable(text, ProcessOutputTypes.SYSTEM);
   }
 
+  @Override
+  public ProcessHandler getProcessHandler() {
+    return myExecutionResult.getProcessHandler();
+  }
+
   /**
    *
    * @param suspendContext
@@ -651,8 +654,8 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
 
   public void addProcessListener(ProcessListener processListener) {
     synchronized(myProcessListeners) {
-      if(getExecutionResult() != null) {
-        getExecutionResult().getProcessHandler().addProcessListener(processListener);
+      if(getProcessHandler() != null) {
+        getProcessHandler().addProcessListener(processListener);
       }
       else {
         myProcessListeners.add(processListener);
@@ -662,8 +665,8 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
 
   public void removeProcessListener(ProcessListener processListener) {
     synchronized (myProcessListeners) {
-      if(getExecutionResult() != null) {
-        getExecutionResult().getProcessHandler().removeProcessListener(processListener);
+      if(getProcessHandler() != null) {
+        getProcessHandler().removeProcessListener(processListener);
       }
       else {
         myProcessListeners.remove(processListener);
@@ -915,11 +918,32 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
                                                                                 ClassNotLoadedException,
                                                                                 IncompatibleThreadStateException,
                                                                                 InvalidTypeException;
-    public E start(EvaluationContextImpl evaluationContext, Method method) throws EvaluateException {
-      return start(evaluationContext, method, false);
+
+
+    E start(EvaluationContextImpl evaluationContext, Method method, boolean internalEvaluate) throws EvaluateException {
+      while (true) {
+        try {
+          return startInternal(evaluationContext, method, internalEvaluate);
+        }
+        catch (ClassNotLoadedException e) {
+          ReferenceType loadedClass = null;
+          try {
+            if (evaluationContext.isAutoLoadClasses()) {
+              loadedClass = loadClass(evaluationContext, e.className(), evaluationContext.getClassLoader());
+            }
+          }
+          catch (Exception ignored) {
+            loadedClass = null;
+          }
+          if (loadedClass == null) {
+            throw EvaluateExceptionUtil.createEvaluateException(e);
+          }
+        }
+      }
     }
 
-    public E start(EvaluationContextImpl evaluationContext, Method method, boolean internalEvaluate) throws EvaluateException {
+    E startInternal(EvaluationContextImpl evaluationContext, Method method, boolean internalEvaluate)
+      throws EvaluateException, ClassNotLoadedException {
       DebuggerManagerThreadImpl.assertIsManagerThread();
       SuspendContextImpl suspendContext = evaluationContext.getSuspendContext();
       SuspendManagerUtil.assertSuspendContext(suspendContext);
@@ -954,26 +978,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
 
         getVirtualMachineProxy().clearCaches();
 
-        while (true) {
-          try {
-            return invokeMethodAndFork(suspendContext);
-          }
-          catch (ClassNotLoadedException e) {
-            ReferenceType loadedClass;
-            try {
-              loadedClass = evaluationContext.isAutoLoadClasses() ? loadClass(evaluationContext, e.className(), evaluationContext.getClassLoader()) : null;
-            }
-            catch (EvaluateException ignored) {
-              loadedClass = null;
-            }
-            if (loadedClass == null) {
-              throw EvaluateExceptionUtil.createEvaluateException(e);
-            }
-          }
-        }
-      }
-      catch (ClassNotLoadedException e) {
-        throw EvaluateExceptionUtil.createEvaluateException(e);
+        return invokeMethodAndFork(suspendContext);
       }
       catch (InvocationException e) {
         throw EvaluateExceptionUtil.createEvaluateException(e);
@@ -1113,7 +1118,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
         }
         return objRef.invokeMethod(thread, method, args, invokePolicy | invocationOptions);
       }
-    }.start((EvaluationContextImpl)evaluationContext, method);
+    }.start((EvaluationContextImpl)evaluationContext, method, false);
   }
 
   private static ThreadReference getEvaluationThread(final EvaluationContext evaluationContext) throws EvaluateException {