Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/test/tools/javac/generics/InheritanceConflict.java	Wed Apr 09 13:19:01 2008 +0100
     1.2 +++ b/test/tools/javac/generics/InheritanceConflict.java	Wed Apr 09 13:41:45 2008 +0100
     1.3 @@ -25,7 +25,7 @@
     1.4   * @test
     1.5   * @bug 4984158
     1.6   * @summary two inherited methods with same signature
     1.7 - * @author gafter
     1.8 + * @author gafter, Maurizio Cimadamore
     1.9   *
    1.10   * @compile/fail -source 1.5 InheritanceConflict.java
    1.11   */
    1.12 @@ -34,8 +34,11 @@
    1.13  
    1.14  class A<T> {
    1.15      void f(String s) {}
    1.16 +}
    1.17 +
    1.18 +class B<T> extends A<T> {
    1.19      void f(T t) {}
    1.20  }
    1.21  
    1.22 -class B extends A<String> {
    1.23 +class C extends B<String> {
    1.24  }