Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Tue, 8 Jun 2010 12:56:28 +0000 (16:56 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Tue, 8 Jun 2010 12:56:28 +0000 (16:56 +0400)
commit6c796f35e755f989742acb3fcb4b9786ec10619b
treed313f61c18282ddd9471b45c5d931a94b84d69ae
parentf126dc17d1b6ed25c9b5794ef24adab7c40d0411
parent68f2ce99d94c5d8ee1b96f7da4fccac1973f1d93
Merge branch 'master' of git.labs.intellij.net:idea/community
218 files changed:
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantElseAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/AddDeprecationAnnotationFix.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/ColorChooserIntentionAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/MoveInitializerToConstructorAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java
java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
java/java-impl/src/com/intellij/refactoring/rename/RenameJavaClassProcessor.java
java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java
java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java
java/java-tests/testData/refactoring/inlineLocal/Wildcard.java
java/java-tests/testSrc/com/intellij/refactoring/ExtractEnumTest.java
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java
java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java
java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java
platform/lang-api/src/com/intellij/execution/junit/RuntimeConfigurationProducer.java
platform/lang-impl/src/com/intellij/codeInsight/problems/WolfTheProblemSolverImpl.java
platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
platform/lang-impl/src/com/intellij/execution/actions/RunContextAction.java
platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
platform/lang-impl/src/com/intellij/execution/rmi/RemoteProcessSupport.java
platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java
platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanel.java
platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesDialog.java
platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeBuilder.java
platform/platform-api/src/com/intellij/openapi/wm/StatusBar.java
platform/platform-api/src/com/intellij/ui/ListScrollingUtil.java
platform/platform-api/src/com/intellij/util/ui/AnimatedIcon.java
platform/platform-impl/src/com/intellij/diagnostic/IdeMessagePanel.java
platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java
platform/platform-impl/src/com/intellij/notification/impl/ProjectNotificationsComponent.java
platform/platform-impl/src/com/intellij/openapi/command/impl/DocumentReferenceManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeymapImpl.java
platform/platform-impl/src/com/intellij/openapi/wm/ex/StatusBarEx.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeFrameImpl.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/IdeRootPane.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/TestWindowManager.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InfoAndProgressPanel.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InsertOverwritePanel.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/MemoryUsagePanel.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/PositionPanel.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ShowProcessWindowAction.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/TextPanel.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java
platform/platform-impl/testSrc/com/intellij/ide/util/treeView/BaseTreeTestCase.java
platform/platform-impl/testSrc/com/intellij/ide/util/treeView/TreeUiTest.java
platform/util/src/com/intellij/openapi/diagnostic/Log.java
platform/util/src/com/intellij/util/ui/UIUtil.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java
plugins/IntelliLang/src/org/intellij/plugins/intelliLang/Configuration.java
plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
plugins/groovy/src/org/intellij/plugins/intelliLang/inject/groovy/PatternEditorContextMembersProvider.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrTryCatchStatement.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentLabelImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduceParameter/java2groovy/GroovyIntroduceParameterMethodUsagesProcessor.java
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
plugins/groovy/testdata/refactoring/changeSignatureForJava/CovariantReturnType.java
plugins/groovy/testdata/refactoring/changeSignatureForJava/CovariantReturnType_after.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgContentRevision.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgCurrentBranchStatusUpdater.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgErrorHandler.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgExecutableValidator.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgFileRevision.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgIdeConfigurable.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgIncomingStatusUpdater.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgOutgoingStatusUpdater.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectConfigurable.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgRevisionNumber.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgUtil.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgVirtualFileListener.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractFilesAction.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMarkResolved.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMercurialMenu.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgMqRebaseAction.java
plugins/hg4idea/src/org/zmlx/hg4idea/action/HgRunConflictResolverAction.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCatCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgChangesetsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCloneCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandAuthenticator.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandResult.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandService.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommitCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgHeadsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgIdentifyCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgIncomingCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgLogCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgMergeCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgOutgoingCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgParentsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPullCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgPushCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgResolveCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevertCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevisionsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgStatusCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgTrackFileNamesAccrossRevisionsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgVersionCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgWorkingCopyRevisionsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/ShellCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/SocketServer.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCachingCommitedChangesProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgChangeProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCheckoutProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCommitedChangeList.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCurrentBinaryContentRevision.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCurrentContentRevision.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgRollbackEnvironment.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotation.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotationProvider.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/commit/HgCheckinEnvironment.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/commit/HgCommitSession.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgConflictResolver.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgHeadMerger.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgIntegrateEnvironment.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgRegularUpdater.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdateEnvironment.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdater.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgUpdaterFactory.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgChangesetStatus.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgCloneDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgConfigurationIdePanel.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgCurrentBranchStatus.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgIntegrateDialog.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateDialog.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/AbstractHgTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgAddTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgCatTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgCopyTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgDeleteTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgFromClonedTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgLogTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgMoveTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgRenameTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgResolveConflictTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgRevertTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgUpdateTestCase.java
plugins/java-i18n/src/com/intellij/codeInspection/i18n/SuppressByCommentOutAction.java
plugins/maven/facade-api/src/org/jetbrains/idea/maven/facade/MavenFacadeEmbedder.java
plugins/maven/facade-api/src/org/jetbrains/idea/maven/facade/MavenFacadeProcessCanceledException.java
plugins/maven/facade-api/src/org/jetbrains/idea/maven/model/MavenBuild.java
plugins/maven/facade-api/src/org/jetbrains/idea/maven/model/MavenProfile.java
plugins/maven/facade-impl/src/org/jetbrains/idea/maven/facade/MavenFacadeLocator.java
plugins/maven/facade-impl/src/org/jetbrains/idea/maven/facade/embedder/CustomArtifactFactory.java
plugins/maven/facade-impl/src/org/jetbrains/idea/maven/facade/embedder/MavenFacadeIndexerImpl.java
plugins/maven/facade-impl/src/org/jetbrains/idea/maven/facade/nexus/ArtifactType.java
plugins/maven/facade-impl/src/org/jetbrains/idea/maven/facade/nexus/Endpoint.java
plugins/maven/facade-impl/src/org/jetbrains/idea/maven/facade/nexus/ObjectFactory.java
plugins/maven/facade-impl/src/org/jetbrains/idea/maven/facade/nexus/Repositories.java
plugins/maven/facade-impl/src/org/jetbrains/idea/maven/facade/nexus/RepositoryMetaData.java
plugins/maven/facade-impl/src/org/jetbrains/idea/maven/facade/nexus/SearchResult.java
plugins/maven/facade-impl/src/org/jetbrains/idea/maven/facade/nexus/SearchResults.java
plugins/maven/facade-impl/test/org/jetbrains/idea/maven/embedder/MavenFacadeEmbedderTest.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesArtifactIdConverter.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenArtifactCoordinatesConverter.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenParentRelativePathConverter.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/generate/GenerateDependencyAction.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenExternalParameters.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunner.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/FacetImporter.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/GroovyImporter.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImporter.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenRootModelAdapter.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchDialog.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndicesManager.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManager.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsStructure.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenConsole.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEmbeddersManager.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReaderResult.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessorEmptyTask.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenAttachSourcesProvider.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenPluginInfo.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/actions/MavenActionUtil.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenFrameworkSupportProvider.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleWizardStep.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectOpenProcessor.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenCustomRepositoryHelper.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/FoldersImportingTest.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/InvalidProjectImportingTest.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesManagerTest.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesStressTest.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenPluginInfoReaderTest.java
plugins/maven/src/test/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilderTest.java
plugins/properties/src/com/intellij/lang/properties/PropertySuppressableInspectionBase.java
plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java
plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java
xml/impl/src/com/intellij/codeInspection/htmlInspections/XmlInspectionToolProvider.java
xml/impl/src/com/intellij/javaee/ResourceRegistrarImpl.java
xml/impl/src/com/intellij/psi/formatter/xml/XmlBlock.java
xml/impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java
xml/openapi/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java