test++, compilation fixed again

java/java-tests/testData/refactoring/inheritanceToDelegation/abstractBase/after/A.java

@@ -0,0 +1,11 @@
+public abstract class A {
+    public final MyBase myDelegate = new MyBase();
+
+    protected abstract void run();
+
+    private class MyBase extends Base {
+        public void run() {
+            A.this.run();
+        }
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/abstractBase/after/Base.java

@@ -0,0 +1,2 @@
+public abstract class Base implements Runnable {
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/abstractBase/before/A.java

@@ -0,0 +1,2 @@
+public abstract class A extends Base {    
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/abstractBase/before/Base.java

@@ -0,0 +1,2 @@
+public abstract class Base implements Runnable {
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/abstractBase1/after/A.java

@@ -0,0 +1,9 @@
+public class A {
+    private final MyBase myDelegate = new MyBase();
+
+    private class MyBase extends Base {
+        public void run() {
+             System.out.println("From A");
+        }
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/abstractBase1/after/Base.java

@@ -0,0 +1,2 @@
+public abstract class Base implements Runnable {
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/abstractBase1/before/A.java

@@ -0,0 +1,5 @@
+public class A extends Base {
+     public void run() {
+          System.out.println("From A");
+     }     
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/abstractBase1/before/Base.java

@@ -0,0 +1,2 @@
+public abstract class Base implements Runnable {
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/annotations/after/A.java

@@ -0,0 +1,9 @@
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
+
+class A {
+    @Nullable
+    public Object methodFromA(@NotNull String s) {
+        return null;
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/annotations/after/B.java

@@ -0,0 +1,11 @@
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
+
+class B {
+    public final A myDelegate = new A();
+
+    @Nullable
+    public Object methodFromA(@NotNull String s) {
+        return myDelegate.methodFromA(s);
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/annotations/before/A.java

@@ -0,0 +1,9 @@
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
+
+class A {
+    @Nullable
+    public Object methodFromA(@NotNull String s) {
+        return null;
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/annotations/before/B.java

@@ -0,0 +1,2 @@
+class B extends A {       
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/getter/after/A.java

@@ -0,0 +1,7 @@
+class A {
+    public void methodFromA() {
+    }
+    public int intMethodFromA(int i) {
+        return 0;
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/getter/after/B.java

@@ -0,0 +1,15 @@
+class B {
+    private final A myDelegate = new A();
+
+    public A getMyDelegate() {
+        return myDelegate;
+    }
+
+    public void methodFromA() {
+        myDelegate.methodFromA();
+    }
+
+    public int intMethodFromA(int i) {
+        return myDelegate.intMethodFromA(i);
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/getter/before/A.java

@@ -0,0 +1,7 @@
+class A {
+    public void methodFromA() {
+    }
+    public int intMethodFromA(int i) {
+        return 0;
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/getter/before/B.java

@@ -0,0 +1,2 @@
+class B extends A {       
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/hierarchy/after/A.java

@@ -0,0 +1,4 @@
+public class A {
+    void methodFromA() {
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/hierarchy/after/Base.java

@@ -0,0 +1,2 @@
+public class Base extends A {
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/hierarchy/after/Test.java

@@ -0,0 +1,3 @@
+public interface Test {
+    A getA();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/hierarchy/after/X.java

@@ -0,0 +1,10 @@
+public class X {
+    A myField;
+    private final Base myDelegate = new Base();
+
+    public void method(Test t) {
+         myField = t.getA();
+         myField.methodFromA();
+         t.getA().methodFromA();
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/hierarchy/before/A.java

@@ -0,0 +1,4 @@
+public class A {
+    void methodFromA() {
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/hierarchy/before/Base.java

@@ -0,0 +1,2 @@
+public class Base extends A {
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/hierarchy/before/Test.java

@@ -0,0 +1,3 @@
+public interface Test {
+    A getA();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/hierarchy/before/X.java

@@ -0,0 +1,8 @@
+public class X extends Base {
+    A myField;
+    public void method(Test t) {
+         myField = t.getA();
+         myField.methodFromA();
+         t.getA().methodFromA();
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClass/after/A.java

@@ -0,0 +1,17 @@
+public class A {
+    public final MyBase myDelegate;
+
+    public A() {
+        myDelegate = new MyBase(27);
+    }
+
+    private class MyBase extends Base {
+        public MyBase(int i) {
+            super(i);
+        }
+
+        public void methodToOverride() {
+            System.out.println("Hello from B");
+        }
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClass/after/Base.java

@@ -0,0 +1,11 @@
+public class Base {
+    protected int baseField;
+    public Base() {
+    }
+    public Base(int i) {
+        baseField = i;
+    }
+    public void methodToOverride() {
+        System.out.println("Hello from Base");
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClass/before/A.java

@@ -0,0 +1,8 @@
+public class A extends Base {
+    public A() {
+        super(27);
+    }
+    public void methodToOverride() {
+        System.out.println("Hello from B");
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClass/before/Base.java

@@ -0,0 +1,11 @@
+public class Base {
+    protected int baseField;
+    public Base() {
+    }
+    public Base(int i) {
+        baseField = i;
+    }
+    public void methodToOverride() {
+        System.out.println("Hello from Base");
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClassForInterface/after/A.java

@@ -0,0 +1,20 @@
+public class A extends BaseClass {
+    private final MyBaseInterface myBaseInterface = new MyBaseInterface();
+
+    public A() {
+    }
+
+    public A(String s) {
+        super(27);
+    }
+
+    public void baseInterfaceMethod() {
+        myBaseInterface.baseInterfaceMethod();
+    }
+
+    private class MyBaseInterface implements BaseInterface {
+        public void baseInterfaceMethod() {
+            System.out.println("Hi!");
+        }
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClassForInterface/after/BaseClass.java

@@ -0,0 +1,7 @@
+public BaseClass {
+    public BaseClass() {
+    }
+
+    public BaseClass(int i) {
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClassForInterface/after/BaseInterface.java

@@ -0,0 +1,3 @@
+public interface BaseInterface {
+    void baseInterfaceMethod();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClassForInterface/before/A.java

@@ -0,0 +1,12 @@
+public class A extends BaseClass implements BaseInterface {
+    public A() {
+    }
+
+    public A(String s) {
+        super(27);
+    }
+
+    public void baseInterfaceMethod() {
+        System.out.println("Hi!");
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClassForInterface/before/BaseClass.java

@@ -0,0 +1,7 @@
+public BaseClass {
+    public BaseClass() {
+    }
+
+    public BaseClass(int i) {
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClassForInterface/before/BaseInterface.java

@@ -0,0 +1,3 @@
+public interface BaseInterface {
+    void baseInterfaceMethod();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClassForInterfaceAbstract/after/A.java

@@ -0,0 +1,18 @@
+public abstract class A extends BaseClass {
+    private final MyBaseInterface myBaseInterface = new MyBaseInterface();
+
+    public A() {
+    }
+
+    public A(String s) {
+        super(27);
+    }
+
+    public abstract void baseInterfaceMethod();
+
+    private class MyBaseInterface implements BaseInterface {
+        public void baseInterfaceMethod() {
+            A.this.baseInterfaceMethod();
+        }
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClassForInterfaceAbstract/after/BaseClass.java

@@ -0,0 +1,7 @@
+public BaseClass {
+    public BaseClass() {
+    }
+
+    public BaseClass(int i) {
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClassForInterfaceAbstract/after/BaseInterface.java

@@ -0,0 +1,3 @@
+public interface BaseInterface {
+    void baseInterfaceMethod();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClassForInterfaceAbstract/before/A.java

@@ -0,0 +1,8 @@
+public abstract class A extends BaseClass implements BaseInterface {
+    public A() {
+    }
+
+    public A(String s) {
+        super(27);
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClassForInterfaceAbstract/before/BaseClass.java

@@ -0,0 +1,7 @@
+public BaseClass {
+    public BaseClass() {
+    }
+
+    public BaseClass(int i) {
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/innerClassForInterfaceAbstract/before/BaseInterface.java

@@ -0,0 +1,3 @@
+public interface BaseInterface {
+    void baseInterfaceMethod();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceDelegation/after/A.java

@@ -0,0 +1,21 @@
+public class A {
+    private final MyIntf myDelegate = new MyIntf();
+
+    public Intf getMyDelegate() {
+        return myDelegate;
+    }
+
+    public void method1() {
+        myDelegate.method1();
+    }
+
+    private class MyIntf implements Intf {
+        public void method1 () {
+            System.out.println("1");
+        }
+
+        public void method2 () {
+            System.out.println("2");
+        }
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceDelegation/after/Intf.java

@@ -0,0 +1,4 @@
+public interface Intf {
+    void method1();
+    void method2();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceDelegation/after/Usage.java

@@ -0,0 +1,12 @@
+public class Usage {
+    A a = new A();
+
+    public void usage() {
+        a.method1();
+        a.getMyDelegate().method2();
+        use(a.getMyDelegate());
+    }
+
+    private void use(Intf i) {
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceDelegation/before/A.java

@@ -0,0 +1,9 @@
+public class A implements Intf {
+    public void method1 () {
+        System.out.println("1");
+    }
+
+    public void method2 () {
+        System.out.println("2");
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceDelegation/before/Intf.java

@@ -0,0 +1,4 @@
+public interface Intf {
+    void method1();
+    void method2();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceDelegation/before/Usage.java

@@ -0,0 +1,12 @@
+public class Usage {
+    A a = new A();
+
+    public void usage() {
+        a.method1();
+        a.method2();
+        use(a);
+    }
+
+    private void use(Intf i) {
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceImplicitImplementation/after/A.java

@@ -0,0 +1,17 @@
+public class A extends ASuper {
+    private final MyIntf myDelegate = new MyIntf();
+
+    public Intf getMyDelegate() {
+        return myDelegate;
+    }
+
+    private class MyIntf implements Intf {
+        public void method1 () {
+            System.out.println("1");
+        }
+
+        public void method2() {
+            A.this.method2();
+        }
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceImplicitImplementation/after/ASuper.java

@@ -0,0 +1,5 @@
+public class ASuper {
+    public void method2 () {
+        System.out.println("2");
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceImplicitImplementation/after/Intf.java

@@ -0,0 +1,4 @@
+public interface Intf {
+    void method1();
+    void method2();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceImplicitImplementation/after/Usage.java

@@ -0,0 +1,12 @@
+public class Usage {
+    A a = new A();
+
+    public void usage() {
+        a.getMyDelegate().method1();
+        a.method2();
+        use(a.getMyDelegate());
+    }
+
+    private void use(Intf i) {
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceImplicitImplementation/before/A.java

@@ -0,0 +1,5 @@
+public class A extends ASuper implements Intf {
+    public void method1 () {
+        System.out.println("1");
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceImplicitImplementation/before/ASuper.java

@@ -0,0 +1,5 @@
+public class ASuper {
+    public void method2 () {
+        System.out.println("2");
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceImplicitImplementation/before/Intf.java

@@ -0,0 +1,4 @@
+public interface Intf {
+    void method1();
+    void method2();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaceImplicitImplementation/before/Usage.java

@@ -0,0 +1,12 @@
+public class Usage {
+    A a = new A();
+
+    public void usage() {
+        a.method1();
+        a.method2();
+        use(a);
+    }
+
+    private void use(Intf i) {
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaces/after/A.java

@@ -0,0 +1,11 @@
+public class A implements I {
+    private final Base myDelegate = new Base();
+
+    public Base getMyDelegate() {
+        return myDelegate;
+    }
+
+    public void methodFromI() {
+        myDelegate.methodFromI();
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaces/after/Base.java

@@ -0,0 +1,7 @@
+public class Base implements I, J {
+    public void methodFromI() {
+    }
+   
+    public void methodFromJ() {
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaces/after/I.java

@@ -0,0 +1,3 @@
+public interface I {
+    void methodFromI();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaces/after/J.java

@@ -0,0 +1,3 @@
+public interface J {
+    void methodFromJ();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaces/after/Usage.java

@@ -0,0 +1,23 @@
+class Usage {
+    private A myA = new A();
+    public void methodExpectingI(I i) {
+        i.methodFromI();
+    }
+
+    public J methodReturningJ() {
+        return myA.getMyDelegate();
+    }
+
+    public void methodExpectingJ(J j) {
+        j.methodFromJ();
+    }
+
+    public void main() {
+        A a = new A();
+        a.methodFromI();
+        a.getMyDelegate().methodFromJ();
+        methodExpectingI(a);
+        methodExpectingJ(a.getMyDelegate());
+        methodExpectingJ(myA.getMyDelegate());
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaces/before/A.java

@@ -0,0 +1,2 @@
+public class A extends Base {
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaces/before/Base.java

@@ -0,0 +1,7 @@
+public class Base implements I, J {
+    public void methodFromI() {
+    }
+   
+    public void methodFromJ() {
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaces/before/I.java

@@ -0,0 +1,3 @@
+public interface I {
+    void methodFromI();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaces/before/J.java

@@ -0,0 +1,3 @@
+public interface J {
+    void methodFromJ();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/interfaces/before/Usage.java

@@ -0,0 +1,23 @@
+class Usage {
+    private A myA = new A();
+    public void methodExpectingI(I i) {
+        i.methodFromI();
+    }
+
+    public J methodReturningJ() {
+        return myA;
+    }
+
+    public void methodExpectingJ(J j) {
+        j.methodFromJ();
+    }
+
+    public void main() {
+        A a = new A();
+        a.methodFromI();
+        a.methodFromJ();
+        methodExpectingI(a);
+        methodExpectingJ(a);
+        methodExpectingJ(myA);
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/multipleInterfaceDelegation/after/A.java

@@ -0,0 +1,13 @@
+public class A implements Intf {
+    public final MyIntf myDelegate = new MyIntf();
+
+    public void method1() {
+        myDelegate.method2();
+    }
+
+    private class MyIntf implements Intf2 {
+        public void method2 () {
+            System.out.println("2");
+        }
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/multipleInterfaceDelegation/after/Intf.java

@@ -0,0 +1,3 @@
+public interface Intf {
+    void method1();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/multipleInterfaceDelegation/after/Intf2.java

@@ -0,0 +1,3 @@
+public interface Intf2 {
+    void method2();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/multipleInterfaceDelegation/before/A.java

@@ -0,0 +1,9 @@
+public class A implements Intf, Intf2 {
+    public void method1() {
+        method2();
+    }
+
+    public void method2 () {
+        System.out.println("2");
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/multipleInterfaceDelegation/before/Intf.java

@@ -0,0 +1,3 @@
+public interface Intf {
+    void method1();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/multipleInterfaceDelegation/before/Intf2.java

@@ -0,0 +1,3 @@
+public interface Intf2 {
+    void method2();
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/overridenMethods/after/A.java

@@ -0,0 +1,23 @@
+class A {
+    int fieldFromA;
+    private final MyBase myDelegate = new MyBase();
+
+    public void firstMethodFromBase() {
+        myDelegate.firstMethodFromBase();
+    }
+
+    private class MyBase extends Base {
+        public void firstMethodFromBase() {
+            super.firstMethodFromBase();
+        }
+
+        public void secondMethodFromBase() {
+            fieldFromA = 27;
+            A.this.fieldFromA++;
+        }
+
+        Base getInstance() {
+            return this;
+        }
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/overridenMethods/after/Base.java

@@ -0,0 +1,12 @@
+public class Base implements Runnable {
+    void firstMethodFromBase() {
+    } 
+    void secondMethodFromBase() {
+    }
+    Base getInstance() {
+        return null;
+    }
+    public void run() {
+        // do nothing
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/overridenMethods/before/A.java

@@ -0,0 +1,13 @@
+class A extends Base {    
+    int fieldFromA;
+    public void firstMethodFromBase() {
+        super.firstMethodFromBase();
+    }
+    public void secondMethodFromBase() {
+        fieldFromA = 27;
+        this.fieldFromA++;
+    }
+    Base getInstance() {
+        return this;
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/overridenMethods/before/Base.java

@@ -0,0 +1,12 @@
+public class Base implements Runnable {
+    void firstMethodFromBase() {
+    } 
+    void secondMethodFromBase() {
+    }
+    Base getInstance() {
+        return null;
+    }
+    public void run() {
+        // do nothing
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/scr20557/after/xxx/SCR20557.java

@@ -0,0 +1,531 @@
+package xxx;
+
+import java.sql.*;
+import java.util.Calendar;
+import java.util.Map;
+import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.net.URL;
+
+/**
+ * @author dsl
+ */
+public class SCR20557 {
+    private final MyResultSet myResultSet = new MyResultSet();
+
+    public Date getDate(int columnIndex) throws SQLException {
+        return myResultSet.getDate(columnIndex);
+    }
+
+    public Date getDate(String columnName) throws SQLException {
+        return myResultSet.getDate(columnName);
+    }
+
+    public Date getDate(int columnIndex, Calendar cal) throws SQLException {
+        return myResultSet.getDate(columnIndex, cal);
+    }
+
+    public Date getDate(String columnName, Calendar cal) throws SQLException {
+        return myResultSet.getDate(columnName, cal);
+    }
+
+    private class MyResultSet implements ResultSet {
+        public void updateLong(int columnIndex, long x) throws SQLException {
+        }
+
+        public void updateLong(String columnName, long x) throws SQLException {
+        }
+
+        public boolean getBoolean(int columnIndex) throws SQLException {
+          return false;
+        }
+
+        public boolean getBoolean(String columnName) throws SQLException {
+          return false;
+        }
+
+        public boolean wasNull() throws SQLException {
+          return false;
+        }
+
+        public int getRow() throws SQLException {
+          return 0;
+        }
+
+        public int getConcurrency() throws SQLException {
+          return 0;
+        }
+
+        public int getFetchSize() throws SQLException {
+          return 0;
+        }
+
+        public Ref getRef(int i) throws SQLException {
+          return null;
+        }
+
+        public Ref getRef(String colName) throws SQLException {
+          return null;
+        }
+
+        public Date getDate(int columnIndex) throws SQLException {
+          return null;
+        }
+
+        public Date getDate(String columnName) throws SQLException {
+          return null;
+        }
+
+        public Date getDate(int columnIndex, Calendar cal) throws SQLException {
+          return null;
+        }
+
+        public Date getDate(String columnName, Calendar cal) throws SQLException {
+          return null;
+        }
+
+        public Statement getStatement() throws SQLException {
+          return null;
+        }
+
+        public boolean isFirst() throws SQLException {
+          return false;
+        }
+
+        public boolean previous() throws SQLException {
+          return false;
+        }
+
+        public void updateFloat(int columnIndex, float x) throws SQLException {
+        }
+
+        public void updateFloat(String columnName, float x) throws SQLException {
+        }
+
+        public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException {
+        }
+
+        public void updateBinaryStream(String columnName, InputStream x, int length) throws SQLException {
+        }
+
+        public void updateRow() throws SQLException {
+        }
+
+        public long getLong(int columnIndex) throws SQLException {
+          return 0;
+        }
+
+        public long getLong(String columnName) throws SQLException {
+          return 0;
+        }
+
+        public void updateRef(int columnIndex, Ref x) throws SQLException {
+        }
+
+        public void updateRef(String columnName, Ref x) throws SQLException {
+        }
+
+        public void updateByte(int columnIndex, byte x) throws SQLException {
+        }
+
+        public void updateByte(String columnName, byte x) throws SQLException {
+        }
+
+        public void cancelRowUpdates() throws SQLException {
+        }
+
+        public Reader getCharacterStream(int columnIndex) throws SQLException {
+          return null;
+        }
+
+        public Reader getCharacterStream(String columnName) throws SQLException {
+          return null;
+        }
+
+        public boolean absolute(int row) throws SQLException {
+          return false;
+        }
+
+        public boolean first() throws SQLException {
+          return false;
+        }
+
+        public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException {
+        }
+
+        public void updateAsciiStream(String columnName, InputStream x, int length) throws SQLException {
+        }
+
+        public void moveToInsertRow() throws SQLException {
+        }
+
+        public SQLWarning getWarnings() throws SQLException {
+          return null;
+        }
+
+        public void updateDate(int columnIndex, Date x) throws SQLException {
+        }
+
+        public void updateDate(String columnName, Date x) throws SQLException {
+        }
+
+        public InputStream getBinaryStream(int columnIndex) throws SQLException {
+          return null;
+        }
+
+        public InputStream getBinaryStream(String columnName) throws SQLException {
+          return null;
+        }
+
+        public Time getTime(int columnIndex) throws SQLException {
+          return null;
+        }
+
+        public Time getTime(String columnName) throws SQLException {
+          return null;
+        }
+
+        public Time getTime(int columnIndex, Calendar cal) throws SQLException {
+          return null;
+        }
+
+        public Time getTime(String columnName, Calendar cal) throws SQLException {
+          return null;
+        }
+
+        public String getCursorName() throws SQLException {
+          return null;
+        }
+
+        public void updateBytes(int columnIndex, byte x[]) throws SQLException {
+        }
+
+        public void updateBytes(String columnName, byte x[]) throws SQLException {
+        }
+
+        public boolean last() throws SQLException {
+          return false;
+        }
+
+        public Timestamp getTimestamp(int columnIndex) throws SQLException {
+          return null;
+        }
+
+        public Timestamp getTimestamp(String columnName) throws SQLException {
+          return null;
+        }
+
+        public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
+          return null;
+        }
+
+        public Timestamp getTimestamp(String columnName, Calendar cal) throws SQLException {
+          return null;
+        }
+
+        public void updateBoolean(int columnIndex, boolean x) throws SQLException {
+        }
+
+        public void updateBoolean(String columnName, boolean x) throws SQLException {
+        }
+
+        public void beforeFirst() throws SQLException {
+        }
+
+        public int getFetchDirection() throws SQLException {
+          return 0;
+        }
+
+        public void updateDouble(int columnIndex, double x) throws SQLException {
+        }
+
+        public void updateDouble(String columnName, double x) throws SQLException {
+        }
+
+        public void setFetchDirection(int direction) throws SQLException {
+        }
+
+        public boolean rowDeleted() throws SQLException {
+          return false;
+        }
+
+        public void moveToCurrentRow() throws SQLException {
+        }
+
+        public void insertRow() throws SQLException {
+        }
+
+        public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
+          return null;
+        }
+
+        public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
+          return null;
+        }
+
+        public BigDecimal getBigDecimal(String columnName) throws SQLException {
+          return null;
+        }
+
+        public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException {
+          return null;
+        }
+
+        public URL getURL(int columnIndex) throws SQLException {
+          return null;
+        }
+
+        public URL getURL(String columnName) throws SQLException {
+          return null;
+        }
+
+        public boolean isAfterLast() throws SQLException {
+          return false;
+        }
+
+        public short getShort(int columnIndex) throws SQLException {
+          return 0;
+        }
+
+        public short getShort(String columnName) throws SQLException {
+          return 0;
+        }
+
+        public void updateInt(int columnIndex, int x) throws SQLException {
+        }
+
+        public void updateInt(String columnName, int x) throws SQLException {
+        }
+
+        public void clearWarnings() throws SQLException {
+        }
+
+        public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException {
+        }
+
+        public void updateCharacterStream(String columnName, Reader reader, int length) throws SQLException {
+        }
+
+        public Blob getBlob(int i) throws SQLException {
+          return null;
+        }
+
+        public Blob getBlob(String colName) throws SQLException {
+          return null;
+        }
+
+        public void refreshRow() throws SQLException {
+        }
+
+        public void updateTime(int columnIndex, Time x) throws SQLException {
+        }
+
+        public void updateTime(String columnName, Time x) throws SQLException {
+        }
+
+        public void updateArray(int columnIndex, Array x) throws SQLException {
+        }
+
+        public void updateArray(String columnName, Array x) throws SQLException {
+        }
+
+        public void updateObject(int columnIndex, Object x) throws SQLException {
+        }
+
+        public void updateObject(int columnIndex, Object x, int scale) throws SQLException {
+        }
+
+        public void updateObject(String columnName, Object x) throws SQLException {
+        }
+
+        public void updateObject(String columnName, Object x, int scale) throws SQLException {
+        }
+
+        public void updateNull(int columnIndex) throws SQLException {
+        }
+
+        public void updateNull(String columnName) throws SQLException {
+        }
+
+        public void close() throws SQLException {
+        }
+
+        public boolean rowInserted() throws SQLException {
+          return false;
+        }
+
+        public Clob getClob(int i) throws SQLException {
+          return null;
+        }
+
+        public Clob getClob(String colName) throws SQLException {
+          return null;
+        }
+
+        public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException {
+        }
+
+        public void updateBigDecimal(String columnName, BigDecimal x) throws SQLException {
+        }
+
+        public int getType() throws SQLException {
+          return 0;
+        }
+
+        public boolean next() throws SQLException {
+          return false;
+        }
+
+        public int getInt(int columnIndex) throws SQLException {
+          return 0;
+        }
+
+        public int getInt(String columnName) throws SQLException {
+          return 0;
+        }
+
+        public void updateBlob(int columnIndex, Blob x) throws SQLException {
+        }
+
+        public void updateBlob(String columnName, Blob x) throws SQLException {
+        }
+
+        public ResultSetMetaData getMetaData() throws SQLException {
+          return null;
+        }
+
+        public boolean rowUpdated() throws SQLException {
+          return false;
+        }
+
+        public Array getArray(int i) throws SQLException {
+          return null;
+        }
+
+        public Array getArray(String colName) throws SQLException {
+          return null;
+        }
+
+        public byte getByte(int columnIndex) throws SQLException {
+          return 0;
+        }
+
+        public byte getByte(String columnName) throws SQLException {
+          return 0;
+        }
+
+        public InputStream getAsciiStream(int columnIndex) throws SQLException {
+          return null;
+        }
+
+        public InputStream getAsciiStream(String columnName) throws SQLException {
+          return null;
+        }
+
+        public double getDouble(int columnIndex) throws SQLException {
+          return 0;
+        }
+
+        public double getDouble(String columnName) throws SQLException {
+          return 0;
+        }
+
+        public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException {
+        }
+
+        public void updateTimestamp(String columnName, Timestamp x) throws SQLException {
+        }
+
+        public void updateClob(int columnIndex, Clob x) throws SQLException {
+        }
+
+        public void updateClob(String columnName, Clob x) throws SQLException {
+        }
+
+        public boolean isBeforeFirst() throws SQLException {
+          return false;
+        }
+
+        public void deleteRow() throws SQLException {
+        }
+
+        public void afterLast() throws SQLException {
+        }
+
+        public InputStream getUnicodeStream(int columnIndex) throws SQLException {
+          return null;
+        }
+
+        public InputStream getUnicodeStream(String columnName) throws SQLException {
+          return null;
+        }
+
+        public byte[] getBytes(int columnIndex) throws SQLException {
+          return new byte[0];
+        }
+
+        public byte[] getBytes(String columnName) throws SQLException {
+          return new byte[0];
+        }
+
+        public void updateString(int columnIndex, String x) throws SQLException {
+        }
+
+        public void updateString(String columnName, String x) throws SQLException {
+        }
+
+        public float getFloat(int columnIndex) throws SQLException {
+          return 0;
+        }
+
+        public float getFloat(String columnName) throws SQLException {
+          return 0;
+        }
+
+        public Object getObject(int columnIndex) throws SQLException {
+          return null;
+        }
+
+        public Object getObject(String columnName) throws SQLException {
+          return null;
+        }
+
+        public Object getObject(int i, Map map) throws SQLException {
+          return null;
+        }
+
+        public Object getObject(String colName, Map map) throws SQLException {
+          return null;
+        }
+
+        public void setFetchSize(int rows) throws SQLException {
+        }
+
+        public boolean isLast() throws SQLException {
+          return false;
+        }
+
+        public void updateShort(int columnIndex, short x) throws SQLException {
+        }
+
+        public void updateShort(String columnName, short x) throws SQLException {
+        }
+
+        public String getString(int columnIndex) throws SQLException {
+          return null;
+        }
+
+        public String getString(String columnName) throws SQLException {
+          return null;
+        }
+
+        public int findColumn(String columnName) throws SQLException {
+          return 0;
+        }
+
+        public boolean relative(int rows) throws SQLException {
+          return false;
+        }
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/scr20557/before/xxx/SCR20557.java

@@ -0,0 +1,511 @@
+package xxx;
+
+import java.sql.*;
+import java.util.Calendar;
+import java.util.Map;
+import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.net.URL;
+
+/**
+ * @author dsl
+ */
+public class SCR20557 implements ResultSet {
+  public void updateLong(int columnIndex, long x) throws SQLException {
+  }
+
+  public void updateLong(String columnName, long x) throws SQLException {
+  }
+
+  public boolean getBoolean(int columnIndex) throws SQLException {
+    return false;
+  }
+
+  public boolean getBoolean(String columnName) throws SQLException {
+    return false;
+  }
+
+  public boolean wasNull() throws SQLException {
+    return false;
+  }
+
+  public int getRow() throws SQLException {
+    return 0;
+  }
+
+  public int getConcurrency() throws SQLException {
+    return 0;
+  }
+
+  public int getFetchSize() throws SQLException {
+    return 0;
+  }
+
+  public Ref getRef(int i) throws SQLException {
+    return null;
+  }
+
+  public Ref getRef(String colName) throws SQLException {
+    return null;
+  }
+
+  public Date getDate(int columnIndex) throws SQLException {
+    return null;
+  }
+
+  public Date getDate(String columnName) throws SQLException {
+    return null;
+  }
+
+  public Date getDate(int columnIndex, Calendar cal) throws SQLException {
+    return null;
+  }
+
+  public Date getDate(String columnName, Calendar cal) throws SQLException {
+    return null;
+  }
+
+  public Statement getStatement() throws SQLException {
+    return null;
+  }
+
+  public boolean isFirst() throws SQLException {
+    return false;
+  }
+
+  public boolean previous() throws SQLException {
+    return false;
+  }
+
+  public void updateFloat(int columnIndex, float x) throws SQLException {
+  }
+
+  public void updateFloat(String columnName, float x) throws SQLException {
+  }
+
+  public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException {
+  }
+
+  public void updateBinaryStream(String columnName, InputStream x, int length) throws SQLException {
+  }
+
+  public void updateRow() throws SQLException {
+  }
+
+  public long getLong(int columnIndex) throws SQLException {
+    return 0;
+  }
+
+  public long getLong(String columnName) throws SQLException {
+    return 0;
+  }
+
+  public void updateRef(int columnIndex, Ref x) throws SQLException {
+  }
+
+  public void updateRef(String columnName, Ref x) throws SQLException {
+  }
+
+  public void updateByte(int columnIndex, byte x) throws SQLException {
+  }
+
+  public void updateByte(String columnName, byte x) throws SQLException {
+  }
+
+  public void cancelRowUpdates() throws SQLException {
+  }
+
+  public Reader getCharacterStream(int columnIndex) throws SQLException {
+    return null;
+  }
+
+  public Reader getCharacterStream(String columnName) throws SQLException {
+    return null;
+  }
+
+  public boolean absolute(int row) throws SQLException {
+    return false;
+  }
+
+  public boolean first() throws SQLException {
+    return false;
+  }
+
+  public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException {
+  }
+
+  public void updateAsciiStream(String columnName, InputStream x, int length) throws SQLException {
+  }
+
+  public void moveToInsertRow() throws SQLException {
+  }
+
+  public SQLWarning getWarnings() throws SQLException {
+    return null;
+  }
+
+  public void updateDate(int columnIndex, Date x) throws SQLException {
+  }
+
+  public void updateDate(String columnName, Date x) throws SQLException {
+  }
+
+  public InputStream getBinaryStream(int columnIndex) throws SQLException {
+    return null;
+  }
+
+  public InputStream getBinaryStream(String columnName) throws SQLException {
+    return null;
+  }
+
+  public Time getTime(int columnIndex) throws SQLException {
+    return null;
+  }
+
+  public Time getTime(String columnName) throws SQLException {
+    return null;
+  }
+
+  public Time getTime(int columnIndex, Calendar cal) throws SQLException {
+    return null;
+  }
+
+  public Time getTime(String columnName, Calendar cal) throws SQLException {
+    return null;
+  }
+
+  public String getCursorName() throws SQLException {
+    return null;
+  }
+
+  public void updateBytes(int columnIndex, byte x[]) throws SQLException {
+  }
+
+  public void updateBytes(String columnName, byte x[]) throws SQLException {
+  }
+
+  public boolean last() throws SQLException {
+    return false;
+  }
+
+  public Timestamp getTimestamp(int columnIndex) throws SQLException {
+    return null;
+  }
+
+  public Timestamp getTimestamp(String columnName) throws SQLException {
+    return null;
+  }
+
+  public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
+    return null;
+  }
+
+  public Timestamp getTimestamp(String columnName, Calendar cal) throws SQLException {
+    return null;
+  }
+
+  public void updateBoolean(int columnIndex, boolean x) throws SQLException {
+  }
+
+  public void updateBoolean(String columnName, boolean x) throws SQLException {
+  }
+
+  public void beforeFirst() throws SQLException {
+  }
+
+  public int getFetchDirection() throws SQLException {
+    return 0;
+  }
+
+  public void updateDouble(int columnIndex, double x) throws SQLException {
+  }
+
+  public void updateDouble(String columnName, double x) throws SQLException {
+  }
+
+  public void setFetchDirection(int direction) throws SQLException {
+  }
+
+  public boolean rowDeleted() throws SQLException {
+    return false;
+  }
+
+  public void moveToCurrentRow() throws SQLException {
+  }
+
+  public void insertRow() throws SQLException {
+  }
+
+  public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
+    return null;
+  }
+
+  public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
+    return null;
+  }
+
+  public BigDecimal getBigDecimal(String columnName) throws SQLException {
+    return null;
+  }
+
+  public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException {
+    return null;
+  }
+
+  public URL getURL(int columnIndex) throws SQLException {
+    return null;
+  }
+
+  public URL getURL(String columnName) throws SQLException {
+    return null;
+  }
+
+  public boolean isAfterLast() throws SQLException {
+    return false;
+  }
+
+  public short getShort(int columnIndex) throws SQLException {
+    return 0;
+  }
+
+  public short getShort(String columnName) throws SQLException {
+    return 0;
+  }
+
+  public void updateInt(int columnIndex, int x) throws SQLException {
+  }
+
+  public void updateInt(String columnName, int x) throws SQLException {
+  }
+
+  public void clearWarnings() throws SQLException {
+  }
+
+  public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException {
+  }
+
+  public void updateCharacterStream(String columnName, Reader reader, int length) throws SQLException {
+  }
+
+  public Blob getBlob(int i) throws SQLException {
+    return null;
+  }
+
+  public Blob getBlob(String colName) throws SQLException {
+    return null;
+  }
+
+  public void refreshRow() throws SQLException {
+  }
+
+  public void updateTime(int columnIndex, Time x) throws SQLException {
+  }
+
+  public void updateTime(String columnName, Time x) throws SQLException {
+  }
+
+  public void updateArray(int columnIndex, Array x) throws SQLException {
+  }
+
+  public void updateArray(String columnName, Array x) throws SQLException {
+  }
+
+  public void updateObject(int columnIndex, Object x) throws SQLException {
+  }
+
+  public void updateObject(int columnIndex, Object x, int scale) throws SQLException {
+  }
+
+  public void updateObject(String columnName, Object x) throws SQLException {
+  }
+
+  public void updateObject(String columnName, Object x, int scale) throws SQLException {
+  }
+
+  public void updateNull(int columnIndex) throws SQLException {
+  }
+
+  public void updateNull(String columnName) throws SQLException {
+  }
+
+  public void close() throws SQLException {
+  }
+
+  public boolean rowInserted() throws SQLException {
+    return false;
+  }
+
+  public Clob getClob(int i) throws SQLException {
+    return null;
+  }
+
+  public Clob getClob(String colName) throws SQLException {
+    return null;
+  }
+
+  public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException {
+  }
+
+  public void updateBigDecimal(String columnName, BigDecimal x) throws SQLException {
+  }
+
+  public int getType() throws SQLException {
+    return 0;
+  }
+
+  public boolean next() throws SQLException {
+    return false;
+  }
+
+  public int getInt(int columnIndex) throws SQLException {
+    return 0;
+  }
+
+  public int getInt(String columnName) throws SQLException {
+    return 0;
+  }
+
+  public void updateBlob(int columnIndex, Blob x) throws SQLException {
+  }
+
+  public void updateBlob(String columnName, Blob x) throws SQLException {
+  }
+
+  public ResultSetMetaData getMetaData() throws SQLException {
+    return null;
+  }
+
+  public boolean rowUpdated() throws SQLException {
+    return false;
+  }
+
+  public Array getArray(int i) throws SQLException {
+    return null;
+  }
+
+  public Array getArray(String colName) throws SQLException {
+    return null;
+  }
+
+  public byte getByte(int columnIndex) throws SQLException {
+    return 0;
+  }
+
+  public byte getByte(String columnName) throws SQLException {
+    return 0;
+  }
+
+  public InputStream getAsciiStream(int columnIndex) throws SQLException {
+    return null;
+  }
+
+  public InputStream getAsciiStream(String columnName) throws SQLException {
+    return null;
+  }
+
+  public double getDouble(int columnIndex) throws SQLException {
+    return 0;
+  }
+
+  public double getDouble(String columnName) throws SQLException {
+    return 0;
+  }
+
+  public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException {
+  }
+
+  public void updateTimestamp(String columnName, Timestamp x) throws SQLException {
+  }
+
+  public void updateClob(int columnIndex, Clob x) throws SQLException {
+  }
+
+  public void updateClob(String columnName, Clob x) throws SQLException {
+  }
+
+  public boolean isBeforeFirst() throws SQLException {
+    return false;
+  }
+
+  public void deleteRow() throws SQLException {
+  }
+
+  public void afterLast() throws SQLException {
+  }
+
+  public InputStream getUnicodeStream(int columnIndex) throws SQLException {
+    return null;
+  }
+
+  public InputStream getUnicodeStream(String columnName) throws SQLException {
+    return null;
+  }
+
+  public byte[] getBytes(int columnIndex) throws SQLException {
+    return new byte[0];
+  }
+
+  public byte[] getBytes(String columnName) throws SQLException {
+    return new byte[0];
+  }
+
+  public void updateString(int columnIndex, String x) throws SQLException {
+  }
+
+  public void updateString(String columnName, String x) throws SQLException {
+  }
+
+  public float getFloat(int columnIndex) throws SQLException {
+    return 0;
+  }
+
+  public float getFloat(String columnName) throws SQLException {
+    return 0;
+  }
+
+  public Object getObject(int columnIndex) throws SQLException {
+    return null;
+  }
+
+  public Object getObject(String columnName) throws SQLException {
+    return null;
+  }
+
+  public Object getObject(int i, Map map) throws SQLException {
+    return null;
+  }
+
+  public Object getObject(String colName, Map map) throws SQLException {
+    return null;
+  }
+
+  public void setFetchSize(int rows) throws SQLException {
+  }
+
+  public boolean isLast() throws SQLException {
+    return false;
+  }
+
+  public void updateShort(int columnIndex, short x) throws SQLException {
+  }
+
+  public void updateShort(String columnName, short x) throws SQLException {
+  }
+
+  public String getString(int columnIndex) throws SQLException {
+    return null;
+  }
+
+  public String getString(String columnName) throws SQLException {
+    return null;
+  }
+
+  public int findColumn(String columnName) throws SQLException {
+    return 0;
+  }
+
+  public boolean relative(int rows) throws SQLException {
+    return false;
+  }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/simpleGenerics/after/A.java

@@ -0,0 +1,10 @@
+class List <T> {}
+
+class A<T> {
+    public List<? extends T> method1() {
+        return null;
+    }
+    public T method2(T t) {
+        return null;
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/simpleGenerics/after/B.java

@@ -0,0 +1,11 @@
+class B {
+    public final A<String> myDelegate = new A<String>();
+
+    public List<? extends String> method1() {
+        return myDelegate.method1();
+    }
+
+    public String method2(String s) {
+        return myDelegate.method2(s);
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/simpleGenerics/before/A.java

@@ -0,0 +1,10 @@
+class List <T> {}
+
+class A<T> {
+    public List<? extends T> method1() {
+        return null;
+    }
+    public T method2(T t) {
+        return null;
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/simpleGenerics/before/B.java

@@ -0,0 +1,2 @@
+class B extends A<String> {       
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/simpleInsertion/after/A.java

@@ -0,0 +1,7 @@
+class A {
+    public void methodFromA() {
+    }
+    public int intMethodFromA(int i) {
+        return 0;
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/simpleInsertion/after/B.java

@@ -0,0 +1,11 @@
+class B {
+    public final A myDelegate = new A();
+
+    public void methodFromA() {
+        myDelegate.methodFromA();
+    }
+
+    public int intMethodFromA(int i) {
+        return myDelegate.intMethodFromA(i);
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/simpleInsertion/before/A.java

@@ -0,0 +1,7 @@
+class A {
+    public void methodFromA() {
+    }
+    public int intMethodFromA(int i) {
+        return 0;
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/simpleInsertion/before/B.java

@@ -0,0 +1,2 @@
+class B extends A {       
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClass/after/A.java

@@ -0,0 +1,20 @@
+public class A {
+    private final DelegatedBase myDelegate = new DelegatedBase();
+
+    int methodFromA() {
+        delegatedBaseMethod();
+        return myDelegate.delegatedBaseField;
+    }
+
+    DelegatedBase getSomething() {
+        return myDelegate;
+    }
+
+    public DelegatedBase getMyDelegate() {
+        return myDelegate;
+    }
+
+    void delegatedBaseMethod() {
+        myDelegate.delegatedBaseMethod();
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClass/after/B.java

@@ -0,0 +1,5 @@
+public class B extends A {
+    void methodFromB() {
+        super.delegatedBaseMethod();
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClass/after/DelegatedBase.java

@@ -0,0 +1,7 @@
+public class DelegatedBase {
+    int delegatedBaseField;
+
+    void delegatedBaseMethod() {
+
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClass/after/Usage.java

@@ -0,0 +1,20 @@
+public class Usage {
+    public void parameterUsageMethod(DelegatedBase b) {
+        b.delegatedBaseMethod();
+    }
+
+    public int testMethod() {
+        A a = new A();
+        B b = new B();
+        parameterUsageMethod(a.getMyDelegate());
+        parameterUsageMethod(b.getMyDelegate());
+        a.delegatedBaseMethod();
+        b.delegatedBaseMethod();
+        a.equals(b);
+        return a.getMyDelegate().delegatedBaseField + b.getMyDelegate().delegatedBaseField;
+    }
+
+    DelegatedBase getDelegatedBase(A a) {
+        return a.getMyDelegate();
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClass/before/A.java

@@ -0,0 +1,10 @@
+public class A extends DelegatedBase{
+    int methodFromA() {
+        delegatedBaseMethod();
+        return delegatedBaseField;
+    }
+
+    DelegatedBase getSomething() {
+        return this;
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClass/before/B.java

@@ -0,0 +1,5 @@
+public class B extends A {
+    void methodFromB() {
+        super.delegatedBaseMethod();
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClass/before/DelegatedBase.java

@@ -0,0 +1,7 @@
+public class DelegatedBase {
+    int delegatedBaseField;
+
+    void delegatedBaseMethod() {
+
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClass/before/Usage.java

@@ -0,0 +1,20 @@
+public class Usage {
+    public void parameterUsageMethod(DelegatedBase b) {
+        b.delegatedBaseMethod();
+    }
+
+    public int testMethod() {
+        A a = new A();
+        B b = new B();
+        parameterUsageMethod(a);
+        parameterUsageMethod(b);
+        a.delegatedBaseMethod();
+        b.delegatedBaseMethod();
+        a.equals(b);
+        return a.delegatedBaseField + b.delegatedBaseField;
+    }
+
+    DelegatedBase getDelegatedBase(A a) {
+        return a;
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClassNoMethods/after/A.java

@@ -0,0 +1,16 @@
+public class A {
+    protected final DelegatedBase myDelegate = new DelegatedBase();
+
+    int methodFromA() {
+        myDelegate.delegatedBaseMethod();
+        return myDelegate.delegatedBaseField;
+    }
+
+    DelegatedBase getSomething() {
+        return myDelegate;
+    }
+
+    public DelegatedBase getMyDelegate() {
+        return myDelegate;
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClassNoMethods/after/B.java

@@ -0,0 +1,5 @@
+public class B extends A {
+    void methodFromB() {
+        myDelegate.delegatedBaseMethod();
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClassNoMethods/after/DelegatedBase.java

@@ -0,0 +1,7 @@
+public class DelegatedBase {
+    int delegatedBaseField;
+
+    void delegatedBaseMethod() {
+
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClassNoMethods/after/Usage.java

@@ -0,0 +1,20 @@
+public class Usage {
+    public void parameterUsageMethod(DelegatedBase b) {
+        b.delegatedBaseMethod();
+    }
+
+    public int testMethod() {
+        A a = new A();
+        B b = new B();
+        parameterUsageMethod(a.getMyDelegate());
+        parameterUsageMethod(b.getMyDelegate());
+        a.getMyDelegate().delegatedBaseMethod();
+        b.getMyDelegate().delegatedBaseMethod();
+        a.equals(b);
+        return a.getMyDelegate().delegatedBaseField + b.getMyDelegate().delegatedBaseField;
+    }
+
+    DelegatedBase getDelegatedBase(A a) {
+        return a.getMyDelegate();
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClassNoMethods/before/A.java

@@ -0,0 +1,10 @@
+public class A extends DelegatedBase{
+    int methodFromA() {
+        delegatedBaseMethod();
+        return delegatedBaseField;
+    }
+
+    DelegatedBase getSomething() {
+        return this;
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClassNoMethods/before/B.java

@@ -0,0 +1,5 @@
+public class B extends A {
+    void methodFromB() {
+        super.delegatedBaseMethod();
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClassNoMethods/before/DelegatedBase.java

@@ -0,0 +1,7 @@
+public class DelegatedBase {
+    int delegatedBaseField;
+
+    void delegatedBaseMethod() {
+
+    }
+}

java/java-tests/testData/refactoring/inheritanceToDelegation/subClassNoMethods/before/Usage.java

@@ -0,0 +1,20 @@
+public class Usage {
+    public void parameterUsageMethod(DelegatedBase b) {
+        b.delegatedBaseMethod();
+    }
+
+    public int testMethod() {
+        A a = new A();
+        B b = new B();
+        parameterUsageMethod(a);
+        parameterUsageMethod(b);
+        a.delegatedBaseMethod();
+        b.delegatedBaseMethod();
+        a.equals(b);
+        return a.delegatedBaseField + b.delegatedBaseField;
+    }
+
+    DelegatedBase getDelegatedBase(A a) {
+        return a;
+    }
+}