mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-08-26 03:13:40 +07:00
push down conflicts: ensure no conflict exist when push method would use "protected" overrider
This commit is contained in:
@@ -0,0 +1,4 @@
|
||||
package a;
|
||||
public class A {
|
||||
protected void bar(){}
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
package b;
|
||||
import a.A;
|
||||
|
||||
public class B extends A {
|
||||
protected void bar(){}
|
||||
|
||||
public void foo(){
|
||||
bar();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package a;
|
||||
public class A {
|
||||
public void foo(){
|
||||
bar();
|
||||
}
|
||||
protected void bar(){}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
package b;
|
||||
import a.A;
|
||||
|
||||
public class B extends A {
|
||||
protected void bar(){}
|
||||
}
|
||||
Reference in New Issue
Block a user