show conflicts unification;
commit3973debce54af397f51145d54dd5447c04f6be7a
authoranna <anna.kozlova@jetbrains.com>
Mon, 26 Oct 2009 10:20:49 +0000 (26 13:20 +0300)
committeranna <anna.kozlova@jetbrains.com>
Tue, 27 Oct 2009 09:23:55 +0000 (27 12:23 +0300)
treee47c9dcbb40a96d98e50497107f743a36adfd0ef
parent5a43e94baf47cd34eb36346fb7f102349614ff50
show conflicts unification;
encapsulate fields: rise conflicts; tests
29 files changed:
java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDescriptor.java [new file with mode: 0644]
java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java
java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java
java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java
java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderProcessor.java
java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java
java/java-tests/testData/refactoring/encapsulateFields/alreadyExist/after/Test.java [new file with mode: 0644]
java/java-tests/testData/refactoring/encapsulateFields/alreadyExist/before/Test.java [new file with mode: 0644]
java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnly/after/Test.java [new file with mode: 0644]
java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnly/before/Test.java [new file with mode: 0644]
java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnlyInHierarchy/after/Test.java [new file with mode: 0644]
java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnlyInHierarchy/before/Test.java [new file with mode: 0644]
java/java-tests/testData/refactoring/removemiddleman/interface/after/Test.java
java/java-tests/testData/refactoring/removemiddleman/interfaceDelegation/after/Test.java
java/java-tests/testData/refactoring/removemiddleman/presentGetter/after/Test.java
java/java-tests/testData/refactoring/removemiddleman/siblings/after/D.java
java/java-tests/testData/refactoring/removemiddleman/siblings/after/Test.java
java/java-tests/testSrc/com/intellij/refactoring/EncapsulateFieldsTest.java [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java
java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java
java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java
java/java-tests/testSrc/com/intellij/refactoring/MoveMembersTest.java
java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java
java/java-tests/testSrc/com/intellij/refactoring/RemoveMiddleManTest.java
java/java-tests/testSrc/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodTest.java
platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java