diff options
Diffstat (limited to 'src/test/examples/uniquemembernames')
6 files changed, 14 insertions, 14 deletions
diff --git a/src/test/examples/uniquemembernames/BaseCls.java b/src/test/examples/uniquemembernames/BaseCls.java index 9843c7b48..2ee24fee1 100644 --- a/src/test/examples/uniquemembernames/BaseCls.java +++ b/src/test/examples/uniquemembernames/BaseCls.java @@ -5,17 +5,17 @@ package uniquemembernames; public abstract class BaseCls { - protected int a; + protected int c; protected double f2; - protected abstract int a(); + protected abstract int c(); protected int foo() { - return a * (int) f2; + return c * (int) f2; } protected double bar() { - return a * f2; + return c * f2; } } diff --git a/src/test/examples/uniquemembernames/ClsA.java b/src/test/examples/uniquemembernames/ClsA.java index 430a255cc..563a070c4 100644 --- a/src/test/examples/uniquemembernames/ClsA.java +++ b/src/test/examples/uniquemembernames/ClsA.java @@ -6,8 +6,8 @@ package uniquemembernames; public class ClsA extends BaseCls { @Override - protected int a() { - return foo() + a; + protected int c() { + return foo() + c; } @Override diff --git a/src/test/examples/uniquemembernames/ClsB.java b/src/test/examples/uniquemembernames/ClsB.java index 2659d5a0c..f9d4ecd4d 100644 --- a/src/test/examples/uniquemembernames/ClsB.java +++ b/src/test/examples/uniquemembernames/ClsB.java @@ -6,13 +6,13 @@ package uniquemembernames; public class ClsB extends BaseCls { @Override - protected int a() { - return foo() - a; + protected int c() { + return foo() - c; } @Override protected double bar() { - return f2 != 0 ? a / f2 : Double.MAX_VALUE; + return f2 != 0 ? c / f2 : Double.MAX_VALUE; } } diff --git a/src/test/examples/uniquemembernames/Shaking.java b/src/test/examples/uniquemembernames/Shaking.java index ce7ed5dc6..a1b90bae6 100644 --- a/src/test/examples/uniquemembernames/Shaking.java +++ b/src/test/examples/uniquemembernames/Shaking.java @@ -11,7 +11,7 @@ public class Shaking { public static void main(String[] args) { List<BaseCls> bases = Arrays.asList(new ClsA(), new ClsB()); for (BaseCls base : bases) { - base.a(); + base.c(); base.foo(); base.bar(); } diff --git a/src/test/examples/uniquemembernames/keep-rules-1.txt b/src/test/examples/uniquemembernames/keep-rules-1.txt index 2acd66a93..40057e457 100644 --- a/src/test/examples/uniquemembernames/keep-rules-1.txt +++ b/src/test/examples/uniquemembernames/keep-rules-1.txt @@ -7,8 +7,8 @@ # Keep test fields/methods for deterministic naming -keepclassmembers public class **.BaseCls { - *** a; - *** a(...); + *** c; + *** c(...); } -keepclassmembers public class **.AnotherCls { diff --git a/src/test/examples/uniquemembernames/keep-rules-2.txt b/src/test/examples/uniquemembernames/keep-rules-2.txt index 3f1bdadcc..b5c5dcf76 100644 --- a/src/test/examples/uniquemembernames/keep-rules-2.txt +++ b/src/test/examples/uniquemembernames/keep-rules-2.txt @@ -7,8 +7,8 @@ # Keep test fields/methods for deterministic naming -keepclassmembers public class **.BaseCls { - *** a; - *** a(...); + *** c; + *** c(...); } -keepclassmembers public class **.AnotherCls { |