scary code for resolving conflicts between renamed method and static import (part...
commit5a11b867eab3f7db52b8139aa661a2fe7ee00a5d
authorDmitry Jemerov <yole@intellij.com>
Wed, 16 Jul 2008 15:44:54 +0000 (16 19:44 +0400)
committerDmitry Jemerov <yole@intellij.com>
Wed, 16 Jul 2008 15:44:54 +0000 (16 19:44 +0400)
tree3de115cebc4b3f3964b9096178c460d2c0ad0f5c
parent1cf263e7ba0096cb3c5ba37aa49d58451ed4b6c2
scary code for resolving conflicts between renamed method and static import (part of IDEADEV-25198)
20 files changed:
lang-api/src/com/intellij/refactoring/util/RelatedUsageInfo.java [new file with mode: 0644]
lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
refactoring/impl/com/intellij/refactoring/rename/MemberHidesStaticImportUsageInfo.java [new file with mode: 0644]
refactoring/impl/com/intellij/refactoring/rename/RenameJavaMemberProcessor.java
refactoring/impl/com/intellij/refactoring/rename/RenameJavaMethodProcessor.java
refactoring/tests/com/intellij/refactoring/RenameCollisionsTest.java
testData/refactoring/renameCollisions/RenameMethodIndiInstancesInnerToOuter.java
testData/refactoring/renameCollisions/RenameMethodIndiInstancesInnerToOuter.java.after
testData/refactoring/renameCollisions/RenameMethodIndiInstancesOuterToInner.java
testData/refactoring/renameCollisions/RenameMethodIndiInstancesOuterToInner.java.after
testData/refactoring/renameCollisions/RenameMethodInnerInstanceToOuterInstance.java
testData/refactoring/renameCollisions/RenameMethodInnerInstanceToOuterInstance.java.after
testData/refactoring/renameCollisions/RenameMethodInnerStaticToOuterStatic.java
testData/refactoring/renameCollisions/RenameMethodInnerStaticToOuterStatic.java.after
testData/refactoring/renameCollisions/RenameMethodOuterInstanceToInnerInstance.java
testData/refactoring/renameCollisions/RenameMethodOuterInstanceToInnerInstance.java.after
testData/refactoring/renameCollisions/RenameMethodOuterStaticToInnerStatic.java
testData/refactoring/renameCollisions/RenameMethodOuterStaticToInnerStatic.java.after
testData/refactoring/renameCollisions/RenameMethodStaticToAlien.java
testData/refactoring/renameCollisions/RenameMethodStaticToAlien.java.after