pull up conflicts: do not warn if moved method would use super instead (IDEA-56212)

This commit is contained in:
unknown
2010-07-01 17:40:58 +04:00
committed by anna
parent 17a9e105a8
commit 862c964a70
16 changed files with 208 additions and 1 deletions

View File

@@ -0,0 +1,5 @@
package a;
import b.B;
public class A extends B {
void foo(){}
}

View File

@@ -0,0 +1,6 @@
package b;
public class B {
void method2Move() {
foo();
}
}

View File

@@ -0,0 +1,8 @@
package a;
import b.B;
public class A extends B {
void method2Move() {
foo();
}
void foo(){}
}

View File

@@ -0,0 +1,2 @@
package b;
public class B {}

View File

@@ -0,0 +1,5 @@
package a;
import b.B;
public class A extends B {
protected void foo(){}
}

View File

@@ -0,0 +1,8 @@
package b;
public class B {
protected void foo(){}
void method2Move() {
foo();
}
}

View File

@@ -0,0 +1,8 @@
package a;
import b.B;
public class A extends B {
void method2Move() {
foo();
}
protected void foo(){}
}

View File

@@ -0,0 +1,4 @@
package b;
public class B {
protected void foo(){}
}

View File

@@ -0,0 +1,5 @@
package a;
import b.B;
public class A extends B {
protected void foo(){}
}

View File

@@ -0,0 +1,7 @@
package b;
import c.C;
public class B extends C {
void method2Move() {
foo();
}
}

View File

@@ -0,0 +1,4 @@
package c;
public class C {
protected void foo(){}
}

View File

@@ -0,0 +1,8 @@
package a;
import b.B;
public class A extends B {
void method2Move() {
foo();
}
protected void foo(){}
}

View File

@@ -0,0 +1,4 @@
package b;
import c.C;
public class B extends C {
}

View File

@@ -0,0 +1,4 @@
package c;
public class C {
protected void foo(){}
}