# HG changeset patch # User katleman # Date 1356560703 28800 # Node ID 47f71d7c124f24c2fe2dfc49865b332345b458ed # Parent 2001991b1b40130fac64c79dd3e5878cd2df2176# Parent 7d34e91f66bbefa842ee16aa2ba86b191b8f3327 Merge diff -r 2001991b1b40 -r 47f71d7c124f make/Makefile-classic --- a/make/Makefile-classic Thu Dec 20 09:18:36 2012 -0800 +++ b/make/Makefile-classic Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2012 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java --- a/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java Thu Dec 20 09:18:36 2012 -0800 +++ b/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f src/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java --- a/src/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java Thu Dec 20 09:18:36 2012 -0800 +++ b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f src/share/classes/javax/lang/model/util/ElementKindVisitor8.java --- a/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java Thu Dec 20 09:18:36 2012 -0800 +++ b/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/StringsInSwitch/StringSwitches.java --- a/test/tools/javac/StringsInSwitch/StringSwitches.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/StringsInSwitch/StringSwitches.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/api/T6395981.java --- a/test/tools/javac/api/T6395981.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/api/T6395981.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/defaultMethods/defaultMethodExecution/DefaultMethodRegressionTests.java --- a/test/tools/javac/defaultMethods/defaultMethodExecution/DefaultMethodRegressionTests.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/defaultMethods/defaultMethodExecution/DefaultMethodRegressionTests.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/diags/examples/DuplicateAnnotation.java --- a/test/tools/javac/diags/examples/DuplicateAnnotation.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/diags/examples/DuplicateAnnotation.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestKinds.java --- a/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestKinds.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestKinds.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase1.java --- a/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase1.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase1.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase2.java --- a/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase2.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase2.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase4.java --- a/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase4.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase4.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambdaShapes/org/openjdk/tests/separate/AttributeInjector.java --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/AttributeInjector.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/AttributeInjector.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFile.java --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFile.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFile.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFilePreprocessor.java --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFilePreprocessor.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFilePreprocessor.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassToInterfaceConverter.java --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassToInterfaceConverter.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassToInterfaceConverter.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambdaShapes/org/openjdk/tests/separate/Compiler.java --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/Compiler.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/Compiler.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambdaShapes/org/openjdk/tests/separate/DirectedClassLoader.java --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/DirectedClassLoader.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/DirectedClassLoader.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambdaShapes/org/openjdk/tests/separate/SourceModel.java --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/SourceModel.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/SourceModel.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambdaShapes/org/openjdk/tests/separate/TestHarness.java --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/TestHarness.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/TestHarness.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/nativeHeaders/javahComparison/CompareTest.java --- a/test/tools/javac/nativeHeaders/javahComparison/CompareTest.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/nativeHeaders/javahComparison/CompareTest.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007,2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff -r 2001991b1b40 -r 47f71d7c124f test/tools/javac/processing/model/util/deprecation/TestDeprecation.java --- a/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java Thu Dec 20 09:18:36 2012 -0800 +++ b/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java Wed Dec 26 14:25:03 2012 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it