Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Mon, 31 May 2010 15:21:04 +0000 (19:21 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Mon, 31 May 2010 15:21:04 +0000 (19:21 +0400)
commit275f48c7ce722ae2b19090d02f1a8a478ebe8b6a
treee1fd7cb10aea42c69fabfbaf33b9701ed122f34c
parent496c952bad8e8370edaf609d35bc39db1588be1f
parent2d6dc187ea5960d9fbba84593504aa5f0c2c6af9
Merge branch 'master' of git.labs.intellij.net:idea/community
117 files changed:
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java
java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactPackagingProcessingItem.java
java/execution/openapi/src/com/intellij/execution/configurations/JavaRunConfigurationModule.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/SuppressFix.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantElseAction.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.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/ConvertAbsolutePathToRelativeIntentionAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/MakeTypeGenericAction.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/psi/impl/AllowedApiFilterExtension.java
java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.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/testIntegration/createTest/CreateTestAction.java
java/java-tests/testData/refactoring/methodDuplicatesMisc/CorrectThis.java
java/java-tests/testData/refactoring/renameCollisions/RenameTypeParameterToExistingClassName.java
java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java
java/openapi/src/com/intellij/codeInsight/intention/AddAnnotationFix.java
platform/lang-api/src/com/intellij/codeInsight/intention/PsiElementBaseIntentionAction.java
platform/lang-api/src/com/intellij/execution/configurations/ModuleBasedConfiguration.java
platform/lang-api/src/com/intellij/openapi/module/ModuleUtil.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/AbstractSuppressByNoInspectionCommentFix.java
platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoComponent.java
platform/lang-impl/src/com/intellij/codeInsight/problems/WolfTheProblemSolverImpl.java
platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java
platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanel.java
platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java
platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProjectProfileManager.java
platform/platform-api/src/com/intellij/execution/process/ProcessTerminatedListener.java
platform/platform-api/src/com/intellij/notification/Notification.java
platform/platform-api/src/com/intellij/openapi/wm/StatusBar.java
platform/platform-api/src/com/intellij/openapi/wm/StatusBarCustomComponentFactory.java
platform/platform-api/src/com/intellij/openapi/wm/StatusBarInfo.java
platform/platform-api/src/com/intellij/openapi/wm/StatusBarWidget.java
platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.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/ide/util/GotoLineNumberDialog.java
platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java
platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java
platform/platform-impl/src/com/intellij/notification/impl/ProjectNotificationsComponent.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/TextEditorComponent.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java
platform/platform-impl/src/com/intellij/openapi/progress/impl/BackgroundableProcessIndicator.java
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshProgress.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/WindowManagerImpl.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/MacStatusBarUI.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/ProcessIconWidget.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ShowProcessWindowAction.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusBarUI.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/util/src/com/intellij/util/lang/UrlClassLoader.java
platform/util/src/com/intellij/util/ui/UIUtil.java
platform/vcs-api/src/com/intellij/openapi/vcs/QuantitySelection.java
platform/vcs-api/src/com/intellij/openapi/vcs/SelectionResult.java
platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesPanel.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/quickedit/QuickEditEditor.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/base/Intention.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/base/MutablyNamedIntention.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/decls/MoveDeclarationIntention.java
plugins/IntentionPowerPak/src/com/siyeh/ipp/fqnames/ReplaceFullyQualifiedNameWithImportIntention.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/SuppressForMemberFix.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgChangesetStatus.java
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgCurrentBranchStatus.java
plugins/java-i18n/src/com/intellij/codeInspection/i18n/SuppressByCommentOutAction.java
plugins/properties/src/com/intellij/lang/properties/PropertySuppressableInspectionBase.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfiguration.java
plugins/svn4idea/src/org/jetbrains/idea/svn/checkout/CheckoutEventHandler.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/BranchMerger.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/QuickMerge.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/Merger.java
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/SvnIntegrateChangesTask.java
plugins/svn4idea/src/org/jetbrains/idea/svn/mergeinfo/OneRecursiveShotMergeInfoWorker.java
plugins/svn4idea/src/org/jetbrains/idea/svn/update/UpdateEventHandler.java
plugins/ui-designer/src/com/intellij/uiDesigner/componentTree/QuickFixManagerImpl.java
plugins/ui-designer/src/com/intellij/uiDesigner/designSurface/PasteProcessor.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/XsltResourceProvider.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/validation/inspections/SuppressInspectionAction.java
xml/impl/src/com/intellij/javaee/ResourceRegistrarImpl.java
xml/openapi/src/com/intellij/codeInspection/XmlSuppressableInspectionTool.java