git.jetbrains.org - idea/community.git/commit

projects / idea / community.git / commit

author	Maxim Medvedev <maxim.medvedev@jetbrains.com>
	Thu, 22 Apr 2010 12:47:15 +0000 (16:47 +0400)
committer	Maxim Medvedev <maxim.medvedev@jetbrains.com>
	Thu, 22 Apr 2010 12:47:15 +0000 (16:47 +0400)
commit	184632cb6365342e91d693a9cbb11e641c17c544
tree	a3d0c3b353267b862c62ad2a2b250efa405396c3	tree
parent	7ee374a0661ff9715d0335dad7dfd7cf343fab6e	commit \| diff
parent	ff63d5e3e3548e7792b3c8f5c2b04cc76191c686	commit \| diff

Merge commit 'origin/master' into changeSignature

Conflicts:
java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureTargetUtil.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureHandler.java

34 files changed:

java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java	diff1 \|	diff2 \|	blob \| history
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java	diff1 \|	diff2 \|	blob \| history
java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java	diff1 \|	diff2 \|	blob \| history
java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java	diff1 \|	diff2 \|	blob \| history
java/java-tests/testData/codeInsight/javadocIG/ideadev2326.java	\|	diff2 \|	blob \| history
java/java-tests/testData/inspection/redundantTypeArgs/ReturnPrimitiveTypes.java	\|	diff2 \|	blob \| history
java/java-tests/testData/psi/formatter/java/SCR11799.java	\|	diff2 \|	blob \| history
java/java-tests/testData/psi/formatter/java/SCR11799_after.java	\|	diff2 \|	blob \| history
java/java-tests/testData/refactoring/changeSignatureTarget/inTypeArguments.java	diff1 \|	diff2 \|	blob \| history
java/java-tests/testSrc/com/intellij/psi/formatter/JavaFormatterTest.java	\|	diff2 \|	blob \| history
java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java	diff1 \|	diff2 \|	blob \| history
platform/lang-api/src/com/intellij/psi/impl/ElementBase.java	diff1 \|	diff2 \|	blob \| history
platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java	diff1 \|	diff2 \|	blob \| history
platform/lvcs-impl/src/com/intellij/history/core/storage/StreamUtil.java	diff1 \|	diff2 \|	blob \| history
platform/lvcs-impl/testSrc/com/intellij/historyIntegrTests/FileListeningTest.java	diff1 \|	diff2 \|	blob \| history
platform/platform-api/src/com/intellij/ui/content/ContentManager.java	diff1 \|	diff2 \|	blob \| history
platform/platform-api/src/com/intellij/util/ui/EmptyTextHelper.java	diff1 \|	diff2 \|	blob \| history
platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java	diff1 \|	diff2 \|	blob \| history
platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java	diff1 \|	diff2 \|	blob \| history
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java	diff1 \|	diff2 \|	blob \| history
platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java	diff1 \|	diff2 \|	blob \| history
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeadlessManagerImpl.java	diff1 \|	diff2 \|	blob \| history
platform/platform-resources/src/META-INF/LangExtensionPoints.xml	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/generate/GenerateAddManagedDependencyAction.java	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenModelInspection.java	\|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/ExtractDependenciesAction.java	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenEmbedderUtilEx.java	\|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndicesManager.java	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifact.java	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/test/java/org/jetbrains/idea/maven/embedder/MavenEmbedderWrapperTest.java	diff1 \|	diff2 \|	blob \| history
resources/src/META-INF/IdeaPlugin.xml	diff1 \|	diff2 \|	blob \| history
xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java	diff1 \|	diff2 \|	blob \| history

IntelliJ IDEA Community Edition and IntelliJ Platform.

RSS Atom

java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java	diff1 \|	diff2 \|	blob \| history
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java	diff1 \|	diff2 \|	blob \| history
java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java	diff1 \|	diff2 \|	blob \| history
java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java	diff1 \|	diff2 \|	blob \| history
java/java-tests/testData/codeInsight/javadocIG/ideadev2326.java	\|	diff2 \|	blob \| history
java/java-tests/testData/inspection/redundantTypeArgs/ReturnPrimitiveTypes.java	\|	diff2 \|	blob \| history
java/java-tests/testData/psi/formatter/java/SCR11799.java	\|	diff2 \|	blob \| history
java/java-tests/testData/psi/formatter/java/SCR11799_after.java	\|	diff2 \|	blob \| history
java/java-tests/testData/refactoring/changeSignatureTarget/inTypeArguments.java	diff1 \|	diff2 \|	blob \| history
java/java-tests/testSrc/com/intellij/psi/formatter/JavaFormatterTest.java	\|	diff2 \|	blob \| history
java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java	diff1 \|	diff2 \|	blob \| history
platform/lang-api/src/com/intellij/psi/impl/ElementBase.java	diff1 \|	diff2 \|	blob \| history
platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java	diff1 \|	diff2 \|	blob \| history
platform/lvcs-impl/src/com/intellij/history/core/storage/StreamUtil.java	diff1 \|	diff2 \|	blob \| history
platform/lvcs-impl/testSrc/com/intellij/historyIntegrTests/FileListeningTest.java	diff1 \|	diff2 \|	blob \| history
platform/platform-api/src/com/intellij/ui/content/ContentManager.java	diff1 \|	diff2 \|	blob \| history
platform/platform-api/src/com/intellij/util/ui/EmptyTextHelper.java	diff1 \|	diff2 \|	blob \| history
platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java	diff1 \|	diff2 \|	blob \| history
platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java	diff1 \|	diff2 \|	blob \| history
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java	diff1 \|	diff2 \|	blob \| history
platform/platform-impl/src/com/intellij/openapi/wm/impl/FocusManagerImpl.java	diff1 \|	diff2 \|	blob \| history
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeadlessManagerImpl.java	diff1 \|	diff2 \|	blob \| history
platform/platform-resources/src/META-INF/LangExtensionPoints.xml	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/generate/GenerateAddManagedDependencyAction.java	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenModelInspection.java	\|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/extract/ExtractDependenciesAction.java	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenEmbedderUtilEx.java	\|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndicesManager.java	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifact.java	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java	diff1 \|	diff2 \|	blob \| history
plugins/maven/src/test/java/org/jetbrains/idea/maven/embedder/MavenEmbedderWrapperTest.java	diff1 \|	diff2 \|	blob \| history
resources/src/META-INF/IdeaPlugin.xml	diff1 \|	diff2 \|	blob \| history
xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java	diff1 \|	diff2 \|	blob \| history