Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/test/tools/javac/6521805/T6521805a.java	Thu Aug 27 13:40:48 2009 +0100
     1.2 +++ b/test/tools/javac/6521805/T6521805a.java	Thu Aug 27 11:08:27 2009 -0700
     1.3 @@ -1,28 +1,5 @@
     1.4  /*
     1.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
     1.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.7 - *
     1.8 - * This code is free software; you can redistribute it and/or modify it
     1.9 - * under the terms of the GNU General Public License version 2 only, as
    1.10 - * published by the Free Software Foundation.
    1.11 - *
    1.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
    1.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    1.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    1.15 - * version 2 for more details (a copy is included in the LICENSE file that
    1.16 - * accompanied this code).
    1.17 - *
    1.18 - * You should have received a copy of the GNU General Public License version
    1.19 - * 2 along with this work; if not, write to the Free Software Foundation,
    1.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1.21 - *
    1.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    1.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
    1.24 - * have any questions.
    1.25 - */
    1.26 -
    1.27 -/*
    1.28 - * @test
    1.29 + * @test /nodynamiccopyright/
    1.30   * @bug 6521805
    1.31   * @summary Regression: JDK5/JDK6 javac allows write access to outer class reference
    1.32   * @author mcimadamore

     2.1 --- a/test/tools/javac/6521805/T6521805a_1.out	Thu Aug 27 13:40:48 2009 +0100
     2.2 +++ b/test/tools/javac/6521805/T6521805a_1.out	Thu Aug 27 11:08:27 2009 -0700
     2.3 @@ -1,2 +1,2 @@
     2.4 -T6521805a.java:40:12: compiler.err.synthetic.name.conflict: this$0, T6521805a.Outer
     2.5 +T6521805a.java:17:12: compiler.err.synthetic.name.conflict: this$0, T6521805a.Outer
     2.6  1 error

     3.1 --- a/test/tools/javac/6521805/T6521805a_2.out	Thu Aug 27 13:40:48 2009 +0100
     3.2 +++ b/test/tools/javac/6521805/T6521805a_2.out	Thu Aug 27 11:08:27 2009 -0700
     3.3 @@ -1,2 +1,2 @@
     3.4 -T6521805a.java:40:12: compiler.warn.synthetic.name.conflict: this$0, T6521805a.Outer
     3.5 +T6521805a.java:17:12: compiler.warn.synthetic.name.conflict: this$0, T6521805a.Outer
     3.6  1 warning

     4.1 --- a/test/tools/javac/6521805/T6521805d.java	Thu Aug 27 13:40:48 2009 +0100
     4.2 +++ b/test/tools/javac/6521805/T6521805d.java	Thu Aug 27 11:08:27 2009 -0700
     4.3 @@ -1,28 +1,5 @@
     4.4  /*
     4.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
     4.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.7 - *
     4.8 - * This code is free software; you can redistribute it and/or modify it
     4.9 - * under the terms of the GNU General Public License version 2 only, as
    4.10 - * published by the Free Software Foundation.
    4.11 - *
    4.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
    4.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    4.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    4.15 - * version 2 for more details (a copy is included in the LICENSE file that
    4.16 - * accompanied this code).
    4.17 - *
    4.18 - * You should have received a copy of the GNU General Public License version
    4.19 - * 2 along with this work; if not, write to the Free Software Foundation,
    4.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    4.21 - *
    4.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    4.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
    4.24 - * have any questions.
    4.25 - */
    4.26 -
    4.27 -/*
    4.28 - * @test
    4.29 + * @test /nodynamiccopyright/
    4.30   * @bug 6521805
    4.31   * @summary Regression: JDK5/JDK6 javac allows write access to outer class reference
    4.32   * @author mcimadamore

     5.1 --- a/test/tools/javac/6521805/T6521805d.out	Thu Aug 27 13:40:48 2009 +0100
     5.2 +++ b/test/tools/javac/6521805/T6521805d.out	Thu Aug 27 11:08:27 2009 -0700
     5.3 @@ -1,2 +1,2 @@
     5.4 -T6521805d.java:41:18: compiler.err.synthetic.name.conflict: this$0, T6521805.Inner
     5.5 +T6521805d.java:18:18: compiler.err.synthetic.name.conflict: this$0, T6521805.Inner
     5.6  1 error

     6.1 --- a/test/tools/javac/6717241/T6717241a.java	Thu Aug 27 13:40:48 2009 +0100
     6.2 +++ b/test/tools/javac/6717241/T6717241a.java	Thu Aug 27 11:08:27 2009 -0700
     6.3 @@ -1,28 +1,5 @@
     6.4 -/*
     6.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
     6.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.7 - *
     6.8 - * This code is free software; you can redistribute it and/or modify it
     6.9 - * under the terms of the GNU General Public License version 2 only, as
    6.10 - * published by the Free Software Foundation.
    6.11 - *
    6.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
    6.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    6.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    6.15 - * version 2 for more details (a copy is included in the LICENSE file that
    6.16 - * accompanied this code).
    6.17 - *
    6.18 - * You should have received a copy of the GNU General Public License version
    6.19 - * 2 along with this work; if not, write to the Free Software Foundation,
    6.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    6.21 - *
    6.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    6.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
    6.24 - * have any questions.
    6.25 - */
    6.26 -
    6.27  /**
    6.28 - * @test
    6.29 + * @test /nodynamiccopyright/
    6.30   * @bug     6717241
    6.31   * @summary some diagnostic argument is prematurely converted into a String object
    6.32   * @author  Maurizio Cimadamore

     7.1 --- a/test/tools/javac/6717241/T6717241a.out	Thu Aug 27 13:40:48 2009 +0100
     7.2 +++ b/test/tools/javac/6717241/T6717241a.out	Thu Aug 27 11:08:27 2009 -0700
     7.3 @@ -1,4 +1,4 @@
     7.4 -T6717241a.java:36:21: compiler.err.cant.resolve: kindname.variable, v, , 
     7.5 -T6717241a.java:38:10: compiler.err.cant.resolve.args: kindname.method, m1, , int,java.lang.String
     7.6 -T6717241a.java:40:10: compiler.err.cant.resolve.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String
     7.7 +T6717241a.java:13:21: compiler.err.cant.resolve: kindname.variable, v, , 
     7.8 +T6717241a.java:15:10: compiler.err.cant.resolve.args: kindname.method, m1, , int,java.lang.String
     7.9 +T6717241a.java:17:10: compiler.err.cant.resolve.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String
    7.10  3 errors

     8.1 --- a/test/tools/javac/6717241/T6717241b.java	Thu Aug 27 13:40:48 2009 +0100
     8.2 +++ b/test/tools/javac/6717241/T6717241b.java	Thu Aug 27 11:08:27 2009 -0700
     8.3 @@ -1,28 +1,5 @@
     8.4 -/*
     8.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
     8.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     8.7 - *
     8.8 - * This code is free software; you can redistribute it and/or modify it
     8.9 - * under the terms of the GNU General Public License version 2 only, as
    8.10 - * published by the Free Software Foundation.
    8.11 - *
    8.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
    8.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    8.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    8.15 - * version 2 for more details (a copy is included in the LICENSE file that
    8.16 - * accompanied this code).
    8.17 - *
    8.18 - * You should have received a copy of the GNU General Public License version
    8.19 - * 2 along with this work; if not, write to the Free Software Foundation,
    8.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    8.21 - *
    8.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    8.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
    8.24 - * have any questions.
    8.25 - */
    8.26 -
    8.27  /**
    8.28 - * @test
    8.29 + * @test /nodynamiccopyright/
    8.30   * @bug     6717241
    8.31   * @summary some diagnostic argument is prematurely converted into a String object
    8.32   * @author  Maurizio Cimadamore

     9.1 --- a/test/tools/javac/6717241/T6717241b.out	Thu Aug 27 13:40:48 2009 +0100
     9.2 +++ b/test/tools/javac/6717241/T6717241b.out	Thu Aug 27 11:08:27 2009 -0700
     9.3 @@ -1,4 +1,4 @@
     9.4 -T6717241b.java:35:20: compiler.err.cant.resolve.location: kindname.variable, v, , , kindname.class, T6717241b
     9.5 -T6717241b.java:37:9: compiler.err.cant.resolve.location.args: kindname.method, m1, , int,java.lang.String, kindname.class, T6717241b
     9.6 -T6717241b.java:39:18: compiler.err.cant.resolve.location.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String, kindname.class, T6717241b
     9.7 +T6717241b.java:12:20: compiler.err.cant.resolve.location: kindname.variable, v, , , kindname.class, T6717241b
     9.8 +T6717241b.java:14:9: compiler.err.cant.resolve.location.args: kindname.method, m1, , int,java.lang.String, kindname.class, T6717241b
     9.9 +T6717241b.java:16:18: compiler.err.cant.resolve.location.args.params: kindname.method, m2, java.lang.Integer,java.lang.Double, int,java.lang.String, kindname.class, T6717241b
    9.10  3 errors

    10.1 --- a/test/tools/javac/6734819/T6734819c.java	Thu Aug 27 13:40:48 2009 +0100
    10.2 +++ b/test/tools/javac/6734819/T6734819c.java	Thu Aug 27 11:08:27 2009 -0700
    10.3 @@ -1,28 +1,5 @@
    10.4  /*
    10.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    10.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.7 - *
    10.8 - * This code is free software; you can redistribute it and/or modify it
    10.9 - * under the terms of the GNU General Public License version 2 only, as
   10.10 - * published by the Free Software Foundation.
   10.11 - *
   10.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   10.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   10.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   10.15 - * version 2 for more details (a copy is included in the LICENSE file that
   10.16 - * accompanied this code).
   10.17 - *
   10.18 - * You should have received a copy of the GNU General Public License version
   10.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   10.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   10.21 - *
   10.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   10.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   10.24 - * have any questions.
   10.25 - */
   10.26 -
   10.27 -/*
   10.28 - * @test
   10.29 + * @test /nodynamiccopyright/
   10.30   * @bug 6734819
   10.31   * @summary Javac performs flows analysis on already translated classes
   10.32   * @author Maurizio Cimadamore

    11.1 --- a/test/tools/javac/6734819/T6734819c.out	Thu Aug 27 13:40:48 2009 +0100
    11.2 +++ b/test/tools/javac/6734819/T6734819c.out	Thu Aug 27 11:08:27 2009 -0700
    11.3 @@ -4,5 +4,5 @@
    11.4  [flow W]
    11.5  [attribute Z]
    11.6  [flow Z]
    11.7 -T6734819c.java:38:11: compiler.err.unreachable.stmt
    11.8 +T6734819c.java:15:11: compiler.err.unreachable.stmt
    11.9  1 error

    12.1 --- a/test/tools/javac/6758789/T6758789a.java	Thu Aug 27 13:40:48 2009 +0100
    12.2 +++ b/test/tools/javac/6758789/T6758789a.java	Thu Aug 27 11:08:27 2009 -0700
    12.3 @@ -1,28 +1,5 @@
    12.4  /*
    12.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    12.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.7 - *
    12.8 - * This code is free software; you can redistribute it and/or modify it
    12.9 - * under the terms of the GNU General Public License version 2 only, as
   12.10 - * published by the Free Software Foundation.
   12.11 - *
   12.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   12.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   12.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   12.15 - * version 2 for more details (a copy is included in the LICENSE file that
   12.16 - * accompanied this code).
   12.17 - *
   12.18 - * You should have received a copy of the GNU General Public License version
   12.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   12.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   12.21 - *
   12.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   12.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   12.24 - * have any questions.
   12.25 - */
   12.26 -
   12.27 -/*
   12.28 - * @test
   12.29 + * @test /nodynamiccopyright/
   12.30   * @bug 6758789
   12.31   * @summary 6758789: Some method resolution diagnostic should be improved
   12.32   * @author Maurizio Cimadamore

    13.1 --- a/test/tools/javac/6758789/T6758789a.out	Thu Aug 27 13:40:48 2009 +0100
    13.2 +++ b/test/tools/javac/6758789/T6758789a.out	Thu Aug 27 11:08:27 2009 -0700
    13.3 @@ -1,3 +1,3 @@
    13.4 -T6758789a.java:37:9: compiler.err.cant.apply.symbol: kindname.method, m1, compiler.misc.no.args, int, kindname.class, T6758789a, null
    13.5 -T6758789a.java:38:9: compiler.err.cant.apply.symbol: kindname.method, m2, int, compiler.misc.no.args, kindname.class, T6758789a, null
    13.6 -2 errors
    13.7 \ No newline at end of file
    13.8 +T6758789a.java:14:9: compiler.err.cant.apply.symbol: kindname.method, m1, compiler.misc.no.args, int, kindname.class, T6758789a, null
    13.9 +T6758789a.java:15:9: compiler.err.cant.apply.symbol: kindname.method, m2, int, compiler.misc.no.args, kindname.class, T6758789a, null
   13.10 +2 errors

    14.1 --- a/test/tools/javac/6758789/T6758789b.java	Thu Aug 27 13:40:48 2009 +0100
    14.2 +++ b/test/tools/javac/6758789/T6758789b.java	Thu Aug 27 11:08:27 2009 -0700
    14.3 @@ -1,28 +1,5 @@
    14.4  /*
    14.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    14.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.7 - *
    14.8 - * This code is free software; you can redistribute it and/or modify it
    14.9 - * under the terms of the GNU General Public License version 2 only, as
   14.10 - * published by the Free Software Foundation.
   14.11 - *
   14.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   14.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   14.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   14.15 - * version 2 for more details (a copy is included in the LICENSE file that
   14.16 - * accompanied this code).
   14.17 - *
   14.18 - * You should have received a copy of the GNU General Public License version
   14.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   14.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   14.21 - *
   14.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   14.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   14.24 - * have any questions.
   14.25 - */
   14.26 -
   14.27 -/*
   14.28 - * @test
   14.29 + * @test /nodynamiccopyright/
   14.30   * @bug 6758789
   14.31   * @summary 6758789: Some method resolution diagnostic should be improved
   14.32   * @author Maurizio Cimadamore

    15.1 --- a/test/tools/javac/6758789/T6758789b.out	Thu Aug 27 13:40:48 2009 +0100
    15.2 +++ b/test/tools/javac/6758789/T6758789b.out	Thu Aug 27 11:08:27 2009 -0700
    15.3 @@ -1,5 +1,5 @@
    15.4 -T6758789b.java:39:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<X>
    15.5 -T6758789b.java:39:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6758789a.Foo<X>, T6758789a.Foo, kindname.class, T6758789a
    15.6 +T6758789b.java:16:11: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6758789a.Foo, T6758789a.Foo<X>
    15.7 +T6758789b.java:16:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6758789a.Foo<X>, T6758789a.Foo, kindname.class, T6758789a
    15.8  - compiler.err.warnings.and.werror
    15.9  1 error
   15.10  2 warnings

    16.1 --- a/test/tools/javac/6840059/T6840059.java	Thu Aug 27 13:40:48 2009 +0100
    16.2 +++ b/test/tools/javac/6840059/T6840059.java	Thu Aug 27 11:08:27 2009 -0700
    16.3 @@ -1,28 +1,5 @@
    16.4  /*
    16.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    16.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    16.7 - *
    16.8 - * This code is free software; you can redistribute it and/or modify it
    16.9 - * under the terms of the GNU General Public License version 2 only, as
   16.10 - * published by the Free Software Foundation.
   16.11 - *
   16.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   16.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   16.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   16.15 - * version 2 for more details (a copy is included in the LICENSE file that
   16.16 - * accompanied this code).
   16.17 - *
   16.18 - * You should have received a copy of the GNU General Public License version
   16.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   16.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   16.21 - *
   16.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   16.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   16.24 - * have any questions.
   16.25 - */
   16.26 -
   16.27 -/*
   16.28 - * @test
   16.29 + * @test /nodynamiccopyright/
   16.30   * @bug 6840059
   16.31   * @summary 6758789: Some method resolution diagnostic should be improved
   16.32   * @author Maurizio Cimadamore

    17.1 --- a/test/tools/javac/6840059/T6840059.out	Thu Aug 27 13:40:48 2009 +0100
    17.2 +++ b/test/tools/javac/6840059/T6840059.out	Thu Aug 27 11:08:27 2009 -0700
    17.3 @@ -1,3 +1,3 @@
    17.4 -T6840059.java:38:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , java.lang.String, kindname.class, T6840059
    17.5 -T6840059.java:38:25: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , , kindname.class, T6840059
    17.6 +T6840059.java:15:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , java.lang.String, kindname.class, T6840059
    17.7 +T6840059.java:15:25: compiler.err.cant.resolve.location.args: kindname.constructor, T6840059, , , kindname.class, T6840059
    17.8  2 errors

    18.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234a.java	Thu Aug 27 13:40:48 2009 +0100
    18.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234a.java	Thu Aug 27 11:08:27 2009 -0700
    18.3 @@ -1,28 +1,5 @@
    18.4 -/*
    18.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    18.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    18.7 - *
    18.8 - * This code is free software; you can redistribute it and/or modify it
    18.9 - * under the terms of the GNU General Public License version 2 only, as
   18.10 - * published by the Free Software Foundation.
   18.11 - *
   18.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   18.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   18.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   18.15 - * version 2 for more details (a copy is included in the LICENSE file that
   18.16 - * accompanied this code).
   18.17 - *
   18.18 - * You should have received a copy of the GNU General Public License version
   18.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   18.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   18.21 - *
   18.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   18.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   18.24 - * have any questions.
   18.25 - */
   18.26 -
   18.27  /**
   18.28 - * @test
   18.29 + * @test /nodynamiccopyright/
   18.30   * @bug     6722234
   18.31   * @summary javac diagnostics need better integration with the type-system
   18.32   * @author  mcimadamore

    19.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234a_1.out	Thu Aug 27 13:40:48 2009 +0100
    19.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234a_1.out	Thu Aug 27 11:08:27 2009 -0700
    19.3 @@ -1,2 +1,2 @@
    19.4 -T6722234a.java:35:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
    19.5 +T6722234a.java:12:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
    19.6  1 error

    20.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234a_2.out	Thu Aug 27 13:40:48 2009 +0100
    20.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234a_2.out	Thu Aug 27 11:08:27 2009 -0700
    20.3 @@ -1,3 +1,3 @@
    20.4 -T6722234a.java:35:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
    20.5 +T6722234a.java:12:9: compiler.err.cant.apply.symbol: kindname.method, m, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T6722234a<compiler.misc.type.var: T, 1>, null
    20.6  - compiler.misc.where.description.typevar.1: compiler.misc.type.var: T, 1,compiler.misc.type.var: T, 2,{(compiler.misc.where.typevar: compiler.misc.type.var: T, 1, java.lang.String, kindname.class, T6722234a),(compiler.misc.where.typevar: compiler.misc.type.var: T, 2, java.lang.Integer, kindname.method, <compiler.misc.type.var: T, 2>test(compiler.misc.type.var: T, 2))}
    20.7  1 error

    21.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234b.java	Thu Aug 27 13:40:48 2009 +0100
    21.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234b.java	Thu Aug 27 11:08:27 2009 -0700
    21.3 @@ -1,28 +1,5 @@
    21.4 -/*
    21.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    21.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    21.7 - *
    21.8 - * This code is free software; you can redistribute it and/or modify it
    21.9 - * under the terms of the GNU General Public License version 2 only, as
   21.10 - * published by the Free Software Foundation.
   21.11 - *
   21.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   21.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   21.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   21.15 - * version 2 for more details (a copy is included in the LICENSE file that
   21.16 - * accompanied this code).
   21.17 - *
   21.18 - * You should have received a copy of the GNU General Public License version
   21.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   21.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   21.21 - *
   21.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   21.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   21.24 - * have any questions.
   21.25 - */
   21.26 -
   21.27  /**
   21.28 - * @test
   21.29 + * @test /nodynamiccopyright/
   21.30   * @bug     6722234
   21.31   * @summary javac diagnostics need better integration with the type-system
   21.32   * @author  mcimadamore

    22.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234b_1.out	Thu Aug 27 13:40:48 2009 +0100
    22.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234b_1.out	Thu Aug 27 11:08:27 2009 -0700
    22.3 @@ -1,2 +1,2 @@
    22.4 -T6722234b.java:39:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.type.captureof: 1, ? extends T6722234b>,List<compiler.misc.type.captureof: 2, ? extends T6722234b>, kindname.class, T6722234b, null
    22.5 +T6722234b.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.type.captureof: 1, ? extends T6722234b>,List<compiler.misc.type.captureof: 2, ? extends T6722234b>, kindname.class, T6722234b, null
    22.6  1 error

    23.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234b_2.out	Thu Aug 27 13:40:48 2009 +0100
    23.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234b_2.out	Thu Aug 27 11:08:27 2009 -0700
    23.3 @@ -1,4 +1,4 @@
    23.4 -T6722234b.java:39:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.captured.type: 1>,List<compiler.misc.captured.type: 2>, kindname.class, T6722234b, null
    23.5 +T6722234b.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, List<T>,List<T>, List<compiler.misc.captured.type: 1>,List<compiler.misc.captured.type: 2>, kindname.class, T6722234b, null
    23.6  - compiler.misc.where.description.typevar: T,{(compiler.misc.where.typevar: T, Object, kindname.method, <T>m(List<T>,List<T>))}
    23.7  - compiler.misc.where.description.captured.1: compiler.misc.captured.type: 1,compiler.misc.captured.type: 2,{(compiler.misc.where.captured.1: compiler.misc.captured.type: 1, T6722234b, compiler.misc.type.null, ? extends T6722234b),(compiler.misc.where.captured.1: compiler.misc.captured.type: 2, T6722234b, compiler.misc.type.null, ? extends T6722234b)}
    23.8  1 error

    24.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234c.java	Thu Aug 27 13:40:48 2009 +0100
    24.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234c.java	Thu Aug 27 11:08:27 2009 -0700
    24.3 @@ -1,28 +1,5 @@
    24.4 -/*
    24.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    24.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    24.7 - *
    24.8 - * This code is free software; you can redistribute it and/or modify it
    24.9 - * under the terms of the GNU General Public License version 2 only, as
   24.10 - * published by the Free Software Foundation.
   24.11 - *
   24.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   24.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   24.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   24.15 - * version 2 for more details (a copy is included in the LICENSE file that
   24.16 - * accompanied this code).
   24.17 - *
   24.18 - * You should have received a copy of the GNU General Public License version
   24.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   24.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   24.21 - *
   24.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   24.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   24.24 - * have any questions.
   24.25 - */
   24.26 -
   24.27  /**
   24.28 - * @test
   24.29 + * @test /nodynamiccopyright/
   24.30   * @bug     6722234
   24.31   * @summary javac diagnostics need better integration with the type-system
   24.32   * @author  mcimadamore

    25.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234c.out	Thu Aug 27 13:40:48 2009 +0100
    25.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234c.out	Thu Aug 27 11:08:27 2009 -0700
    25.3 @@ -1,2 +1,2 @@
    25.4 -T6722234c.java:37:9: compiler.err.cant.apply.symbol: kindname.method, m, T6722234c.String, java.lang.String, kindname.class, T6722234c, null
    25.5 +T6722234c.java:14:9: compiler.err.cant.apply.symbol: kindname.method, m, T6722234c.String, java.lang.String, kindname.class, T6722234c, null
    25.6  1 error

    26.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234d.java	Thu Aug 27 13:40:48 2009 +0100
    26.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234d.java	Thu Aug 27 11:08:27 2009 -0700
    26.3 @@ -1,28 +1,5 @@
    26.4 -/*
    26.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    26.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    26.7 - *
    26.8 - * This code is free software; you can redistribute it and/or modify it
    26.9 - * under the terms of the GNU General Public License version 2 only, as
   26.10 - * published by the Free Software Foundation.
   26.11 - *
   26.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   26.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   26.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   26.15 - * version 2 for more details (a copy is included in the LICENSE file that
   26.16 - * accompanied this code).
   26.17 - *
   26.18 - * You should have received a copy of the GNU General Public License version
   26.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   26.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   26.21 - *
   26.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   26.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   26.24 - * have any questions.
   26.25 - */
   26.26 -
   26.27  /**
   26.28 - * @test
   26.29 + * @test /nodynamiccopyright/
   26.30   * @bug     6722234
   26.31   * @summary javac diagnostics need better integration with the type-system
   26.32   * @author  mcimadamore

    27.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234d_1.out	Thu Aug 27 13:40:48 2009 +0100
    27.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234d_1.out	Thu Aug 27 11:08:27 2009 -0700
    27.3 @@ -1,3 +1,3 @@
    27.4 -T6722234d.java:41:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
    27.5 +T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
    27.6  - compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, java.lang.Object,T6722234d.I1,T6722234d.I2)}
    27.7  1 error

    28.1 --- a/test/tools/javac/Diagnostics/6722234/T6722234d_2.out	Thu Aug 27 13:40:48 2009 +0100
    28.2 +++ b/test/tools/javac/Diagnostics/6722234/T6722234d_2.out	Thu Aug 27 11:08:27 2009 -0700
    28.3 @@ -1,3 +1,3 @@
    28.4 -T6722234d.java:41:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
    28.5 +T6722234d.java:18:20: compiler.err.prob.found.req: (compiler.misc.incompatible.types), compiler.misc.intersection.type: 1, T6722234d.A
    28.6  - compiler.misc.where.description.intersection: compiler.misc.intersection.type: 1,{(compiler.misc.where.intersection: compiler.misc.intersection.type: 1, Object,I1,I2)}
    28.7  1 error

    29.1 --- a/test/tools/javac/Diagnostics/6799605/T6799605.java	Thu Aug 27 13:40:48 2009 +0100
    29.2 +++ b/test/tools/javac/Diagnostics/6799605/T6799605.java	Thu Aug 27 11:08:27 2009 -0700
    29.3 @@ -1,28 +1,5 @@
    29.4 -/*
    29.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    29.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.7 - *
    29.8 - * This code is free software; you can redistribute it and/or modify it
    29.9 - * under the terms of the GNU General Public License version 2 only, as
   29.10 - * published by the Free Software Foundation.
   29.11 - *
   29.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   29.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   29.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   29.15 - * version 2 for more details (a copy is included in the LICENSE file that
   29.16 - * accompanied this code).
   29.17 - *
   29.18 - * You should have received a copy of the GNU General Public License version
   29.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   29.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   29.21 - *
   29.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   29.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   29.24 - * have any questions.
   29.25 - */
   29.26 -
   29.27  /**
   29.28 - * @test
   29.29 + * @test /nodynamiccopyright/
   29.30   * @bug     6799605
   29.31   * @summary Basic/Raw formatters should use type/symbol printer instead of toString()
   29.32   * @author  mcimadamore

    30.1 --- a/test/tools/javac/Diagnostics/6799605/T6799605.out	Thu Aug 27 13:40:48 2009 +0100
    30.2 +++ b/test/tools/javac/Diagnostics/6799605/T6799605.out	Thu Aug 27 11:08:27 2009 -0700
    30.3 @@ -1,4 +1,4 @@
    30.4 -T6799605.java:40:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>, kindname.class, T6799605<X>
    30.5 -T6799605.java:41:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>, kindname.class, T6799605<X>
    30.6 -T6799605.java:42:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,T6799605<compiler.misc.type.captureof: 3, ?>, kindname.class, T6799605<X>
    30.7 +T6799605.java:17:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>, kindname.class, T6799605<X>
    30.8 +T6799605.java:18:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>, kindname.class, T6799605<X>
    30.9 +T6799605.java:19:9: compiler.err.cant.resolve.location.args: kindname.method, m, , T6799605<compiler.misc.type.captureof: 1, ?>,T6799605<compiler.misc.type.captureof: 2, ?>,T6799605<compiler.misc.type.captureof: 3, ?>, kindname.class, T6799605<X>
   30.10  3 errors

    31.1 --- a/test/tools/javac/Diagnostics/6860795/T6860795.java	Thu Aug 27 13:40:48 2009 +0100
    31.2 +++ b/test/tools/javac/Diagnostics/6860795/T6860795.java	Thu Aug 27 11:08:27 2009 -0700
    31.3 @@ -1,28 +1,5 @@
    31.4 -/*
    31.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    31.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    31.7 - *
    31.8 - * This code is free software; you can redistribute it and/or modify it
    31.9 - * under the terms of the GNU General Public License version 2 only, as
   31.10 - * published by the Free Software Foundation.
   31.11 - *
   31.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   31.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   31.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   31.15 - * version 2 for more details (a copy is included in the LICENSE file that
   31.16 - * accompanied this code).
   31.17 - *
   31.18 - * You should have received a copy of the GNU General Public License version
   31.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   31.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   31.21 - *
   31.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   31.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   31.24 - * have any questions.
   31.25 - */
   31.26 -
   31.27  /**
   31.28 - * @test
   31.29 + * @test /nodynamiccopyright/
   31.30   * @bug     6860795
   31.31   * @summary NullPointerException when compiling a negative java source
   31.32   * @author  mcimadamore

    32.1 --- a/test/tools/javac/Diagnostics/6860795/T6860795.out	Thu Aug 27 13:40:48 2009 +0100
    32.2 +++ b/test/tools/javac/Diagnostics/6860795/T6860795.out	Thu Aug 27 11:08:27 2009 -0700
    32.3 @@ -1,2 +1,2 @@
    32.4 -T6860795.java:33:27: compiler.err.already.defined: x, foo
    32.5 +T6860795.java:10:27: compiler.err.already.defined: x, foo
    32.6  1 error

    33.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608a.java	Thu Aug 27 13:40:48 2009 +0100
    33.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608a.java	Thu Aug 27 11:08:27 2009 -0700
    33.3 @@ -1,28 +1,5 @@
    33.4 -/*
    33.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    33.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.7 - *
    33.8 - * This code is free software; you can redistribute it and/or modify it
    33.9 - * under the terms of the GNU General Public License version 2 only, as
   33.10 - * published by the Free Software Foundation.
   33.11 - *
   33.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   33.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   33.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   33.15 - * version 2 for more details (a copy is included in the LICENSE file that
   33.16 - * accompanied this code).
   33.17 - *
   33.18 - * You should have received a copy of the GNU General Public License version
   33.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   33.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   33.21 - *
   33.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   33.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   33.24 - * have any questions.
   33.25 - */
   33.26 -
   33.27  /**
   33.28 - * @test
   33.29 + * @test /nodynamiccopyright/
   33.30   * @bug     6862608
   33.31   * @summary rich diagnostic sometimes contain wrong type variable numbering
   33.32   * @author  mcimadamore

    34.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608a.out	Thu Aug 27 13:40:48 2009 +0100
    34.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608a.out	Thu Aug 27 11:08:27 2009 -0700
    34.3 @@ -1,3 +1,3 @@
    34.4 -T6862608a.java:42:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
    34.5 +T6862608a.java:19:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
    34.6  - compiler.misc.where.description.typevar: T,{(compiler.misc.where.typevar: T, java.lang.Object, kindname.method, <T>compound(java.lang.Iterable<? extends java.util.Comparator<? super T>>))}
    34.7  1 error

    35.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608b.java	Thu Aug 27 13:40:48 2009 +0100
    35.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608b.java	Thu Aug 27 11:08:27 2009 -0700
    35.3 @@ -1,28 +1,5 @@
    35.4 -/*
    35.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    35.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    35.7 - *
    35.8 - * This code is free software; you can redistribute it and/or modify it
    35.9 - * under the terms of the GNU General Public License version 2 only, as
   35.10 - * published by the Free Software Foundation.
   35.11 - *
   35.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   35.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   35.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   35.15 - * version 2 for more details (a copy is included in the LICENSE file that
   35.16 - * accompanied this code).
   35.17 - *
   35.18 - * You should have received a copy of the GNU General Public License version
   35.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   35.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   35.21 - *
   35.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   35.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   35.24 - * have any questions.
   35.25 - */
   35.26 -
   35.27  /**
   35.28 - * @test
   35.29 + * @test /nodynamiccopyright/
   35.30   * @bug     6862608
   35.31   * @summary rich diagnostic sometimes contain wrong type variable numbering
   35.32   * @author  mcimadamore

    36.1 --- a/test/tools/javac/Diagnostics/6862608/T6862608b.out	Thu Aug 27 13:40:48 2009 +0100
    36.2 +++ b/test/tools/javac/Diagnostics/6862608/T6862608b.out	Thu Aug 27 11:08:27 2009 -0700
    36.3 @@ -1,3 +1,3 @@
    36.4 -T6862608b.java:34:7: compiler.err.cant.apply.symbol: kindname.method, test, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T66862608b<compiler.misc.type.var: T, 1,compiler.misc.type.var: S, 2>, null
    36.5 +T6862608b.java:11:7: compiler.err.cant.apply.symbol: kindname.method, test, compiler.misc.type.var: T, 1, compiler.misc.type.var: T, 2, kindname.class, T66862608b<compiler.misc.type.var: T, 1,compiler.misc.type.var: S, 2>, null
    36.6  - compiler.misc.where.description.typevar.1: compiler.misc.type.var: T, 1,compiler.misc.type.var: T, 2,compiler.misc.type.var: S, 1,compiler.misc.type.var: S, 2,{(compiler.misc.where.typevar: compiler.misc.type.var: T, 1, java.lang.String, kindname.class, T66862608b),(compiler.misc.where.typevar: compiler.misc.type.var: T, 2, compiler.misc.type.var: S, 1, kindname.method, <compiler.misc.type.var: S, 1,compiler.misc.type.var: T, 2>foo(compiler.misc.type.var: T, 2)),(compiler.misc.where.typevar: compiler.misc.type.var: S, 1, java.lang.Object, kindname.method, <compiler.misc.type.var: S, 1,compiler.misc.type.var: T, 2>foo(compiler.misc.type.var: T, 2)),(compiler.misc.where.typevar: compiler.misc.type.var: S, 2, java.lang.Object, kindname.class, T66862608b)}
    36.7  1 error

    37.1 --- a/test/tools/javac/Diagnostics/6864382/T6864382.java	Thu Aug 27 13:40:48 2009 +0100
    37.2 +++ b/test/tools/javac/Diagnostics/6864382/T6864382.java	Thu Aug 27 11:08:27 2009 -0700
    37.3 @@ -1,28 +1,5 @@
    37.4 -/*
    37.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    37.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    37.7 - *
    37.8 - * This code is free software; you can redistribute it and/or modify it
    37.9 - * under the terms of the GNU General Public License version 2 only, as
   37.10 - * published by the Free Software Foundation.
   37.11 - *
   37.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   37.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   37.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   37.15 - * version 2 for more details (a copy is included in the LICENSE file that
   37.16 - * accompanied this code).
   37.17 - *
   37.18 - * You should have received a copy of the GNU General Public License version
   37.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   37.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   37.21 - *
   37.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   37.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   37.24 - * have any questions.
   37.25 - */
   37.26 -
   37.27  /**
   37.28 - * @test
   37.29 + * @test /nodynamiccopyright/
   37.30   * @bug     6864382
   37.31   * @summary NullPointerException when compiling a negative java source
   37.32   * @author  mcimadamore

    38.1 --- a/test/tools/javac/Diagnostics/6864382/T6864382.out	Thu Aug 27 13:40:48 2009 +0100
    38.2 +++ b/test/tools/javac/Diagnostics/6864382/T6864382.out	Thu Aug 27 11:08:27 2009 -0700
    38.3 @@ -1,2 +1,2 @@
    38.4 -T6864382.java:32:27: compiler.err.type.found.req: (compiler.misc.type.parameter: T), (compiler.misc.type.req.class)
    38.5 +T6864382.java:9:27: compiler.err.type.found.req: (compiler.misc.type.parameter: T), (compiler.misc.type.req.class)
    38.6  1 error

    39.1 --- a/test/tools/javac/OverrideChecks/6199153/T6199153.java	Thu Aug 27 13:40:48 2009 +0100
    39.2 +++ b/test/tools/javac/OverrideChecks/6199153/T6199153.java	Thu Aug 27 11:08:27 2009 -0700
    39.3 @@ -1,28 +1,5 @@
    39.4 -/*
    39.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    39.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    39.7 - *
    39.8 - * This code is free software; you can redistribute it and/or modify it
    39.9 - * under the terms of the GNU General Public License version 2 only, as
   39.10 - * published by the Free Software Foundation.
   39.11 - *
   39.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   39.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   39.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   39.15 - * version 2 for more details (a copy is included in the LICENSE file that
   39.16 - * accompanied this code).
   39.17 - *
   39.18 - * You should have received a copy of the GNU General Public License version
   39.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   39.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   39.21 - *
   39.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   39.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   39.24 - * have any questions.
   39.25 - */
   39.26 -
   39.27  /**
   39.28 - * @test
   39.29 + * @test /nodynamiccopyright/
   39.30   * @bug 6199153
   39.31   * @summary Generic throws and overriding
   39.32   * @author  mcimadamore

    40.1 --- a/test/tools/javac/OverrideChecks/6199153/T6199153.out	Thu Aug 27 13:40:48 2009 +0100
    40.2 +++ b/test/tools/javac/OverrideChecks/6199153/T6199153.out	Thu Aug 27 11:08:27 2009 -0700
    40.3 @@ -1,4 +1,4 @@
    40.4 -T6199153.java:41:21: compiler.warn.override.unchecked.thrown: (compiler.misc.cant.override: m(), T6199153.B, <T>m(), T6199153.A), java.io.IOException
    40.5 +T6199153.java:18:21: compiler.warn.override.unchecked.thrown: (compiler.misc.cant.override: m(), T6199153.B, <T>m(), T6199153.A), java.io.IOException
    40.6  - compiler.err.warnings.and.werror
    40.7  1 error
    40.8  1 warning

    41.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189a.java	Thu Aug 27 13:40:48 2009 +0100
    41.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189a.java	Thu Aug 27 11:08:27 2009 -0700
    41.3 @@ -1,28 +1,5 @@
    41.4  /*
    41.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    41.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    41.7 - *
    41.8 - * This code is free software; you can redistribute it and/or modify it
    41.9 - * under the terms of the GNU General Public License version 2 only, as
   41.10 - * published by the Free Software Foundation.
   41.11 - *
   41.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   41.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   41.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   41.15 - * version 2 for more details (a copy is included in the LICENSE file that
   41.16 - * accompanied this code).
   41.17 - *
   41.18 - * You should have received a copy of the GNU General Public License version
   41.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   41.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   41.21 - *
   41.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   41.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   41.24 - * have any questions.
   41.25 - */
   41.26 -
   41.27 -/*
   41.28 - * @test
   41.29 + * @test /nodynamiccopyright/
   41.30   * @bug     6400189
   41.31   * @summary raw types and inference
   41.32   * @author  mcimadamore

    42.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189a.out	Thu Aug 27 13:40:48 2009 +0100
    42.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189a.out	Thu Aug 27 11:08:27 2009 -0700
    42.3 @@ -1,4 +1,4 @@
    42.4 -T6400189a.java:37:35: compiler.warn.unchecked.call.mbr.of.raw.type: <T>getAnnotation(java.lang.Class<T>), java.lang.reflect.Constructor
    42.5 -T6400189a.java:37:35: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.annotation.Annotation, java.lang.annotation.Documented
    42.6 +T6400189a.java:14:35: compiler.warn.unchecked.call.mbr.of.raw.type: <T>getAnnotation(java.lang.Class<T>), java.lang.reflect.Constructor
    42.7 +T6400189a.java:14:35: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.annotation.Annotation, java.lang.annotation.Documented
    42.8  1 error
    42.9  1 warning

    43.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189b.java	Thu Aug 27 13:40:48 2009 +0100
    43.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189b.java	Thu Aug 27 11:08:27 2009 -0700
    43.3 @@ -1,28 +1,5 @@
    43.4  /*
    43.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    43.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    43.7 - *
    43.8 - * This code is free software; you can redistribute it and/or modify it
    43.9 - * under the terms of the GNU General Public License version 2 only, as
   43.10 - * published by the Free Software Foundation.
   43.11 - *
   43.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   43.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   43.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   43.15 - * version 2 for more details (a copy is included in the LICENSE file that
   43.16 - * accompanied this code).
   43.17 - *
   43.18 - * You should have received a copy of the GNU General Public License version
   43.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   43.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   43.21 - *
   43.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   43.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   43.24 - * have any questions.
   43.25 - */
   43.26 -
   43.27 -/*
   43.28 - * @test
   43.29 + * @test /nodynamiccopyright/
   43.30   * @bug     6400189
   43.31   * @summary raw types and inference
   43.32   * @author  mcimadamore

    44.1 --- a/test/tools/javac/OverrideChecks/6400189/T6400189b.out	Thu Aug 27 13:40:48 2009 +0100
    44.2 +++ b/test/tools/javac/OverrideChecks/6400189/T6400189b.out	Thu Aug 27 11:08:27 2009 -0700
    44.3 @@ -1,4 +1,4 @@
    44.4 -T6400189b.java:47:24: compiler.warn.unchecked.call.mbr.of.raw.type: <T>m(T6400189b<T>), T6400189b.B
    44.5 -T6400189b.java:47:24: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.Object, java.lang.Integer
    44.6 +T6400189b.java:24:24: compiler.warn.unchecked.call.mbr.of.raw.type: <T>m(T6400189b<T>), T6400189b.B
    44.7 +T6400189b.java:24:24: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.lang.Object, java.lang.Integer
    44.8  1 error
    44.9  1 warning

    45.1 --- a/test/tools/javac/cast/6467183/T6467183a.java	Thu Aug 27 13:40:48 2009 +0100
    45.2 +++ b/test/tools/javac/cast/6467183/T6467183a.java	Thu Aug 27 11:08:27 2009 -0700
    45.3 @@ -1,28 +1,5 @@
    45.4  /*
    45.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    45.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    45.7 - *
    45.8 - * This code is free software; you can redistribute it and/or modify it
    45.9 - * under the terms of the GNU General Public License version 2 only, as
   45.10 - * published by the Free Software Foundation.
   45.11 - *
   45.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   45.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   45.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   45.15 - * version 2 for more details (a copy is included in the LICENSE file that
   45.16 - * accompanied this code).
   45.17 - *
   45.18 - * You should have received a copy of the GNU General Public License version
   45.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   45.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   45.21 - *
   45.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   45.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   45.24 - * have any questions.
   45.25 - */
   45.26 -
   45.27 -/*
   45.28 - * @test
   45.29 + * @test /nodynamiccopyright/
   45.30   * @author mcimadamore
   45.31   * @bug     6467183
   45.32   * @summary

    46.1 --- a/test/tools/javac/cast/6467183/T6467183a.out	Thu Aug 27 13:40:48 2009 +0100
    46.2 +++ b/test/tools/javac/cast/6467183/T6467183a.out	Thu Aug 27 11:08:27 2009 -0700
    46.3 @@ -1,6 +1,6 @@
    46.4 -T6467183a.java:39:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.B, T6467183a<T>.A<T>
    46.5 -T6467183a.java:47:41: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Number>
    46.6 -T6467183a.java:51:42: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Integer>
    46.7 +T6467183a.java:16:26: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.B, T6467183a<T>.A<T>
    46.8 +T6467183a.java:24:41: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Number>
    46.9 +T6467183a.java:28:42: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T6467183a<T>.A<java.lang.Integer>, T6467183a<T>.C<? extends java.lang.Integer>
   46.10  - compiler.err.warnings.and.werror
   46.11  1 error
   46.12  3 warnings

    47.1 --- a/test/tools/javac/cast/6557182/T6557182.java	Thu Aug 27 13:40:48 2009 +0100
    47.2 +++ b/test/tools/javac/cast/6557182/T6557182.java	Thu Aug 27 11:08:27 2009 -0700
    47.3 @@ -1,28 +1,5 @@
    47.4  /*
    47.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    47.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    47.7 - *
    47.8 - * This code is free software; you can redistribute it and/or modify it
    47.9 - * under the terms of the GNU General Public License version 2 only, as
   47.10 - * published by the Free Software Foundation.
   47.11 - *
   47.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   47.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   47.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   47.15 - * version 2 for more details (a copy is included in the LICENSE file that
   47.16 - * accompanied this code).
   47.17 - *
   47.18 - * You should have received a copy of the GNU General Public License version
   47.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   47.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   47.21 - *
   47.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   47.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   47.24 - * have any questions.
   47.25 - */
   47.26 -
   47.27 -/*
   47.28 - * @test
   47.29 + * @test /nodynamiccopyright/
   47.30   * @author Maurizio Cimadamore
   47.31   * @bug     6557182
   47.32   * @summary  Unchecked warning *and* inconvertible types

    48.1 --- a/test/tools/javac/cast/6557182/T6557182.out	Thu Aug 27 13:40:48 2009 +0100
    48.2 +++ b/test/tools/javac/cast/6557182/T6557182.out	Thu Aug 27 11:08:27 2009 -0700
    48.3 @@ -1,4 +1,4 @@
    48.4 -T6557182.java:35:56: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T, java.lang.Comparable<java.lang.Integer>
    48.5 -T6557182.java:39:56: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T, java.lang.Comparable<java.lang.Integer>
    48.6 +T6557182.java:12:56: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T, java.lang.Comparable<java.lang.Integer>
    48.7 +T6557182.java:16:56: compiler.warn.prob.found.req: (compiler.misc.unchecked.cast.to.type), T, java.lang.Comparable<java.lang.Integer>
    48.8  1 error
    48.9  1 warning

    49.1 --- a/test/tools/javac/cast/6665356/T6665356.java	Thu Aug 27 13:40:48 2009 +0100
    49.2 +++ b/test/tools/javac/cast/6665356/T6665356.java	Thu Aug 27 11:08:27 2009 -0700
    49.3 @@ -1,28 +1,5 @@
    49.4  /*
    49.5 - * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
    49.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    49.7 - *
    49.8 - * This code is free software; you can redistribute it and/or modify it
    49.9 - * under the terms of the GNU General Public License version 2 only, as
   49.10 - * published by the Free Software Foundation.
   49.11 - *
   49.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   49.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   49.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   49.15 - * version 2 for more details (a copy is included in the LICENSE file that
   49.16 - * accompanied this code).
   49.17 - *
   49.18 - * You should have received a copy of the GNU General Public License version
   49.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   49.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   49.21 - *
   49.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   49.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   49.24 - * have any questions.
   49.25 - */
   49.26 -
   49.27 -/*
   49.28 - * @test
   49.29 + * @test /nodynamiccopyright/
   49.30   * @author Maurizio Cimadamore
   49.31   * @bug     6665356
   49.32   * @summary Cast not allowed when both qualifying type and inner class are parameterized
   49.33 @@ -77,4 +54,4 @@
   49.34      void cast11(Outer<Integer>.Inner<Long> p) {
   49.35          Object o = (Outer<Integer>.Inner<? super String>)p;
   49.36      }
   49.37 -}
   49.38 \ No newline at end of file
   49.39 +}

    50.1 --- a/test/tools/javac/cast/6665356/T6665356.out	Thu Aug 27 13:40:48 2009 +0100
    50.2 +++ b/test/tools/javac/cast/6665356/T6665356.out	Thu Aug 27 11:08:27 2009 -0700
    50.3 @@ -1,8 +1,8 @@
    50.4 -T6665356.java:54:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<java.lang.Long>
    50.5 -T6665356.java:58:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.Number>
    50.6 -T6665356.java:62:65: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>
    50.7 -T6665356.java:66:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? extends java.lang.String>.Inner<java.lang.Long>
    50.8 -T6665356.java:70:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? extends java.lang.String>
    50.9 -T6665356.java:74:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.String>.Inner<java.lang.Long>
   50.10 -T6665356.java:78:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.String>
   50.11 -7 errors
   50.12 \ No newline at end of file
   50.13 +T6665356.java:31:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<java.lang.Long>
   50.14 +T6665356.java:35:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.Number>
   50.15 +T6665356.java:39:65: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>
   50.16 +T6665356.java:43:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? extends java.lang.String>.Inner<java.lang.Long>
   50.17 +T6665356.java:47:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? extends java.lang.String>
   50.18 +T6665356.java:51:55: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<? super java.lang.String>.Inner<java.lang.Long>
   50.19 +T6665356.java:55:58: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6665356.Outer<java.lang.Integer>.Inner<java.lang.Long>, T6665356.Outer<java.lang.Integer>.Inner<? super java.lang.String>
   50.20 +7 errors

    51.1 --- a/test/tools/javac/cast/6795580/T6795580.java	Thu Aug 27 13:40:48 2009 +0100
    51.2 +++ b/test/tools/javac/cast/6795580/T6795580.java	Thu Aug 27 11:08:27 2009 -0700
    51.3 @@ -1,28 +1,5 @@
    51.4  /*
    51.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    51.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    51.7 - *
    51.8 - * This code is free software; you can redistribute it and/or modify it
    51.9 - * under the terms of the GNU General Public License version 2 only, as
   51.10 - * published by the Free Software Foundation.
   51.11 - *
   51.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   51.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   51.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   51.15 - * version 2 for more details (a copy is included in the LICENSE file that
   51.16 - * accompanied this code).
   51.17 - *
   51.18 - * You should have received a copy of the GNU General Public License version
   51.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   51.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   51.21 - *
   51.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   51.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   51.24 - * have any questions.
   51.25 - */
   51.26 -
   51.27 -/*
   51.28 - * @test
   51.29 + * @test /nodynamiccopyright/
   51.30   * @author Maurizio Cimadamore
   51.31   * @bug     6795580
   51.32   * @summary parser confused by square brackets in qualified generic cast
   51.33 @@ -77,4 +54,4 @@
   51.34      void cast11(Outer<Integer>.Inner<Long>[] p) {
   51.35          Object o = (Outer<Integer>.Inner<? super String>[])p;
   51.36      }
   51.37 -}
   51.38 \ No newline at end of file
   51.39 +}

    52.1 --- a/test/tools/javac/cast/6795580/T6795580.out	Thu Aug 27 13:40:48 2009 +0100
    52.2 +++ b/test/tools/javac/cast/6795580/T6795580.out	Thu Aug 27 11:08:27 2009 -0700
    52.3 @@ -1,8 +1,8 @@
    52.4 -T6795580.java:54:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<java.lang.Long>[]
    52.5 -T6795580.java:58:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.Number>[]
    52.6 -T6795580.java:62:67: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>[]
    52.7 -T6795580.java:66:59: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? extends java.lang.String>.Inner<java.lang.Long>[]
    52.8 -T6795580.java:70:62: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? extends java.lang.String>[]
    52.9 -T6795580.java:74:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.String>.Inner<java.lang.Long>[]
   52.10 -T6795580.java:78:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.String>[]
   52.11 +T6795580.java:31:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<java.lang.Long>[]
   52.12 +T6795580.java:35:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.Number>[]
   52.13 +T6795580.java:39:67: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>[]
   52.14 +T6795580.java:43:59: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? extends java.lang.String>.Inner<java.lang.Long>[]
   52.15 +T6795580.java:47:62: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? extends java.lang.String>[]
   52.16 +T6795580.java:51:57: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.String>.Inner<java.lang.Long>[]
   52.17 +T6795580.java:55:60: compiler.err.prob.found.req: (compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.String>[]
   52.18  7 errors

    53.1 --- a/test/tools/javac/generics/5009937/T5009937.java	Thu Aug 27 13:40:48 2009 +0100
    53.2 +++ b/test/tools/javac/generics/5009937/T5009937.java	Thu Aug 27 11:08:27 2009 -0700
    53.3 @@ -1,28 +1,5 @@
    53.4  /*
    53.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    53.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    53.7 - *
    53.8 - * This code is free software; you can redistribute it and/or modify it
    53.9 - * under the terms of the GNU General Public License version 2 only, as
   53.10 - * published by the Free Software Foundation.
   53.11 - *
   53.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   53.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   53.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   53.15 - * version 2 for more details (a copy is included in the LICENSE file that
   53.16 - * accompanied this code).
   53.17 - *
   53.18 - * You should have received a copy of the GNU General Public License version
   53.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   53.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   53.21 - *
   53.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   53.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   53.24 - * have any questions.
   53.25 - */
   53.26 -
   53.27 -/*
   53.28 - * @test
   53.29 + * @test /nodynamiccopyright/
   53.30   * @bug 5009937
   53.31   * @summary hiding versus generics versus binary compatibility
   53.32   * @author Maurizio Cimadamore

    54.1 --- a/test/tools/javac/generics/5009937/T5009937.out	Thu Aug 27 13:40:48 2009 +0100
    54.2 +++ b/test/tools/javac/generics/5009937/T5009937.out	Thu Aug 27 11:08:27 2009 -0700
    54.3 @@ -1,2 +1,2 @@
    54.4 -T5009937.java:39:21: compiler.err.name.clash.same.erasure.no.override: m(T5009937<java.lang.Integer>), T5009937.B, m(T5009937<java.lang.String>), T5009937.A
    54.5 +T5009937.java:16:21: compiler.err.name.clash.same.erasure.no.override: m(T5009937<java.lang.Integer>), T5009937.B, m(T5009937<java.lang.String>), T5009937.A
    54.6  1 error

    55.1 --- a/test/tools/javac/generics/6182950/T6182950a.java	Thu Aug 27 13:40:48 2009 +0100
    55.2 +++ b/test/tools/javac/generics/6182950/T6182950a.java	Thu Aug 27 11:08:27 2009 -0700
    55.3 @@ -1,28 +1,5 @@
    55.4  /*
    55.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    55.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55.7 - *
    55.8 - * This code is free software; you can redistribute it and/or modify it
    55.9 - * under the terms of the GNU General Public License version 2 only, as
   55.10 - * published by the Free Software Foundation.
   55.11 - *
   55.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   55.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   55.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   55.15 - * version 2 for more details (a copy is included in the LICENSE file that
   55.16 - * accompanied this code).
   55.17 - *
   55.18 - * You should have received a copy of the GNU General Public License version
   55.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   55.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   55.21 - *
   55.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   55.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   55.24 - * have any questions.
   55.25 - */
   55.26 -
   55.27 -/*
   55.28 - * @test
   55.29 + * @test /nodynamiccopyright/
   55.30   * @bug     6182950
   55.31   * @summary methods clash algorithm should not depend on return type
   55.32   * @author  mcimadamore

    56.1 --- a/test/tools/javac/generics/6182950/T6182950a.out	Thu Aug 27 13:40:48 2009 +0100
    56.2 +++ b/test/tools/javac/generics/6182950/T6182950a.out	Thu Aug 27 11:08:27 2009 -0700
    56.3 @@ -1,2 +1,2 @@
    56.4 -T6182950a.java:35:12: compiler.err.name.clash.same.erasure: m(java.util.List<java.lang.Integer>), m(java.util.List<java.lang.String>)
    56.5 +T6182950a.java:12:12: compiler.err.name.clash.same.erasure: m(java.util.List<java.lang.Integer>), m(java.util.List<java.lang.String>)
    56.6  1 error

    57.1 --- a/test/tools/javac/generics/6182950/T6182950b.java	Thu Aug 27 13:40:48 2009 +0100
    57.2 +++ b/test/tools/javac/generics/6182950/T6182950b.java	Thu Aug 27 11:08:27 2009 -0700
    57.3 @@ -1,28 +1,5 @@
    57.4  /*
    57.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    57.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    57.7 - *
    57.8 - * This code is free software; you can redistribute it and/or modify it
    57.9 - * under the terms of the GNU General Public License version 2 only, as
   57.10 - * published by the Free Software Foundation.
   57.11 - *
   57.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   57.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   57.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   57.15 - * version 2 for more details (a copy is included in the LICENSE file that
   57.16 - * accompanied this code).
   57.17 - *
   57.18 - * You should have received a copy of the GNU General Public License version
   57.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   57.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   57.21 - *
   57.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   57.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   57.24 - * have any questions.
   57.25 - */
   57.26 -
   57.27 -/*
   57.28 - * @test
   57.29 + * @test /nodynamiccopyright/
   57.30   * @bug     6182950
   57.31   * @summary methods clash algorithm should not depend on return type
   57.32   * @author  mcimadamore

    58.1 --- a/test/tools/javac/generics/6182950/T6182950b.out	Thu Aug 27 13:40:48 2009 +0100
    58.2 +++ b/test/tools/javac/generics/6182950/T6182950b.out	Thu Aug 27 11:08:27 2009 -0700
    58.3 @@ -1,2 +1,2 @@
    58.4 -T6182950b.java:38:16: compiler.err.name.clash.same.erasure.no.override: m(java.util.List<java.lang.Integer>), T6182950b.B, m(java.util.List<java.lang.String>), T6182950b.A
    58.5 +T6182950b.java:15:16: compiler.err.name.clash.same.erasure.no.override: m(java.util.List<java.lang.Integer>), T6182950b.B, m(java.util.List<java.lang.String>), T6182950b.A
    58.6  1 error

    59.1 --- a/test/tools/javac/generics/6677785/T6677785.java	Thu Aug 27 13:40:48 2009 +0100
    59.2 +++ b/test/tools/javac/generics/6677785/T6677785.java	Thu Aug 27 11:08:27 2009 -0700
    59.3 @@ -1,28 +1,5 @@
    59.4  /*
    59.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    59.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    59.7 - *
    59.8 - * This code is free software; you can redistribute it and/or modify it
    59.9 - * under the terms of the GNU General Public License version 2 only, as
   59.10 - * published by the Free Software Foundation.
   59.11 - *
   59.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   59.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   59.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   59.15 - * version 2 for more details (a copy is included in the LICENSE file that
   59.16 - * accompanied this code).
   59.17 - *
   59.18 - * You should have received a copy of the GNU General Public License version
   59.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   59.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   59.21 - *
   59.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   59.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   59.24 - * have any questions.
   59.25 - */
   59.26 -
   59.27 -/*
   59.28 - * @test
   59.29 + * @test /nodynamiccopyright/
   59.30   * @bug     6677785
   59.31   * @summary REGRESSION: StackOverFlowError with Cyclic Class level Type Parameters when used in constructors
   59.32   * @author Maurizio Cimadamore

    60.1 --- a/test/tools/javac/generics/6677785/T6677785.out	Thu Aug 27 13:40:48 2009 +0100
    60.2 +++ b/test/tools/javac/generics/6677785/T6677785.out	Thu Aug 27 11:08:27 2009 -0700
    60.3 @@ -1,2 +1,2 @@
    60.4 -T6677785.java:31:23: compiler.err.cyclic.inheritance: E
    60.5 +T6677785.java:8:23: compiler.err.cyclic.inheritance: E
    60.6  1 error

    61.1 --- a/test/tools/javac/generics/6711619/T6711619a.java	Thu Aug 27 13:40:48 2009 +0100
    61.2 +++ b/test/tools/javac/generics/6711619/T6711619a.java	Thu Aug 27 11:08:27 2009 -0700
    61.3 @@ -1,28 +1,5 @@
    61.4  /*
    61.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    61.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    61.7 - *
    61.8 - * This code is free software; you can redistribute it and/or modify it
    61.9 - * under the terms of the GNU General Public License version 2 only, as
   61.10 - * published by the Free Software Foundation.
   61.11 - *
   61.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   61.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   61.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   61.15 - * version 2 for more details (a copy is included in the LICENSE file that
   61.16 - * accompanied this code).
   61.17 - *
   61.18 - * You should have received a copy of the GNU General Public License version
   61.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   61.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   61.21 - *
   61.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   61.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   61.24 - * have any questions.
   61.25 - */
   61.26 -
   61.27 -/*
   61.28 - * @test
   61.29 + * @test /nodynamiccopyright/
   61.30   * @bug 6711619
   61.31   *
   61.32   * @summary javac doesn't allow access to protected members in intersection types
   61.33 @@ -71,4 +48,4 @@
   61.34          ta = arg.w.a;
   61.35          tb = arg.w.b;
   61.36      }
   61.37 -}
   61.38 \ No newline at end of file
   61.39 +}

    62.1 --- a/test/tools/javac/generics/6711619/T6711619a.out	Thu Aug 27 13:40:48 2009 +0100
    62.2 +++ b/test/tools/javac/generics/6711619/T6711619a.out	Thu Aug 27 11:08:27 2009 -0700
    62.3 @@ -1,7 +1,7 @@
    62.4 -T6711619a.java:63:14: compiler.err.cant.resolve.args: kindname.method, a, , 
    62.5 -T6711619a.java:64:14: compiler.err.cant.resolve.args: kindname.method, b, , 
    62.6 -T6711619a.java:69:19: compiler.err.report.access: a, private, T6711619a.A
    62.7 -T6711619a.java:70:19: compiler.err.report.access: b, private, T6711619a.B
    62.8 -T6711619a.java:71:19: compiler.err.report.access: a, private, T6711619a.A
    62.9 -T6711619a.java:72:19: compiler.err.report.access: b, private, T6711619a.B
   62.10 +T6711619a.java:40:14: compiler.err.cant.resolve.args: kindname.method, a, , 
   62.11 +T6711619a.java:41:14: compiler.err.cant.resolve.args: kindname.method, b, , 
   62.12 +T6711619a.java:46:19: compiler.err.report.access: a, private, T6711619a.A
   62.13 +T6711619a.java:47:19: compiler.err.report.access: b, private, T6711619a.B
   62.14 +T6711619a.java:48:19: compiler.err.report.access: a, private, T6711619a.A
   62.15 +T6711619a.java:49:19: compiler.err.report.access: b, private, T6711619a.B
   62.16  6 errors

    63.1 --- a/test/tools/javac/generics/6711619/T6711619b.java	Thu Aug 27 13:40:48 2009 +0100
    63.2 +++ b/test/tools/javac/generics/6711619/T6711619b.java	Thu Aug 27 11:08:27 2009 -0700
    63.3 @@ -1,28 +1,5 @@
    63.4  /*
    63.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    63.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    63.7 - *
    63.8 - * This code is free software; you can redistribute it and/or modify it
    63.9 - * under the terms of the GNU General Public License version 2 only, as
   63.10 - * published by the Free Software Foundation.
   63.11 - *
   63.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   63.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   63.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   63.15 - * version 2 for more details (a copy is included in the LICENSE file that
   63.16 - * accompanied this code).
   63.17 - *
   63.18 - * You should have received a copy of the GNU General Public License version
   63.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   63.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   63.21 - *
   63.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   63.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   63.24 - * have any questions.
   63.25 - */
   63.26 -
   63.27 -/*
   63.28 - * @test
   63.29 + * @test /nodynamiccopyright/
   63.30   * @bug 6711619
   63.31   *
   63.32   * @summary javac doesn't allow access to protected members in intersection types
   63.33 @@ -61,4 +38,4 @@
   63.34               return E.i;
   63.35           }
   63.36      }
   63.37 -}
   63.38 \ No newline at end of file
   63.39 +}

    64.1 --- a/test/tools/javac/generics/6711619/T6711619b.out	Thu Aug 27 13:40:48 2009 +0100
    64.2 +++ b/test/tools/javac/generics/6711619/T6711619b.out	Thu Aug 27 11:08:27 2009 -0700
    64.3 @@ -1,5 +1,5 @@
    64.4 -T6711619b.java:39:22: compiler.err.report.access: i, private, T6711619b.X1
    64.5 -T6711619b.java:46:22: compiler.err.report.access: i, private, T6711619b.X2
    64.6 -T6711619b.java:54:22: compiler.err.report.access: i, private, T6711619b.X3
    64.7 -T6711619b.java:61:22: compiler.err.report.access: i, private, T6711619b.X4
    64.8 +T6711619b.java:16:22: compiler.err.report.access: i, private, T6711619b.X1
    64.9 +T6711619b.java:23:22: compiler.err.report.access: i, private, T6711619b.X2
   64.10 +T6711619b.java:31:22: compiler.err.report.access: i, private, T6711619b.X3
   64.11 +T6711619b.java:38:22: compiler.err.report.access: i, private, T6711619b.X4
   64.12  4 errors

    65.1 --- a/test/tools/javac/generics/6723444/T6723444.java	Thu Aug 27 13:40:48 2009 +0100
    65.2 +++ b/test/tools/javac/generics/6723444/T6723444.java	Thu Aug 27 11:08:27 2009 -0700
    65.3 @@ -1,28 +1,5 @@
    65.4  /*
    65.5 - * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
    65.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    65.7 - *
    65.8 - * This code is free software; you can redistribute it and/or modify it
    65.9 - * under the terms of the GNU General Public License version 2 only, as
   65.10 - * published by the Free Software Foundation.
   65.11 - *
   65.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   65.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   65.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   65.15 - * version 2 for more details (a copy is included in the LICENSE file that
   65.16 - * accompanied this code).
   65.17 - *
   65.18 - * You should have received a copy of the GNU General Public License version
   65.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   65.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   65.21 - *
   65.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   65.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   65.24 - * have any questions.
   65.25 - */
   65.26 -
   65.27 -/*
   65.28 - * @test
   65.29 + * @test /nodynamiccopyright/
   65.30   * @bug 6723444
   65.31   *
   65.32   * @summary javac fails to substitute type variables into a constructor's throws clause

    66.1 --- a/test/tools/javac/generics/6723444/T6723444.out	Thu Aug 27 13:40:48 2009 +0100
    66.2 +++ b/test/tools/javac/generics/6723444/T6723444.out	Thu Aug 27 11:08:27 2009 -0700
    66.3 @@ -1,13 +1,13 @@
    66.4 -T6723444.java:65:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
    66.5 -T6723444.java:66:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
    66.6 -T6723444.java:68:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
    66.7 -T6723444.java:69:17: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
    66.8 -T6723444.java:71:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
    66.9 -T6723444.java:72:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.10 -T6723444.java:73:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.11 -T6723444.java:74:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.12 -T6723444.java:75:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.13 -T6723444.java:76:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.14 -T6723444.java:77:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.15 -T6723444.java:78:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.16 -12 errors
   66.17 \ No newline at end of file
   66.18 +T6723444.java:42:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
   66.19 +T6723444.java:43:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
   66.20 +T6723444.java:45:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.21 +T6723444.java:46:17: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.22 +T6723444.java:48:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.23 +T6723444.java:49:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.24 +T6723444.java:50:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.25 +T6723444.java:51:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.26 +T6723444.java:52:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.27 +T6723444.java:53:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.28 +T6723444.java:54:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.29 +T6723444.java:55:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
   66.30 +12 errors

    67.1 --- a/test/tools/javac/generics/inference/6315770/T6315770.java	Thu Aug 27 13:40:48 2009 +0100
    67.2 +++ b/test/tools/javac/generics/inference/6315770/T6315770.java	Thu Aug 27 11:08:27 2009 -0700
    67.3 @@ -1,28 +1,5 @@
    67.4 -/*
    67.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    67.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    67.7 - *
    67.8 - * This code is free software; you can redistribute it and/or modify it
    67.9 - * under the terms of the GNU General Public License version 2 only, as
   67.10 - * published by the Free Software Foundation.
   67.11 - *
   67.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   67.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   67.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   67.15 - * version 2 for more details (a copy is included in the LICENSE file that
   67.16 - * accompanied this code).
   67.17 - *
   67.18 - * You should have received a copy of the GNU General Public License version
   67.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   67.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   67.21 - *
   67.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   67.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   67.24 - * have any questions.
   67.25 - */
   67.26 -
   67.27  /**
   67.28 - * @test
   67.29 + * @test /nodynamiccopyright/
   67.30   * @bug     6315770
   67.31   * @summary javac inference allows creation of strange types: Integer & Runnable
   67.32   * @author Maurizio Cimadamore

    68.1 --- a/test/tools/javac/generics/inference/6315770/T6315770.out	Thu Aug 27 13:40:48 2009 +0100
    68.2 +++ b/test/tools/javac/generics/inference/6315770/T6315770.out	Thu Aug 27 11:08:27 2009 -0700
    68.3 @@ -1,3 +1,3 @@
    68.4 -T6315770.java:39:42: compiler.err.undetermined.type.1: <T>T6315770<T>, (compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
    68.5 -T6315770.java:40:40: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.no.conforming.instance.exists: T, T6315770<T>, T6315770<? super java.lang.String>)), <T>T6315770<T>, T6315770<? super java.lang.String>
    68.6 +T6315770.java:16:42: compiler.err.undetermined.type.1: <T>T6315770<T>, (compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable)
    68.7 +T6315770.java:17:40: compiler.err.prob.found.req: (compiler.misc.incompatible.types.1: (compiler.misc.no.conforming.instance.exists: T, T6315770<T>, T6315770<? super java.lang.String>)), <T>T6315770<T>, T6315770<? super java.lang.String>
    68.8  2 errors

    69.1 --- a/test/tools/javac/generics/inference/6611449/T6611449.java	Thu Aug 27 13:40:48 2009 +0100
    69.2 +++ b/test/tools/javac/generics/inference/6611449/T6611449.java	Thu Aug 27 11:08:27 2009 -0700
    69.3 @@ -1,28 +1,5 @@
    69.4 -/*
    69.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    69.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    69.7 - *
    69.8 - * This code is free software; you can redistribute it and/or modify it
    69.9 - * under the terms of the GNU General Public License version 2 only, as
   69.10 - * published by the Free Software Foundation.
   69.11 - *
   69.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   69.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   69.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   69.15 - * version 2 for more details (a copy is included in the LICENSE file that
   69.16 - * accompanied this code).
   69.17 - *
   69.18 - * You should have received a copy of the GNU General Public License version
   69.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   69.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   69.21 - *
   69.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   69.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   69.24 - * have any questions.
   69.25 - */
   69.26 -
   69.27  /**
   69.28 - * @test
   69.29 + * @test /nodynamiccopyright/
   69.30   * @bug 6611449
   69.31   * @summary Internal Error thrown during generic method/constructor invocation
   69.32   * @compile/fail/ref=T6611449.out -XDstdout -XDrawDiagnostics T6611449.java

    70.1 --- a/test/tools/javac/generics/inference/6611449/T6611449.out	Thu Aug 27 13:40:48 2009 +0100
    70.2 +++ b/test/tools/javac/generics/inference/6611449/T6611449.out	Thu Aug 27 11:08:27 2009 -0700
    70.3 @@ -1,5 +1,5 @@
    70.4 -T6611449.java:41:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int, kindname.class, T6611449<S>
    70.5 -T6611449.java:42:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int,int, kindname.class, T6611449<S>
    70.6 -T6611449.java:43:9: compiler.err.cant.apply.symbol: kindname.method, m1, T, int, kindname.class, T6611449<S>, null
    70.7 -T6611449.java:44:9: compiler.err.cant.apply.symbol: kindname.method, m2, T,T, int,int, kindname.class, T6611449<S>, null
    70.8 +T6611449.java:18:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int, kindname.class, T6611449<S>
    70.9 +T6611449.java:19:9: compiler.err.cant.resolve.location.args: kindname.constructor, T6611449, , int,int, kindname.class, T6611449<S>
   70.10 +T6611449.java:20:9: compiler.err.cant.apply.symbol: kindname.method, m1, T, int, kindname.class, T6611449<S>, null
   70.11 +T6611449.java:21:9: compiler.err.cant.apply.symbol: kindname.method, m2, T,T, int,int, kindname.class, T6611449<S>, null
   70.12  4 errors

    71.1 --- a/test/tools/javac/generics/inference/6638712/T6638712a.java	Thu Aug 27 13:40:48 2009 +0100
    71.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712a.java	Thu Aug 27 11:08:27 2009 -0700
    71.3 @@ -1,28 +1,5 @@
    71.4  /*
    71.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    71.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    71.7 - *
    71.8 - * This code is free software; you can redistribute it and/or modify it
    71.9 - * under the terms of the GNU General Public License version 2 only, as
   71.10 - * published by the Free Software Foundation.
   71.11 - *
   71.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   71.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   71.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   71.15 - * version 2 for more details (a copy is included in the LICENSE file that
   71.16 - * accompanied this code).
   71.17 - *
   71.18 - * You should have received a copy of the GNU General Public License version
   71.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   71.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   71.21 - *
   71.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   71.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   71.24 - * have any questions.
   71.25 - */
   71.26 -
   71.27 -/*
   71.28 - * @test
   71.29 + * @test /nodynamiccopyright/
   71.30   * @bug     6638712
   71.31   * @author  mcimadamore
   71.32   * @summary Inference with wildcard types causes selection of inapplicable method

    72.1 --- a/test/tools/javac/generics/inference/6638712/T6638712a.out	Thu Aug 27 13:40:48 2009 +0100
    72.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712a.out	Thu Aug 27 11:08:27 2009 -0700
    72.3 @@ -1,2 +1,2 @@
    72.4 -T6638712a.java:39:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
    72.5 +T6638712a.java:16:41: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
    72.6  1 error

    73.1 --- a/test/tools/javac/generics/inference/6638712/T6638712b.java	Thu Aug 27 13:40:48 2009 +0100
    73.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712b.java	Thu Aug 27 11:08:27 2009 -0700
    73.3 @@ -1,28 +1,5 @@
    73.4  /*
    73.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    73.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    73.7 - *
    73.8 - * This code is free software; you can redistribute it and/or modify it
    73.9 - * under the terms of the GNU General Public License version 2 only, as
   73.10 - * published by the Free Software Foundation.
   73.11 - *
   73.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   73.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   73.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   73.15 - * version 2 for more details (a copy is included in the LICENSE file that
   73.16 - * accompanied this code).
   73.17 - *
   73.18 - * You should have received a copy of the GNU General Public License version
   73.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   73.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   73.21 - *
   73.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   73.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   73.24 - * have any questions.
   73.25 - */
   73.26 -
   73.27 -/*
   73.28 - * @test
   73.29 + * @test /nodynamiccopyright/
   73.30   * @bug     6638712
   73.31   * @author  mcimadamore
   73.32   * @summary Inference with wildcard types causes selection of inapplicable method

    74.1 --- a/test/tools/javac/generics/inference/6638712/T6638712b.out	Thu Aug 27 13:40:48 2009 +0100
    74.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712b.out	Thu Aug 27 11:08:27 2009 -0700
    74.3 @@ -1,2 +1,2 @@
    74.4 -T6638712b.java:37:21: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.bounds: T6638712b<java.lang.Integer>, T6638712b<java.lang.String>)
    74.5 +T6638712b.java:14:21: compiler.err.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.bounds: T6638712b<java.lang.Integer>, T6638712b<java.lang.String>)
    74.6  1 error

    75.1 --- a/test/tools/javac/generics/inference/6638712/T6638712c.java	Thu Aug 27 13:40:48 2009 +0100
    75.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712c.java	Thu Aug 27 11:08:27 2009 -0700
    75.3 @@ -1,28 +1,5 @@
    75.4  /*
    75.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    75.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    75.7 - *
    75.8 - * This code is free software; you can redistribute it and/or modify it
    75.9 - * under the terms of the GNU General Public License version 2 only, as
   75.10 - * published by the Free Software Foundation.
   75.11 - *
   75.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   75.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   75.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   75.15 - * version 2 for more details (a copy is included in the LICENSE file that
   75.16 - * accompanied this code).
   75.17 - *
   75.18 - * You should have received a copy of the GNU General Public License version
   75.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   75.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   75.21 - *
   75.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   75.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   75.24 - * have any questions.
   75.25 - */
   75.26 -
   75.27 -/*
   75.28 - * @test
   75.29 + * @test /nodynamiccopyright/
   75.30   * @bug     6638712 6707034
   75.31   * @author  mcimadamore
   75.32   * @summary Inference with wildcard types causes selection of inapplicable method

    76.1 --- a/test/tools/javac/generics/inference/6638712/T6638712c.out	Thu Aug 27 13:40:48 2009 +0100
    76.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712c.out	Thu Aug 27 11:08:27 2009 -0700
    76.3 @@ -1,2 +1,2 @@
    76.4 -T6638712c.java:39:9: compiler.err.cant.apply.symbol: kindname.method, sort, T[],java.util.Comparator<? super T>, java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, kindname.class, T6638712c, null
    76.5 +T6638712c.java:16:9: compiler.err.cant.apply.symbol: kindname.method, sort, T[],java.util.Comparator<? super T>, java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, kindname.class, T6638712c, null
    76.6  1 error

    77.1 --- a/test/tools/javac/generics/inference/6638712/T6638712d.java	Thu Aug 27 13:40:48 2009 +0100
    77.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712d.java	Thu Aug 27 11:08:27 2009 -0700
    77.3 @@ -1,28 +1,5 @@
    77.4  /*
    77.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    77.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    77.7 - *
    77.8 - * This code is free software; you can redistribute it and/or modify it
    77.9 - * under the terms of the GNU General Public License version 2 only, as
   77.10 - * published by the Free Software Foundation.
   77.11 - *
   77.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   77.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   77.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   77.15 - * version 2 for more details (a copy is included in the LICENSE file that
   77.16 - * accompanied this code).
   77.17 - *
   77.18 - * You should have received a copy of the GNU General Public License version
   77.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   77.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   77.21 - *
   77.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   77.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   77.24 - * have any questions.
   77.25 - */
   77.26 -
   77.27 -/*
   77.28 - * @test
   77.29 + * @test /nodynamiccopyright/
   77.30   * @bug     6638712 6730468
   77.31   * @author  mcimadamore
   77.32   * @summary Inference with wildcard types causes selection of inapplicable method

    78.1 --- a/test/tools/javac/generics/inference/6638712/T6638712d.out	Thu Aug 27 13:40:48 2009 +0100
    78.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712d.out	Thu Aug 27 11:08:27 2009 -0700
    78.3 @@ -1,2 +1,2 @@
    78.4 -T6638712d.java:39:9: compiler.err.cant.apply.symbol: kindname.method, m, U,java.util.List<java.util.List<U>>, int,java.util.List<java.util.List<java.lang.String>>, kindname.class, T6638712d, null
    78.5 +T6638712d.java:16:9: compiler.err.cant.apply.symbol: kindname.method, m, U,java.util.List<java.util.List<U>>, int,java.util.List<java.util.List<java.lang.String>>, kindname.class, T6638712d, null
    78.6  1 error

    79.1 --- a/test/tools/javac/generics/inference/6638712/T6638712e.java	Thu Aug 27 13:40:48 2009 +0100
    79.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712e.java	Thu Aug 27 11:08:27 2009 -0700
    79.3 @@ -1,28 +1,5 @@
    79.4  /*
    79.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    79.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    79.7 - *
    79.8 - * This code is free software; you can redistribute it and/or modify it
    79.9 - * under the terms of the GNU General Public License version 2 only, as
   79.10 - * published by the Free Software Foundation.
   79.11 - *
   79.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   79.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   79.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   79.15 - * version 2 for more details (a copy is included in the LICENSE file that
   79.16 - * accompanied this code).
   79.17 - *
   79.18 - * You should have received a copy of the GNU General Public License version
   79.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   79.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   79.21 - *
   79.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   79.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   79.24 - * have any questions.
   79.25 - */
   79.26 -
   79.27 -/*
   79.28 - * @test
   79.29 + * @test /nodynamiccopyright/
   79.30   * @bug     6638712 6795689
   79.31   * @author  mcimadamore
   79.32   * @summary Inference with wildcard types causes selection of inapplicable method

    80.1 --- a/test/tools/javac/generics/inference/6638712/T6638712e.out	Thu Aug 27 13:40:48 2009 +0100
    80.2 +++ b/test/tools/javac/generics/inference/6638712/T6638712e.out	Thu Aug 27 11:08:27 2009 -0700
    80.3 @@ -1,2 +1,2 @@
    80.4 -T6638712e.java:40:27: compiler.err.invalid.inferred.types: X, (compiler.misc.inferred.do.not.conform.to.params: T6638712e.Foo<? super java.lang.Object,? extends java.lang.Boolean>, T6638712e.Foo<java.lang.Boolean,java.lang.Boolean>)
    80.5 +T6638712e.java:17:27: compiler.err.invalid.inferred.types: X, (compiler.misc.inferred.do.not.conform.to.params: T6638712e.Foo<? super java.lang.Object,? extends java.lang.Boolean>, T6638712e.Foo<java.lang.Boolean,java.lang.Boolean>)
    80.6  1 error

    81.1 --- a/test/tools/javac/generics/inference/6718364/T6718364.java	Thu Aug 27 13:40:48 2009 +0100
    81.2 +++ b/test/tools/javac/generics/inference/6718364/T6718364.java	Thu Aug 27 11:08:27 2009 -0700
    81.3 @@ -1,28 +1,5 @@
    81.4 -/*
    81.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    81.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    81.7 - *
    81.8 - * This code is free software; you can redistribute it and/or modify it
    81.9 - * under the terms of the GNU General Public License version 2 only, as
   81.10 - * published by the Free Software Foundation.
   81.11 - *
   81.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   81.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   81.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   81.15 - * version 2 for more details (a copy is included in the LICENSE file that
   81.16 - * accompanied this code).
   81.17 - *
   81.18 - * You should have received a copy of the GNU General Public License version
   81.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   81.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   81.21 - *
   81.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   81.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   81.24 - * have any questions.
   81.25 - */
   81.26 -
   81.27  /**
   81.28 - * @test
   81.29 + * @test /nodynamiccopyright/
   81.30   * @bug 6718364
   81.31   * @summary inference fails when a generic method is invoked with raw arguments
   81.32   * @compile/ref=T6718364.out -XDstdout -XDrawDiagnostics -Xlint:unchecked T6718364.java

    82.1 --- a/test/tools/javac/generics/inference/6718364/T6718364.out	Thu Aug 27 13:40:48 2009 +0100
    82.2 +++ b/test/tools/javac/generics/inference/6718364/T6718364.out	Thu Aug 27 11:08:27 2009 -0700
    82.3 @@ -1,3 +1,3 @@
    82.4 -T6718364.java:36:32: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6718364.X, T6718364.X<java.lang.Integer>
    82.5 -T6718364.java:36:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6718364.X<T>,T, T6718364.X<T6718364.X<java.lang.Integer>>,T6718364.X, kindname.class, T6718364
    82.6 -2 warnings
    82.7 \ No newline at end of file
    82.8 +T6718364.java:13:32: compiler.warn.prob.found.req: (compiler.misc.unchecked.assign), T6718364.X, T6718364.X<java.lang.Integer>
    82.9 +T6718364.java:13:10: compiler.warn.unchecked.meth.invocation.applied: kindname.method, m, T6718364.X<T>,T, T6718364.X<T6718364.X<java.lang.Integer>>,T6718364.X, kindname.class, T6718364
   82.10 +2 warnings

    83.1 --- a/test/tools/javac/generics/rare/6665356/T6665356.java	Thu Aug 27 13:40:48 2009 +0100
    83.2 +++ b/test/tools/javac/generics/rare/6665356/T6665356.java	Thu Aug 27 11:08:27 2009 -0700
    83.3 @@ -1,28 +1,5 @@
    83.4  /*
    83.5 - * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
    83.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    83.7 - *
    83.8 - * This code is free software; you can redistribute it and/or modify it
    83.9 - * under the terms of the GNU General Public License version 2 only, as
   83.10 - * published by the Free Software Foundation.
   83.11 - *
   83.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   83.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   83.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   83.15 - * version 2 for more details (a copy is included in the LICENSE file that
   83.16 - * accompanied this code).
   83.17 - *
   83.18 - * You should have received a copy of the GNU General Public License version
   83.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   83.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   83.21 - *
   83.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   83.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   83.24 - * have any questions.
   83.25 - */
   83.26 -
   83.27 -/*
   83.28 - * @test
   83.29 + * @test /nodynamiccopyright/
   83.30   * @author Maurizio Cimadamore
   83.31   * @bug     6665356
   83.32   * @summary Cast not allowed when both qualifying type and inner class are parameterized
   83.33 @@ -50,4 +27,4 @@
   83.34          o = (Outer.Inner<?>)null;
   83.35          o = (Outer<?>.Inner<?>)null;
   83.36      }
   83.37 -}
   83.38 \ No newline at end of file
   83.39 +}

    84.1 --- a/test/tools/javac/generics/rare/6665356/T6665356.out	Thu Aug 27 13:40:48 2009 +0100
    84.2 +++ b/test/tools/javac/generics/rare/6665356/T6665356.out	Thu Aug 27 11:08:27 2009 -0700
    84.3 @@ -1,5 +1,5 @@
    84.4 -T6665356.java:40:37: compiler.err.improperly.formed.type.param.missing
    84.5 -T6665356.java:41:40: compiler.err.improperly.formed.type.inner.raw.param
    84.6 -T6665356.java:49:23: compiler.err.improperly.formed.type.param.missing
    84.7 -T6665356.java:50:25: compiler.err.improperly.formed.type.inner.raw.param
    84.8 -4 errors
    84.9 \ No newline at end of file
   84.10 +T6665356.java:17:37: compiler.err.improperly.formed.type.param.missing
   84.11 +T6665356.java:18:40: compiler.err.improperly.formed.type.inner.raw.param
   84.12 +T6665356.java:26:23: compiler.err.improperly.formed.type.param.missing
   84.13 +T6665356.java:27:25: compiler.err.improperly.formed.type.inner.raw.param
   84.14 +4 errors

    85.1 --- a/test/tools/javac/generics/typevars/6569404/T6569404b.java	Thu Aug 27 13:40:48 2009 +0100
    85.2 +++ b/test/tools/javac/generics/typevars/6569404/T6569404b.java	Thu Aug 27 11:08:27 2009 -0700
    85.3 @@ -1,28 +1,5 @@
    85.4  /*
    85.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    85.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    85.7 - *
    85.8 - * This code is free software; you can redistribute it and/or modify it
    85.9 - * under the terms of the GNU General Public License version 2 only, as
   85.10 - * published by the Free Software Foundation.
   85.11 - *
   85.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   85.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   85.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   85.15 - * version 2 for more details (a copy is included in the LICENSE file that
   85.16 - * accompanied this code).
   85.17 - *
   85.18 - * You should have received a copy of the GNU General Public License version
   85.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   85.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   85.21 - *
   85.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   85.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   85.24 - * have any questions.
   85.25 - */
   85.26 -
   85.27 -/*
   85.28 - * @test
   85.29 + * @test /nodynamiccopyright/
   85.30   * @bug     6569404
   85.31   * @summary Regression: Cannot instantiate an inner class of a type variable
   85.32   * @author  mcimadamore

    86.1 --- a/test/tools/javac/generics/typevars/6569404/T6569404b.out	Thu Aug 27 13:40:48 2009 +0100
    86.2 +++ b/test/tools/javac/generics/typevars/6569404/T6569404b.out	Thu Aug 27 11:08:27 2009 -0700
    86.3 @@ -1,2 +1,2 @@
    86.4 -T6569404b.java:36:48: compiler.err.type.var.cant.be.deref
    86.5 +T6569404b.java:13:48: compiler.err.type.var.cant.be.deref
    86.6  1 error

    87.1 --- a/test/tools/javac/generics/typevars/6680106/T6680106.java	Thu Aug 27 13:40:48 2009 +0100
    87.2 +++ b/test/tools/javac/generics/typevars/6680106/T6680106.java	Thu Aug 27 11:08:27 2009 -0700
    87.3 @@ -1,28 +1,5 @@
    87.4  /*
    87.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    87.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    87.7 - *
    87.8 - * This code is free software; you can redistribute it and/or modify it
    87.9 - * under the terms of the GNU General Public License version 2 only, as
   87.10 - * published by the Free Software Foundation.
   87.11 - *
   87.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   87.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   87.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   87.15 - * version 2 for more details (a copy is included in the LICENSE file that
   87.16 - * accompanied this code).
   87.17 - *
   87.18 - * You should have received a copy of the GNU General Public License version
   87.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   87.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   87.21 - *
   87.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   87.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   87.24 - * have any questions.
   87.25 - */
   87.26 -
   87.27 -/*
   87.28 - * @test
   87.29 + * @test /nodynamiccopyright/
   87.30   * @bug     6680106
   87.31   * @summary StackOverFlowError for Cyclic inheritance in TypeParameters with ArrayType Bounds
   87.32   * @author  Maurizio Cimadamore

    88.1 --- a/test/tools/javac/generics/typevars/6680106/T6680106.out	Thu Aug 27 13:40:48 2009 +0100
    88.2 +++ b/test/tools/javac/generics/typevars/6680106/T6680106.out	Thu Aug 27 11:08:27 2009 -0700
    88.3 @@ -1,13 +1,13 @@
    88.4 -T6680106.java:34:25: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
    88.5 -T6680106.java:35:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
    88.6 -T6680106.java:35:40: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
    88.7 -T6680106.java:36:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
    88.8 -T6680106.java:36:40: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
    88.9 -T6680106.java:36:55: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
   88.10 -T6680106.java:37:30: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
   88.11 -T6680106.java:38:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
   88.12 -T6680106.java:38:50: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
   88.13 -T6680106.java:39:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
   88.14 -T6680106.java:39:50: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
   88.15 -T6680106.java:39:70: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
   88.16 -12 errors
   88.17 \ No newline at end of file
   88.18 +T6680106.java:11:25: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
   88.19 +T6680106.java:12:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
   88.20 +T6680106.java:12:40: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
   88.21 +T6680106.java:13:25: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
   88.22 +T6680106.java:13:40: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
   88.23 +T6680106.java:13:55: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
   88.24 +T6680106.java:14:30: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
   88.25 +T6680106.java:15:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
   88.26 +T6680106.java:15:50: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
   88.27 +T6680106.java:16:30: compiler.err.type.found.req: S[], (compiler.misc.type.req.class)
   88.28 +T6680106.java:16:50: compiler.err.type.found.req: U[], (compiler.misc.type.req.class)
   88.29 +T6680106.java:16:70: compiler.err.type.found.req: T[], (compiler.misc.type.req.class)
   88.30 +12 errors

    89.1 --- a/test/tools/javac/generics/typevars/6804733/T6804733.java	Thu Aug 27 13:40:48 2009 +0100
    89.2 +++ b/test/tools/javac/generics/typevars/6804733/T6804733.java	Thu Aug 27 11:08:27 2009 -0700
    89.3 @@ -1,28 +1,5 @@
    89.4  /*
    89.5 - * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
    89.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    89.7 - *
    89.8 - * This code is free software; you can redistribute it and/or modify it
    89.9 - * under the terms of the GNU General Public License version 2 only, as
   89.10 - * published by the Free Software Foundation.
   89.11 - *
   89.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   89.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   89.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   89.15 - * version 2 for more details (a copy is included in the LICENSE file that
   89.16 - * accompanied this code).
   89.17 - *
   89.18 - * You should have received a copy of the GNU General Public License version
   89.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   89.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   89.21 - *
   89.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   89.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   89.24 - * have any questions.
   89.25 - */
   89.26 -
   89.27 -/*
   89.28 - * @test
   89.29 + * @test /nodynamiccopyright/
   89.30   * @bug     6804733
   89.31   * @summary javac generates spourious diagnostics for ill-formed type-variable bounds
   89.32   * @author  mcimadamore

    90.1 --- a/test/tools/javac/generics/typevars/6804733/T6804733.out	Thu Aug 27 13:40:48 2009 +0100
    90.2 +++ b/test/tools/javac/generics/typevars/6804733/T6804733.out	Thu Aug 27 11:08:27 2009 -0700
    90.3 @@ -1,2 +1,2 @@
    90.4 -T6804733.java:34:20: compiler.err.type.var.may.not.be.followed.by.other.bounds
    90.5 +T6804733.java:11:20: compiler.err.type.var.may.not.be.followed.by.other.bounds
    90.6  1 error

    91.1 --- a/test/tools/javac/typeAnnotations/failures/AnnotationVersion.java	Thu Aug 27 13:40:48 2009 +0100
    91.2 +++ b/test/tools/javac/typeAnnotations/failures/AnnotationVersion.java	Thu Aug 27 11:08:27 2009 -0700
    91.3 @@ -1,28 +1,5 @@
    91.4  /*
    91.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    91.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    91.7 - *
    91.8 - * This code is free software; you can redistribute it and/or modify it
    91.9 - * under the terms of the GNU General Public License version 2 only, as
   91.10 - * published by the Free Software Foundation.
   91.11 - *
   91.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   91.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   91.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   91.15 - * version 2 for more details (a copy is included in the LICENSE file that
   91.16 - * accompanied this code).
   91.17 - *
   91.18 - * You should have received a copy of the GNU General Public License version
   91.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   91.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   91.21 - *
   91.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   91.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   91.24 - * have any questions.
   91.25 - */
   91.26 -
   91.27 -/*
   91.28 - * @test
   91.29 + * @test /nodynamiccopyright/
   91.30   * @bug 6843077
   91.31   * @summary test that only java 7 allows type annotations
   91.32   * @author Mahmood Ali

    92.1 --- a/test/tools/javac/typeAnnotations/failures/AnnotationVersion.out	Thu Aug 27 13:40:48 2009 +0100
    92.2 +++ b/test/tools/javac/typeAnnotations/failures/AnnotationVersion.out	Thu Aug 27 11:08:27 2009 -0700
    92.3 @@ -1,2 +1,2 @@
    92.4 -AnnotationVersion.java:32:25: compiler.err.type.annotations.not.supported.in.source: 1.6
    92.5 +AnnotationVersion.java:9:25: compiler.err.type.annotations.not.supported.in.source: 1.6
    92.6  1 error

    93.1 --- a/test/tools/javac/typeAnnotations/failures/IncompleteArray.java	Thu Aug 27 13:40:48 2009 +0100
    93.2 +++ b/test/tools/javac/typeAnnotations/failures/IncompleteArray.java	Thu Aug 27 11:08:27 2009 -0700
    93.3 @@ -1,28 +1,5 @@
    93.4  /*
    93.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    93.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    93.7 - *
    93.8 - * This code is free software; you can redistribute it and/or modify it
    93.9 - * under the terms of the GNU General Public License version 2 only, as
   93.10 - * published by the Free Software Foundation.
   93.11 - *
   93.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   93.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   93.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   93.15 - * version 2 for more details (a copy is included in the LICENSE file that
   93.16 - * accompanied this code).
   93.17 - *
   93.18 - * You should have received a copy of the GNU General Public License version
   93.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   93.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   93.21 - *
   93.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   93.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   93.24 - * have any questions.
   93.25 - */
   93.26 -
   93.27 -/*
   93.28 - * @test
   93.29 + * @test /nodynamiccopyright/
   93.30   * @bug 6843077
   93.31   * @summary test incomplete array declaration
   93.32   * @author Mahmood Ali

    94.1 --- a/test/tools/javac/typeAnnotations/failures/IncompleteArray.out	Thu Aug 27 13:40:48 2009 +0100
    94.2 +++ b/test/tools/javac/typeAnnotations/failures/IncompleteArray.out	Thu Aug 27 11:08:27 2009 -0700
    94.3 @@ -1,2 +1,2 @@
    94.4 -IncompleteArray.java:32:13: compiler.err.illegal.start.of.type
    94.5 +IncompleteArray.java:9:13: compiler.err.illegal.start.of.type
    94.6  1 error

    95.1 --- a/test/tools/javac/typeAnnotations/failures/IncompleteVararg.java	Thu Aug 27 13:40:48 2009 +0100
    95.2 +++ b/test/tools/javac/typeAnnotations/failures/IncompleteVararg.java	Thu Aug 27 11:08:27 2009 -0700
    95.3 @@ -1,28 +1,5 @@
    95.4  /*
    95.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    95.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    95.7 - *
    95.8 - * This code is free software; you can redistribute it and/or modify it
    95.9 - * under the terms of the GNU General Public License version 2 only, as
   95.10 - * published by the Free Software Foundation.
   95.11 - *
   95.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   95.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   95.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   95.15 - * version 2 for more details (a copy is included in the LICENSE file that
   95.16 - * accompanied this code).
   95.17 - *
   95.18 - * You should have received a copy of the GNU General Public License version
   95.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   95.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   95.21 - *
   95.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   95.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   95.24 - * have any questions.
   95.25 - */
   95.26 -
   95.27 -/*
   95.28 - * @test
   95.29 + * @test /nodynamiccopyright/
   95.30   * @bug 6843077
   95.31   * @summary test incomplete vararg declaration
   95.32   * @author Mahmood Ali

    96.1 --- a/test/tools/javac/typeAnnotations/failures/IncompleteVararg.out	Thu Aug 27 13:40:48 2009 +0100
    96.2 +++ b/test/tools/javac/typeAnnotations/failures/IncompleteVararg.out	Thu Aug 27 11:08:27 2009 -0700
    96.3 @@ -1,2 +1,2 @@
    96.4 -IncompleteVararg.java:33:19: compiler.err.illegal.start.of.type
    96.5 +IncompleteVararg.java:10:19: compiler.err.illegal.start.of.type
    96.6  1 error

    97.1 --- a/test/tools/javac/typeAnnotations/failures/IndexArray.java	Thu Aug 27 13:40:48 2009 +0100
    97.2 +++ b/test/tools/javac/typeAnnotations/failures/IndexArray.java	Thu Aug 27 11:08:27 2009 -0700
    97.3 @@ -1,28 +1,5 @@
    97.4  /*
    97.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    97.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    97.7 - *
    97.8 - * This code is free software; you can redistribute it and/or modify it
    97.9 - * under the terms of the GNU General Public License version 2 only, as
   97.10 - * published by the Free Software Foundation.
   97.11 - *
   97.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   97.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   97.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   97.15 - * version 2 for more details (a copy is included in the LICENSE file that
   97.16 - * accompanied this code).
   97.17 - *
   97.18 - * You should have received a copy of the GNU General Public License version
   97.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   97.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   97.21 - *
   97.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   97.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   97.24 - * have any questions.
   97.25 - */
   97.26 -
   97.27 -/*
   97.28 - * @test
   97.29 + * @test /nodynamiccopyright/
   97.30   * @bug 6843077
   97.31   * @summary test indexing of an array
   97.32   * @author Mahmood Ali

    98.1 --- a/test/tools/javac/typeAnnotations/failures/IndexArray.out	Thu Aug 27 13:40:48 2009 +0100
    98.2 +++ b/test/tools/javac/typeAnnotations/failures/IndexArray.out	Thu Aug 27 11:08:27 2009 -0700
    98.3 @@ -1,2 +1,2 @@
    98.4 -IndexArray.java:33:15: compiler.err.illegal.start.of.expr
    98.5 +IndexArray.java:10:15: compiler.err.illegal.start.of.expr
    98.6  1 error

    99.1 --- a/test/tools/javac/typeAnnotations/failures/LintCast.java	Thu Aug 27 13:40:48 2009 +0100
    99.2 +++ b/test/tools/javac/typeAnnotations/failures/LintCast.java	Thu Aug 27 11:08:27 2009 -0700
    99.3 @@ -1,30 +1,7 @@
    99.4 -/*
    99.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
    99.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    99.7 - *
    99.8 - * This code is free software; you can redistribute it and/or modify it
    99.9 - * under the terms of the GNU General Public License version 2 only, as
   99.10 - * published by the Free Software Foundation.
   99.11 - *
   99.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
   99.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   99.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   99.15 - * version 2 for more details (a copy is included in the LICENSE file that
   99.16 - * accompanied this code).
   99.17 - *
   99.18 - * You should have received a copy of the GNU General Public License version
   99.19 - * 2 along with this work; if not, write to the Free Software Foundation,
   99.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   99.21 - *
   99.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
   99.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
   99.24 - * have any questions.
   99.25 - */
   99.26 -
   99.27  import java.util.List;
   99.28  
   99.29  /*
   99.30 - * @test
   99.31 + * @test /nodynamiccopyright/
   99.32   * @bug 6843077
   99.33   * @summary test that compiler doesn't warn about annotated redundant casts
   99.34   * @author Mahmood Ali

   100.1 --- a/test/tools/javac/typeAnnotations/failures/LintCast.out	Thu Aug 27 13:40:48 2009 +0100
   100.2 +++ b/test/tools/javac/typeAnnotations/failures/LintCast.out	Thu Aug 27 11:08:27 2009 -0700
   100.3 @@ -1,6 +1,6 @@
   100.4 -LintCast.java:36:21: compiler.warn.redundant.cast: java.lang.String
   100.5 -LintCast.java:42:27: compiler.warn.redundant.cast: java.util.List<java.lang.String>
   100.6 -LintCast.java:48:20: compiler.warn.redundant.cast: int[]
   100.7 -LintCast.java:60:24: compiler.warn.redundant.cast: java.lang.String
   100.8 -LintCast.java:61:26: compiler.warn.redundant.cast: java.lang.String
   100.9 +LintCast.java:13:21: compiler.warn.redundant.cast: java.lang.String
  100.10 +LintCast.java:19:27: compiler.warn.redundant.cast: java.util.List<java.lang.String>
  100.11 +LintCast.java:25:20: compiler.warn.redundant.cast: int[]
  100.12 +LintCast.java:37:24: compiler.warn.redundant.cast: java.lang.String
  100.13 +LintCast.java:38:26: compiler.warn.redundant.cast: java.lang.String
  100.14  5 warnings

   101.1 --- a/test/tools/javac/typeAnnotations/failures/Scopes.java	Thu Aug 27 13:40:48 2009 +0100
   101.2 +++ b/test/tools/javac/typeAnnotations/failures/Scopes.java	Thu Aug 27 11:08:27 2009 -0700
   101.3 @@ -1,28 +1,5 @@
   101.4  /*
   101.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   101.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   101.7 - *
   101.8 - * This code is free software; you can redistribute it and/or modify it
   101.9 - * under the terms of the GNU General Public License version 2 only, as
  101.10 - * published by the Free Software Foundation.
  101.11 - *
  101.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  101.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  101.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  101.15 - * version 2 for more details (a copy is included in the LICENSE file that
  101.16 - * accompanied this code).
  101.17 - *
  101.18 - * You should have received a copy of the GNU General Public License version
  101.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  101.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  101.21 - *
  101.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  101.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  101.24 - * have any questions.
  101.25 - */
  101.26 -
  101.27 -/*
  101.28 - * @test
  101.29 + * @test /nodynamiccopyright/
  101.30   * @bug 6843077
  101.31   * @summary check that A is accessible in the class type parameters
  101.32   * @author Mahmood Ali

   102.1 --- a/test/tools/javac/typeAnnotations/failures/Scopes.out	Thu Aug 27 13:40:48 2009 +0100
   102.2 +++ b/test/tools/javac/typeAnnotations/failures/Scopes.out	Thu Aug 27 11:08:27 2009 -0700
   102.3 @@ -1,2 +1,2 @@
   102.4 -Scopes.java:31:25: compiler.err.cant.resolve: kindname.class, UniqueInner, , 
   102.5 +Scopes.java:8:25: compiler.err.cant.resolve: kindname.class, UniqueInner, , 
   102.6  1 error

   103.1 --- a/test/tools/javac/typeAnnotations/failures/StaticFields.java	Thu Aug 27 13:40:48 2009 +0100
   103.2 +++ b/test/tools/javac/typeAnnotations/failures/StaticFields.java	Thu Aug 27 11:08:27 2009 -0700
   103.3 @@ -1,28 +1,5 @@
   103.4  /*
   103.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   103.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   103.7 - *
   103.8 - * This code is free software; you can redistribute it and/or modify it
   103.9 - * under the terms of the GNU General Public License version 2 only, as
  103.10 - * published by the Free Software Foundation.
  103.11 - *
  103.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  103.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  103.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  103.15 - * version 2 for more details (a copy is included in the LICENSE file that
  103.16 - * accompanied this code).
  103.17 - *
  103.18 - * You should have received a copy of the GNU General Public License version
  103.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  103.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  103.21 - *
  103.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  103.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  103.24 - * have any questions.
  103.25 - */
  103.26 -
  103.27 -/*
  103.28 - * @test
  103.29 + * @test /nodynamiccopyright/
  103.30   * @bug 6843077
  103.31   * @summary static field access isn't a valid location
  103.32   * @author Mahmood Ali

   104.1 --- a/test/tools/javac/typeAnnotations/failures/StaticFields.out	Thu Aug 27 13:40:48 2009 +0100
   104.2 +++ b/test/tools/javac/typeAnnotations/failures/StaticFields.out	Thu Aug 27 11:08:27 2009 -0700
   104.3 @@ -1,2 +1,2 @@
   104.4 -StaticFields.java:33:17: compiler.err.illegal.start.of.expr
   104.5 +StaticFields.java:10:17: compiler.err.illegal.start.of.expr
   104.6  1 error

   105.1 --- a/test/tools/javac/typeAnnotations/failures/StaticMethods.java	Thu Aug 27 13:40:48 2009 +0100
   105.2 +++ b/test/tools/javac/typeAnnotations/failures/StaticMethods.java	Thu Aug 27 11:08:27 2009 -0700
   105.3 @@ -1,28 +1,5 @@
   105.4  /*
   105.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   105.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   105.7 - *
   105.8 - * This code is free software; you can redistribute it and/or modify it
   105.9 - * under the terms of the GNU General Public License version 2 only, as
  105.10 - * published by the Free Software Foundation.
  105.11 - *
  105.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  105.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  105.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  105.15 - * version 2 for more details (a copy is included in the LICENSE file that
  105.16 - * accompanied this code).
  105.17 - *
  105.18 - * You should have received a copy of the GNU General Public License version
  105.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  105.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  105.21 - *
  105.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  105.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  105.24 - * have any questions.
  105.25 - */
  105.26 -
  105.27 -/*
  105.28 - * @test
  105.29 + * @test /nodynamiccopyright/
  105.30   * @bug 6843077
  105.31   * @summary static methods don't have receivers
  105.32   * @author Mahmood Ali

   106.1 --- a/test/tools/javac/typeAnnotations/failures/StaticMethods.out	Thu Aug 27 13:40:48 2009 +0100
   106.2 +++ b/test/tools/javac/typeAnnotations/failures/StaticMethods.out	Thu Aug 27 11:08:27 2009 -0700
   106.3 @@ -1,2 +1,2 @@
   106.4 -StaticMethods.java:32:22: compiler.err.annotation.type.not.applicable
   106.5 +StaticMethods.java:9:22: compiler.err.annotation.type.not.applicable
   106.6  1 error

   107.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
   107.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
   107.3 @@ -1,28 +1,5 @@
   107.4  /*
   107.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   107.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   107.7 - *
   107.8 - * This code is free software; you can redistribute it and/or modify it
   107.9 - * under the terms of the GNU General Public License version 2 only, as
  107.10 - * published by the Free Software Foundation.
  107.11 - *
  107.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  107.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  107.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  107.15 - * version 2 for more details (a copy is included in the LICENSE file that
  107.16 - * accompanied this code).
  107.17 - *
  107.18 - * You should have received a copy of the GNU General Public License version
  107.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  107.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  107.21 - *
  107.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  107.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  107.24 - * have any questions.
  107.25 - */
  107.26 -
  107.27 -/*
  107.28 - * @test
  107.29 + * @test /nodynamiccopyright/
  107.30   * @bug 6843077
  107.31   * @summary check for duplicate annotation values
  107.32   * @author Mahmood Ali

   108.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
   108.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
   108.3 @@ -1,2 +1,2 @@
   108.4 -DuplicateAnnotationValue.java:33:45: compiler.err.duplicate.annotation.member.value: value, A
   108.5 +DuplicateAnnotationValue.java:10:45: compiler.err.duplicate.annotation.member.value: value, A
   108.6  1 error

   109.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
   109.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
   109.3 @@ -1,28 +1,5 @@
   109.4  /*
   109.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   109.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   109.7 - *
   109.8 - * This code is free software; you can redistribute it and/or modify it
   109.9 - * under the terms of the GNU General Public License version 2 only, as
  109.10 - * published by the Free Software Foundation.
  109.11 - *
  109.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  109.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  109.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  109.15 - * version 2 for more details (a copy is included in the LICENSE file that
  109.16 - * accompanied this code).
  109.17 - *
  109.18 - * You should have received a copy of the GNU General Public License version
  109.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  109.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  109.21 - *
  109.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  109.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  109.24 - * have any questions.
  109.25 - */
  109.26 -
  109.27 -/*
  109.28 - * @test
  109.29 + * @test /nodynamiccopyright/
  109.30   * @bug 6843077
  109.31   * @summary check for duplicate annotations
  109.32   * @author Mahmood Ali

   110.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
   110.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
   110.3 @@ -1,2 +1,2 @@
   110.4 -DuplicateTypeAnnotation.java:34:26: compiler.err.duplicate.annotation
   110.5 +DuplicateTypeAnnotation.java:11:26: compiler.err.duplicate.annotation
   110.6  1 error

   111.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
   111.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
   111.3 @@ -1,28 +1,5 @@
   111.4  /*
   111.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   111.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   111.7 - *
   111.8 - * This code is free software; you can redistribute it and/or modify it
   111.9 - * under the terms of the GNU General Public License version 2 only, as
  111.10 - * published by the Free Software Foundation.
  111.11 - *
  111.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  111.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  111.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  111.15 - * version 2 for more details (a copy is included in the LICENSE file that
  111.16 - * accompanied this code).
  111.17 - *
  111.18 - * You should have received a copy of the GNU General Public License version
  111.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  111.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  111.21 - *
  111.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  111.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  111.24 - * have any questions.
  111.25 - */
  111.26 -
  111.27 -/*
  111.28 - * @test
  111.29 + * @test /nodynamiccopyright/
  111.30   * @bug 6843077
  111.31   * @summary check for invalid annotatins given the target
  111.32   * @author Mahmood Ali

   112.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
   112.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
   112.3 @@ -1,2 +1,2 @@
   112.4 -InvalidLocation.java:34:23: compiler.err.annotation.type.not.applicable
   112.5 +InvalidLocation.java:11:23: compiler.err.annotation.type.not.applicable
   112.6  1 error

   113.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
   113.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
   113.3 @@ -1,28 +1,5 @@
   113.4  /*
   113.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   113.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   113.7 - *
   113.8 - * This code is free software; you can redistribute it and/or modify it
   113.9 - * under the terms of the GNU General Public License version 2 only, as
  113.10 - * published by the Free Software Foundation.
  113.11 - *
  113.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  113.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  113.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  113.15 - * version 2 for more details (a copy is included in the LICENSE file that
  113.16 - * accompanied this code).
  113.17 - *
  113.18 - * You should have received a copy of the GNU General Public License version
  113.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  113.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  113.21 - *
  113.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  113.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  113.24 - * have any questions.
  113.25 - */
  113.26 -
  113.27 -/*
  113.28 - * @test
  113.29 + * @test /nodynamiccopyright/
  113.30   * @bug 6843077
  113.31   * @summary check for missing annotation value
  113.32   * @author Mahmood Ali

   114.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
   114.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
   114.3 @@ -1,2 +1,2 @@
   114.4 -MissingAnnotationValue.java:33:23: compiler.err.annotation.missing.default.value: A, field
   114.5 +MissingAnnotationValue.java:10:23: compiler.err.annotation.missing.default.value: A, field
   114.6  1 error

   115.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
   115.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
   115.3 @@ -1,28 +1,5 @@
   115.4  /*
   115.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   115.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   115.7 - *
   115.8 - * This code is free software; you can redistribute it and/or modify it
   115.9 - * under the terms of the GNU General Public License version 2 only, as
  115.10 - * published by the Free Software Foundation.
  115.11 - *
  115.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  115.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  115.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  115.15 - * version 2 for more details (a copy is included in the LICENSE file that
  115.16 - * accompanied this code).
  115.17 - *
  115.18 - * You should have received a copy of the GNU General Public License version
  115.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  115.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  115.21 - *
  115.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  115.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  115.24 - * have any questions.
  115.25 - */
  115.26 -
  115.27 -/*
  115.28 - * @test
  115.29 + * @test /nodynamiccopyright/
  115.30   * @bug 6843077
  115.31   * @summary check for duplicate annotation values
  115.32   * @author Mahmood Ali

   116.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
   116.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
   116.3 @@ -1,2 +1,2 @@
   116.4 -DuplicateAnnotationValue.java:33:34: compiler.err.duplicate.annotation.member.value: value, A
   116.5 +DuplicateAnnotationValue.java:10:34: compiler.err.duplicate.annotation.member.value: value, A
   116.6  1 error

   117.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
   117.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
   117.3 @@ -1,28 +1,5 @@
   117.4  /*
   117.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   117.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   117.7 - *
   117.8 - * This code is free software; you can redistribute it and/or modify it
   117.9 - * under the terms of the GNU General Public License version 2 only, as
  117.10 - * published by the Free Software Foundation.
  117.11 - *
  117.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  117.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  117.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  117.15 - * version 2 for more details (a copy is included in the LICENSE file that
  117.16 - * accompanied this code).
  117.17 - *
  117.18 - * You should have received a copy of the GNU General Public License version
  117.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  117.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  117.21 - *
  117.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  117.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  117.24 - * have any questions.
  117.25 - */
  117.26 -
  117.27 -/*
  117.28 - * @test
  117.29 + * @test /nodynamiccopyright/
  117.30   * @bug 6843077
  117.31   * @summary check for duplicate annotations
  117.32   * @author Mahmood Ali

   118.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
   118.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
   118.3 @@ -1,2 +1,2 @@
   118.4 -DuplicateTypeAnnotation.java:34:15: compiler.err.duplicate.annotation
   118.5 +DuplicateTypeAnnotation.java:11:15: compiler.err.duplicate.annotation
   118.6  1 error

   119.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
   119.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
   119.3 @@ -1,28 +1,5 @@
   119.4  /*
   119.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   119.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   119.7 - *
   119.8 - * This code is free software; you can redistribute it and/or modify it
   119.9 - * under the terms of the GNU General Public License version 2 only, as
  119.10 - * published by the Free Software Foundation.
  119.11 - *
  119.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  119.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  119.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  119.15 - * version 2 for more details (a copy is included in the LICENSE file that
  119.16 - * accompanied this code).
  119.17 - *
  119.18 - * You should have received a copy of the GNU General Public License version
  119.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  119.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  119.21 - *
  119.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  119.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  119.24 - * have any questions.
  119.25 - */
  119.26 -
  119.27 -/*
  119.28 - * @test
  119.29 + * @test /nodynamiccopyright/
  119.30   * @bug 6843077
  119.31   * @summary check for invalid annotatins given the target
  119.32   * @author Mahmood Ali

   120.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
   120.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
   120.3 @@ -1,2 +1,2 @@
   120.4 -InvalidLocation.java:34:12: compiler.err.annotation.type.not.applicable
   120.5 +InvalidLocation.java:11:12: compiler.err.annotation.type.not.applicable
   120.6  1 error

   121.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
   121.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
   121.3 @@ -1,28 +1,5 @@
   121.4  /*
   121.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   121.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   121.7 - *
   121.8 - * This code is free software; you can redistribute it and/or modify it
   121.9 - * under the terms of the GNU General Public License version 2 only, as
  121.10 - * published by the Free Software Foundation.
  121.11 - *
  121.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  121.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  121.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  121.15 - * version 2 for more details (a copy is included in the LICENSE file that
  121.16 - * accompanied this code).
  121.17 - *
  121.18 - * You should have received a copy of the GNU General Public License version
  121.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  121.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  121.21 - *
  121.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  121.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  121.24 - * have any questions.
  121.25 - */
  121.26 -
  121.27 -/*
  121.28 - * @test
  121.29 + * @test /nodynamiccopyright/
  121.30   * @bug 6843077
  121.31   * @summary check for missing annotation value
  121.32   * @author Mahmood Ali

   122.1 --- a/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
   122.2 +++ b/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
   122.3 @@ -1,2 +1,2 @@
   122.4 -MissingAnnotationValue.java:33:12: compiler.err.annotation.missing.default.value: A, field
   122.5 +MissingAnnotationValue.java:10:12: compiler.err.annotation.missing.default.value: A, field
   122.6  1 error

   123.1 --- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
   123.2 +++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
   123.3 @@ -1,28 +1,5 @@
   123.4  /*
   123.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   123.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   123.7 - *
   123.8 - * This code is free software; you can redistribute it and/or modify it
   123.9 - * under the terms of the GNU General Public License version 2 only, as
  123.10 - * published by the Free Software Foundation.
  123.11 - *
  123.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  123.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  123.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  123.15 - * version 2 for more details (a copy is included in the LICENSE file that
  123.16 - * accompanied this code).
  123.17 - *
  123.18 - * You should have received a copy of the GNU General Public License version
  123.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  123.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  123.21 - *
  123.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  123.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  123.24 - * have any questions.
  123.25 - */
  123.26 -
  123.27 -/*
  123.28 - * @test
  123.29 + * @test /nodynamiccopyright/
  123.30   * @bug 6843077
  123.31   * @summary check for duplicate annotation values for type parameter
  123.32   * @author Mahmood Ali

   124.1 --- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
   124.2 +++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
   124.3 @@ -1,2 +1,2 @@
   124.4 -DuplicateAnnotationValue.java:33:39: compiler.err.duplicate.annotation.member.value: value, A
   124.5 +DuplicateAnnotationValue.java:10:39: compiler.err.duplicate.annotation.member.value: value, A
   124.6  1 error

   125.1 --- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
   125.2 +++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
   125.3 @@ -1,28 +1,5 @@
   125.4  /*
   125.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   125.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   125.7 - *
   125.8 - * This code is free software; you can redistribute it and/or modify it
   125.9 - * under the terms of the GNU General Public License version 2 only, as
  125.10 - * published by the Free Software Foundation.
  125.11 - *
  125.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  125.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  125.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  125.15 - * version 2 for more details (a copy is included in the LICENSE file that
  125.16 - * accompanied this code).
  125.17 - *
  125.18 - * You should have received a copy of the GNU General Public License version
  125.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  125.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  125.21 - *
  125.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  125.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  125.24 - * have any questions.
  125.25 - */
  125.26 -
  125.27 -/*
  125.28 - * @test
  125.29 + * @test /nodynamiccopyright/
  125.30   * @bug 6843077
  125.31   * @summary check for duplicate annotations
  125.32   * @author Mahmood Ali

   126.1 --- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
   126.2 +++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
   126.3 @@ -1,2 +1,2 @@
   126.4 -DuplicateTypeAnnotation.java:33:20: compiler.err.duplicate.annotation
   126.5 +DuplicateTypeAnnotation.java:10:20: compiler.err.duplicate.annotation
   126.6  1 error

   127.1 --- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
   127.2 +++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
   127.3 @@ -1,28 +1,5 @@
   127.4  /*
   127.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   127.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   127.7 - *
   127.8 - * This code is free software; you can redistribute it and/or modify it
   127.9 - * under the terms of the GNU General Public License version 2 only, as
  127.10 - * published by the Free Software Foundation.
  127.11 - *
  127.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  127.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  127.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  127.15 - * version 2 for more details (a copy is included in the LICENSE file that
  127.16 - * accompanied this code).
  127.17 - *
  127.18 - * You should have received a copy of the GNU General Public License version
  127.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  127.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  127.21 - *
  127.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  127.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  127.24 - * have any questions.
  127.25 - */
  127.26 -
  127.27 -/*
  127.28 - * @test
  127.29 + * @test /nodynamiccopyright/
  127.30   * @bug 6843077
  127.31   * @summary check for invalid annotatins given the target
  127.32   * @author Mahmood Ali

   128.1 --- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
   128.2 +++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
   128.3 @@ -1,2 +1,2 @@
   128.4 -InvalidLocation.java:33:17: compiler.err.annotation.type.not.applicable
   128.5 +InvalidLocation.java:10:17: compiler.err.annotation.type.not.applicable
   128.6  1 error

   129.1 --- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
   129.2 +++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
   129.3 @@ -1,28 +1,5 @@
   129.4  /*
   129.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   129.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   129.7 - *
   129.8 - * This code is free software; you can redistribute it and/or modify it
   129.9 - * under the terms of the GNU General Public License version 2 only, as
  129.10 - * published by the Free Software Foundation.
  129.11 - *
  129.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  129.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  129.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  129.15 - * version 2 for more details (a copy is included in the LICENSE file that
  129.16 - * accompanied this code).
  129.17 - *
  129.18 - * You should have received a copy of the GNU General Public License version
  129.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  129.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  129.21 - *
  129.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  129.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  129.24 - * have any questions.
  129.25 - */
  129.26 -
  129.27 -/*
  129.28 - * @test
  129.29 + * @test /nodynamiccopyright/
  129.30   * @bug 6843077
  129.31   * @summary check for missing annotation value
  129.32   * @author Mahmood Ali

   130.1 --- a/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
   130.2 +++ b/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
   130.3 @@ -1,2 +1,2 @@
   130.4 -MissingAnnotationValue.java:33:17: compiler.err.annotation.missing.default.value: A, field
   130.5 +MissingAnnotationValue.java:10:17: compiler.err.annotation.missing.default.value: A, field
   130.6  1 error

   131.1 --- a/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
   131.2 +++ b/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
   131.3 @@ -1,28 +1,5 @@
   131.4  /*
   131.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   131.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   131.7 - *
   131.8 - * This code is free software; you can redistribute it and/or modify it
   131.9 - * under the terms of the GNU General Public License version 2 only, as
  131.10 - * published by the Free Software Foundation.
  131.11 - *
  131.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  131.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  131.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  131.15 - * version 2 for more details (a copy is included in the LICENSE file that
  131.16 - * accompanied this code).
  131.17 - *
  131.18 - * You should have received a copy of the GNU General Public License version
  131.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  131.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  131.21 - *
  131.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  131.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  131.24 - * have any questions.
  131.25 - */
  131.26 -
  131.27 -/*
  131.28 - * @test
  131.29 + * @test /nodynamiccopyright/
  131.30   * @bug 6843077
  131.31   * @summary check for duplicate annotation values
  131.32   * @author Mahmood Ali

   132.1 --- a/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
   132.2 +++ b/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
   132.3 @@ -1,2 +1,2 @@
   132.4 -DuplicateAnnotationValue.java:33:51: compiler.err.duplicate.annotation.member.value: value, A
   132.5 +DuplicateAnnotationValue.java:10:51: compiler.err.duplicate.annotation.member.value: value, A
   132.6  1 error

   133.1 --- a/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
   133.2 +++ b/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
   133.3 @@ -1,28 +1,5 @@
   133.4  /*
   133.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   133.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   133.7 - *
   133.8 - * This code is free software; you can redistribute it and/or modify it
   133.9 - * under the terms of the GNU General Public License version 2 only, as
  133.10 - * published by the Free Software Foundation.
  133.11 - *
  133.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  133.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  133.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  133.15 - * version 2 for more details (a copy is included in the LICENSE file that
  133.16 - * accompanied this code).
  133.17 - *
  133.18 - * You should have received a copy of the GNU General Public License version
  133.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  133.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  133.21 - *
  133.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  133.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  133.24 - * have any questions.
  133.25 - */
  133.26 -
  133.27 -/*
  133.28 - * @test
  133.29 + * @test /nodynamiccopyright/
  133.30   * @bug 6843077
  133.31   * @summary check for duplicate annotations
  133.32   * @author Mahmood Ali

   134.1 --- a/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
   134.2 +++ b/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
   134.3 @@ -1,2 +1,2 @@
   134.4 -DuplicateTypeAnnotation.java:34:32: compiler.err.duplicate.annotation
   134.5 +DuplicateTypeAnnotation.java:11:32: compiler.err.duplicate.annotation
   134.6  1 error

   135.1 --- a/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
   135.2 +++ b/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
   135.3 @@ -1,28 +1,5 @@
   135.4  /*
   135.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   135.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   135.7 - *
   135.8 - * This code is free software; you can redistribute it and/or modify it
   135.9 - * under the terms of the GNU General Public License version 2 only, as
  135.10 - * published by the Free Software Foundation.
  135.11 - *
  135.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  135.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  135.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  135.15 - * version 2 for more details (a copy is included in the LICENSE file that
  135.16 - * accompanied this code).
  135.17 - *
  135.18 - * You should have received a copy of the GNU General Public License version
  135.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  135.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  135.21 - *
  135.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  135.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  135.24 - * have any questions.
  135.25 - */
  135.26 -
  135.27 -/*
  135.28 - * @test
  135.29 + * @test /nodynamiccopyright/
  135.30   * @bug 6843077
  135.31   * @summary check for invalid annotatins given the target
  135.32   * @author Mahmood Ali

   136.1 --- a/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
   136.2 +++ b/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
   136.3 @@ -1,2 +1,2 @@
   136.4 -InvalidLocation.java:34:29: compiler.err.annotation.type.not.applicable
   136.5 +InvalidLocation.java:11:29: compiler.err.annotation.type.not.applicable
   136.6  1 error

   137.1 --- a/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
   137.2 +++ b/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
   137.3 @@ -1,28 +1,5 @@
   137.4  /*
   137.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   137.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   137.7 - *
   137.8 - * This code is free software; you can redistribute it and/or modify it
   137.9 - * under the terms of the GNU General Public License version 2 only, as
  137.10 - * published by the Free Software Foundation.
  137.11 - *
  137.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  137.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  137.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  137.15 - * version 2 for more details (a copy is included in the LICENSE file that
  137.16 - * accompanied this code).
  137.17 - *
  137.18 - * You should have received a copy of the GNU General Public License version
  137.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  137.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  137.21 - *
  137.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  137.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  137.24 - * have any questions.
  137.25 - */
  137.26 -
  137.27 -/*
  137.28 - * @test
  137.29 + * @test /nodynamiccopyright/
  137.30   * @bug 6843077
  137.31   * @summary check for missing annotation value
  137.32   * @author Mahmood Ali

   138.1 --- a/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
   138.2 +++ b/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
   138.3 @@ -1,2 +1,2 @@
   138.4 -MissingAnnotationValue.java:33:29: compiler.err.annotation.missing.default.value: A, field
   138.5 +MissingAnnotationValue.java:10:29: compiler.err.annotation.missing.default.value: A, field
   138.6  1 error

   139.1 --- a/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
   139.2 +++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
   139.3 @@ -1,28 +1,5 @@
   139.4  /*
   139.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   139.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   139.7 - *
   139.8 - * This code is free software; you can redistribute it and/or modify it
   139.9 - * under the terms of the GNU General Public License version 2 only, as
  139.10 - * published by the Free Software Foundation.
  139.11 - *
  139.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  139.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  139.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  139.15 - * version 2 for more details (a copy is included in the LICENSE file that
  139.16 - * accompanied this code).
  139.17 - *
  139.18 - * You should have received a copy of the GNU General Public License version
  139.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  139.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  139.21 - *
  139.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  139.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  139.24 - * have any questions.
  139.25 - */
  139.26 -
  139.27 -/*
  139.28 - * @test
  139.29 + * @test /nodynamiccopyright/
  139.30   * @bug 6843077
  139.31   * @summary check for duplicate annotation values for type parameter
  139.32   * @author Mahmood Ali

   140.1 --- a/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out	Thu Aug 27 13:40:48 2009 +0100
   140.2 +++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.out	Thu Aug 27 11:08:27 2009 -0700
   140.3 @@ -1,2 +1,2 @@
   140.4 -DuplicateAnnotationValue.java:31:64: compiler.err.duplicate.annotation.member.value: value, A
   140.5 +DuplicateAnnotationValue.java:8:64: compiler.err.duplicate.annotation.member.value: value, A
   140.6  1 error

   141.1 --- a/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java	Thu Aug 27 13:40:48 2009 +0100
   141.2 +++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java	Thu Aug 27 11:08:27 2009 -0700
   141.3 @@ -1,28 +1,5 @@
   141.4  /*
   141.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   141.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   141.7 - *
   141.8 - * This code is free software; you can redistribute it and/or modify it
   141.9 - * under the terms of the GNU General Public License version 2 only, as
  141.10 - * published by the Free Software Foundation.
  141.11 - *
  141.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  141.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  141.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  141.15 - * version 2 for more details (a copy is included in the LICENSE file that
  141.16 - * accompanied this code).
  141.17 - *
  141.18 - * You should have received a copy of the GNU General Public License version
  141.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  141.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  141.21 - *
  141.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  141.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  141.24 - * have any questions.
  141.25 - */
  141.26 -
  141.27 -/*
  141.28 - * @test
  141.29 + * @test /nodynamiccopyright/
  141.30   * @bug 6843077
  141.31   * @summary check for duplicate annotations
  141.32   * @author Mahmood Ali

   142.1 --- a/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out	Thu Aug 27 13:40:48 2009 +0100
   142.2 +++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out	Thu Aug 27 11:08:27 2009 -0700
   142.3 @@ -1,2 +1,2 @@
   142.4 -DuplicateTypeAnnotation.java:32:38: compiler.err.duplicate.annotation
   142.5 +DuplicateTypeAnnotation.java:9:38: compiler.err.duplicate.annotation
   142.6  1 error

   143.1 --- a/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.java	Thu Aug 27 13:40:48 2009 +0100
   143.2 +++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.java	Thu Aug 27 11:08:27 2009 -0700
   143.3 @@ -1,28 +1,5 @@
   143.4  /*
   143.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   143.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   143.7 - *
   143.8 - * This code is free software; you can redistribute it and/or modify it
   143.9 - * under the terms of the GNU General Public License version 2 only, as
  143.10 - * published by the Free Software Foundation.
  143.11 - *
  143.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  143.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  143.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  143.15 - * version 2 for more details (a copy is included in the LICENSE file that
  143.16 - * accompanied this code).
  143.17 - *
  143.18 - * You should have received a copy of the GNU General Public License version
  143.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  143.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  143.21 - *
  143.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  143.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  143.24 - * have any questions.
  143.25 - */
  143.26 -
  143.27 -/*
  143.28 - * @test
  143.29 + * @test /nodynamiccopyright/
  143.30   * @bug 6843077
  143.31   * @summary check for invalid annotatins given the target
  143.32   * @author Mahmood Ali

   144.1 --- a/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.out	Thu Aug 27 13:40:48 2009 +0100
   144.2 +++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.out	Thu Aug 27 11:08:27 2009 -0700
   144.3 @@ -1,2 +1,2 @@
   144.4 -InvalidLocation.java:32:33: compiler.err.annotation.type.not.applicable
   144.5 +InvalidLocation.java:9:33: compiler.err.annotation.type.not.applicable
   144.6  1 error

   145.1 --- a/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java	Thu Aug 27 13:40:48 2009 +0100
   145.2 +++ b/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.java	Thu Aug 27 11:08:27 2009 -0700
   145.3 @@ -1,28 +1,5 @@
   145.4  /*
   145.5 - * Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
   145.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   145.7 - *
   145.8 - * This code is free software; you can redistribute it and/or modify it
   145.9 - * under the terms of the GNU General Public License version 2 only, as
  145.10 - * published by the Free Software Foundation.
  145.11 - *
  145.12 - * This code is distributed in the hope that it will be useful, but WITHOUT
  145.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  145.14 - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  145.15 - * version 2 for more details (a copy is included in the LICENSE file that
  145.16 - * accompanied this code).
  145.17 - *
  145.18 - * You should have received a copy of the GNU General Public License version
  145.19 - * 2 along with this work; if not, write to the Free Software Foundation,
  145.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  145.21 - *
  145.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  145.23 - * CA 95054 USA or visit www.sun.com if you need additional information or
  145.24 - * have any questions.
  145.25 - */
  145.26 -
  145.27 -/*
  145.28 - * @test
  145.29 + * @test /nodynamiccopyright/
  145.30   * @bug 6843077
  145.31   * @summary check for missing annotation value
  145.32   * @author Mahmood Ali