Thu, 30 Jul 2009 23:41:19 -0700
Merge
1.1 --- a/.hgtags Mon Jul 27 23:07:00 2009 -0700 1.2 +++ b/.hgtags Thu Jul 30 23:41:19 2009 -0700 1.3 @@ -41,3 +41,4 @@ 1.4 d8f23a81d46f47a4186f1044dd9e44841bbeab84 jdk7-b64 1.5 7e0056ded28c802609d2bd79bfcda551d72a3fec jdk7-b65 1.6 634f519d6f9a602b16bba1c7cd4a17242a8f6889 jdk7-b66 1.7 +14b1a8ede95493fc53c37ff2626f1f98ce94d108 jdk7-b67
2.1 --- a/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java Mon Jul 27 23:07:00 2009 -0700 2.2 +++ b/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java Thu Jul 30 23:41:19 2009 -0700 2.3 @@ -1,5 +1,5 @@ 2.4 /* 2.5 - * Copyright 2003-2008 Sun Microsystems, Inc. All Rights Reserved. 2.6 + * Copyright 2003-2009 Sun Microsystems, Inc. All Rights Reserved. 2.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 * 2.9 * This code is free software; you can redistribute it and/or modify it
3.1 --- a/src/share/classes/com/sun/tools/javac/comp/Lower.java Mon Jul 27 23:07:00 2009 -0700 3.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java Thu Jul 30 23:41:19 2009 -0700 3.3 @@ -1,5 +1,5 @@ 3.4 /* 3.5 - * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. 3.6 + * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved. 3.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.8 * 3.9 * This code is free software; you can redistribute it and/or modify it
4.1 --- a/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Mon Jul 27 23:07:00 2009 -0700 4.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java Thu Jul 30 23:41:19 2009 -0700 4.3 @@ -1,5 +1,5 @@ 4.4 /* 4.5 - * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. 4.6 + * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved. 4.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.8 * 4.9 * This code is free software; you can redistribute it and/or modify it
5.1 --- a/src/share/classes/com/sun/tools/javac/jvm/Code.java Mon Jul 27 23:07:00 2009 -0700 5.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/Code.java Thu Jul 30 23:41:19 2009 -0700 5.3 @@ -1,5 +1,5 @@ 5.4 /* 5.5 - * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. 5.6 + * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved. 5.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.8 * 5.9 * This code is free software; you can redistribute it and/or modify it
6.1 --- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java Mon Jul 27 23:07:00 2009 -0700 6.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java Thu Jul 30 23:41:19 2009 -0700 6.3 @@ -1,5 +1,5 @@ 6.4 /* 6.5 - * Copyright 1999-2008 Sun Microsystems, Inc. All Rights Reserved. 6.6 + * Copyright 1999-2009 Sun Microsystems, Inc. All Rights Reserved. 6.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 6.8 * 6.9 * This code is free software; you can redistribute it and/or modify it
7.1 --- a/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Mon Jul 27 23:07:00 2009 -0700 7.2 +++ b/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java Thu Jul 30 23:41:19 2009 -0700 7.3 @@ -1,5 +1,5 @@ 7.4 /* 7.5 - * Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved. 7.6 + * Copyright 2005-2009 Sun Microsystems, Inc. All Rights Reserved. 7.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 7.8 * 7.9 * This code is free software; you can redistribute it and/or modify it
8.1 --- a/src/share/classes/com/sun/tools/javac/resources/legacy.properties Mon Jul 27 23:07:00 2009 -0700 8.2 +++ b/src/share/classes/com/sun/tools/javac/resources/legacy.properties Thu Jul 30 23:41:19 2009 -0700 8.3 @@ -1,5 +1,5 @@ 8.4 # 8.5 -# Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. 8.6 +# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved. 8.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 8.8 # 8.9 # This code is free software; you can redistribute it and/or modify it
9.1 --- a/test/tools/javac/typeAnnotations/failures/OldArray.java Mon Jul 27 23:07:00 2009 -0700 9.2 +++ b/test/tools/javac/typeAnnotations/failures/OldArray.java Thu Jul 30 23:41:19 2009 -0700 9.3 @@ -1,5 +1,5 @@ 9.4 /* 9.5 - * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. 9.6 + * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved. 9.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 9.8 * 9.9 * This code is free software; you can redistribute it and/or modify it