show conflicts unification;

encapsulate fields: rise conflicts; tests

java/java-tests/testData/refactoring/encapsulateFields/alreadyExist/after/Test.java

@@ -0,0 +1,18 @@
+class Test {
+  int i;
+  int getI() {
+    return i;
+  }
+
+  void foo() {
+    setI(getI() + 1);
+    System.out.println(getI());
+
+    Test t;
+    setI(t.getI());
+  }
+
+    public void setI(int i) {
+        this.i = i;
+    }
+}

java/java-tests/testData/refactoring/encapsulateFields/alreadyExist/before/Test.java

@@ -0,0 +1,14 @@
+class Test {
+  int i;
+  int getI() {
+    return i;
+  }
+
+  void foo() {
+    i++;
+    System.out.println(getI());
+
+    Test t;
+    i = t.i;
+  }
+}

java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnly/after/Test.java

@@ -0,0 +1,11 @@
+class Test {
+  int i;
+  int getI() {
+    return i;
+  }
+
+  Test setI(int i) {
+    this.i = i;
+    return this;
+  }
+}

java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnly/before/Test.java

@@ -0,0 +1,11 @@
+class Test {
+  int i;
+  int getI() {
+    return i;
+  }
+
+  Test setI(int i) {
+    this.i = i;
+    return this;
+  }
+}

java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnlyInHierarchy/after/Test.java

@@ -0,0 +1,12 @@
+public class Test extends Super{
+  int i;
+  int getI() {
+    return i;
+  }
+}
+
+class Super {
+  Super setI(int i) {
+    return this;
+  }
+}

java/java-tests/testData/refactoring/encapsulateFields/diffWithReturnTypeOnlyInHierarchy/before/Test.java

@@ -0,0 +1,12 @@
+public class Test extends Super{
+  int i;
+  int getI() {
+    return i;
+  }
+}
+
+class Super {
+  Super setI(int i) {
+    return this;
+  }
+}