Restructure "Safe Delete" test data directories

Conflicts:
	generators/org/jetbrains/jet/generators/tests/GenerateTests.java

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java

@@ -0,0 +1,6 @@
+abstract class C implements B {
+    @Override
+    public String <caret>getFoo() {
+        return "C";
+    }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.java.after

@@ -0,0 +1,2 @@
+abstract class C implements B {
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt

@@ -0,0 +1,10 @@
+trait B {
+    public val foo: String
+}
+
+class D: B {
+    public override val foo: String
+        get() {
+            return "D"
+        }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt.after

@@ -0,0 +1,10 @@
+trait B {
+    public val foo: String
+}
+
+class D: B {
+    public override val foo: String
+        get() {
+            return "D"
+        }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.java

@@ -0,0 +1,6 @@
+class C implements B {
+    @Override
+    public String <caret>getFoo() {
+        return "C";
+    }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt

@@ -0,0 +1,10 @@
+trait B {
+    public val foo: String
+}
+
+class D: B {
+    public override val foo: String
+        get() {
+            return "D"
+        }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt.messages

@@ -0,0 +1 @@
+method C.getFoo() implements method B.getFoo().

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java

@@ -0,0 +1,11 @@
+abstract class C implements B {
+    @Override
+    public String <caret>getFoo() {
+        return "C";
+    }
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.java.after

@@ -0,0 +1,7 @@
+abstract class C implements B {
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt

@@ -0,0 +1,13 @@
+trait B {
+    public var foo: String
+}
+
+class D: B {
+    public override var foo: String
+        get() {
+            return "D"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt.after

@@ -0,0 +1,13 @@
+trait B {
+    public var foo: String
+}
+
+class D: B {
+    public override var foo: String
+        get() {
+            return "D"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.java

@@ -0,0 +1,11 @@
+class C implements B {
+    @Override
+    public String <caret>getFoo() {
+        return "C";
+    }
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt

@@ -0,0 +1,13 @@
+trait B {
+    public var foo: String
+}
+
+class D: B {
+    public override var foo: String
+        get() {
+            return "D"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt.messages

@@ -0,0 +1 @@
+method C.getFoo() implements method B.getFoo().

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java

@@ -0,0 +1,11 @@
+abstract class C implements B {
+    @Override
+    public String getFoo() {
+        return "C";
+    }
+
+    @Override
+    public void <caret>setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.java.after

@@ -0,0 +1,7 @@
+abstract class C implements B {
+    @Override
+    public String getFoo() {
+        return "C";
+    }
+
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt

@@ -0,0 +1,13 @@
+trait B {
+    public var foo: String
+}
+
+class D: B {
+    public override var foo: String
+        get() {
+            return "D"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt.after

@@ -0,0 +1,13 @@
+trait B {
+    public var foo: String
+}
+
+class D: B {
+    public override var foo: String
+        get() {
+            return "D"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.java

@@ -0,0 +1,11 @@
+class C implements B {
+    @Override
+    public String getFoo() {
+        return "C";
+    }
+
+    @Override
+    public void <caret>setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt

@@ -0,0 +1,13 @@
+trait B {
+    public var foo: String
+}
+
+class D: B {
+    public override var foo: String
+        get() {
+            return "D"
+        }
+        set(value: String) {
+            println()
+        }
+}

idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt.messages

@@ -0,0 +1 @@
+method C.setFoo(String) implements method B.setFoo(String).

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java

@@ -0,0 +1,6 @@
+class B implements A, Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.java.after

@@ -0,0 +1,6 @@
+class B implements A, Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt

@@ -0,0 +1,7 @@
+trait A {
+    val <caret>foo: String
+}
+
+trait Z {
+    val foo: String
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt.after

@@ -0,0 +1,6 @@
+trait A {
+}
+
+trait Z {
+    val foo: String
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java

@@ -0,0 +1,6 @@
+class B implements A {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.java.after

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

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt

@@ -0,0 +1,3 @@
+trait A {
+    val <caret>foo: String
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt.after

@@ -0,0 +1,2 @@
+trait A {
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java

@@ -0,0 +1,11 @@
+class B implements A, Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    public void getFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.java.after

@@ -0,0 +1,11 @@
+class B implements A, Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    public void getFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt

@@ -0,0 +1,7 @@
+trait A {
+    var <caret>foo: String
+}
+
+trait Z {
+    var foo: String
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt.after

@@ -0,0 +1,6 @@
+trait A {
+}
+
+trait Z {
+    var foo: String
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java

@@ -0,0 +1,11 @@
+class B implements A {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.java.after

@@ -0,0 +1,3 @@
+class B implements A {
+
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt

@@ -0,0 +1,3 @@
+trait A {
+    var <caret>foo: String
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt.after

@@ -0,0 +1,2 @@
+trait A {
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java

@@ -0,0 +1,10 @@
+class B extends A {
+    void bar() {
+        System.out.println(getFoo());
+    }
+
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.java.after

@@ -0,0 +1,9 @@
+class B extends A {
+    void bar() {
+        System.out.println(getFoo());
+    }
+
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt

@@ -0,0 +1,3 @@
+open class A {
+    open val <caret>foo: String = ""
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt.after

@@ -0,0 +1,2 @@
+open class A {
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java

@@ -0,0 +1,6 @@
+class B extends A {
+    @Override
+    String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.java.after

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

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt

@@ -0,0 +1,3 @@
+open class A {
+    open val <caret>foo: String = ""
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt.after

@@ -0,0 +1,2 @@
+open class A {
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java

@@ -0,0 +1,16 @@
+class B extends A {
+    void bar() {
+        setFoo("");
+        System.out.println(getFoo());
+    }
+
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.java.after

@@ -0,0 +1,14 @@
+class B extends A {
+    void bar() {
+        setFoo("");
+        System.out.println(getFoo());
+    }
+
+    public String getFoo() {
+        return "foo";
+    }
+
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt

@@ -0,0 +1,3 @@
+open class A {
+    open var <caret>foo: String = ""
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt.after

@@ -0,0 +1,2 @@
+open class A {
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java

@@ -0,0 +1,11 @@
+class B extends A {
+    @Override
+    String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.java.after

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

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt

@@ -0,0 +1,3 @@
+open class A {
+    open var <caret>foo: String = ""
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt.after

@@ -0,0 +1,2 @@
+open class A {
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java

@@ -0,0 +1,6 @@
+class B extends A implements Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.java.after

@@ -0,0 +1,6 @@
+class B extends A implements Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt

@@ -0,0 +1,7 @@
+open class A {
+    public open val <caret>foo: String = ""
+}
+
+trait Z {
+    public val foo: String
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt.after

@@ -0,0 +1,6 @@
+open class A {
+}
+
+trait Z {
+    public val foo: String
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java

@@ -0,0 +1,11 @@
+class B extends A implements Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.java.after

@@ -0,0 +1,11 @@
+class B extends A implements Z {
+    @Override
+    public String getFoo() {
+        return "foo";
+    }
+
+    @Override
+    public void setFoo(String value) {
+
+    }
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt

@@ -0,0 +1,7 @@
+open class A {
+    public open var <caret>foo: String = ""
+}
+
+trait Z {
+    public var foo: String
+}

idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt.after

@@ -0,0 +1,6 @@
+open class A {
+}
+
+trait Z {
+    public var foo: String
+}