Mercurial > jdk8-mips64-public > langtools / changeset

changeset

Merge jdk8-b70

Wed, 26 Dec 2012 14:25:03 -0800

author
katleman
date
Wed, 26 Dec 2012 14:25:03 -0800
changeset 1449
47f71d7c124f
parent 1447
2001991b1b40
parent 1448
7d34e91f66bb
child 1450
7d5032c2d747

Merge

     1.1 --- a/make/Makefile-classic	Thu Dec 20 09:18:36 2012 -0800
     1.2 +++ b/make/Makefile-classic	Wed Dec 26 14:25:03 2012 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2007, 2012 Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it

     2.1 --- a/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java	Thu Dec 20 09:18:36 2012 -0800
     2.2 +++ b/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java	Wed Dec 26 14:25:03 2012 -0800
     2.3 @@ -1,5 +1,5 @@
     2.4  /*
     2.5 - * Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. 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/javax/lang/model/util/AbstractTypeVisitor8.java	Thu Dec 20 09:18:36 2012 -0800
     3.2 +++ b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java	Wed Dec 26 14:25:03 2012 -0800
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 2011, Oracle and/or its affiliates. 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/javax/lang/model/util/ElementKindVisitor8.java	Thu Dec 20 09:18:36 2012 -0800
     4.2 +++ b/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java	Wed Dec 26 14:25:03 2012 -0800
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2011, Oracle and/or its affiliates. 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/test/tools/javac/StringsInSwitch/StringSwitches.java	Thu Dec 20 09:18:36 2012 -0800
     5.2 +++ b/test/tools/javac/StringsInSwitch/StringSwitches.java	Wed Dec 26 14:25:03 2012 -0800
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 2009, 2011 Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 2009, 2011, Oracle and/or its affiliates. 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/test/tools/javac/api/T6395981.java	Thu Dec 20 09:18:36 2012 -0800
     6.2 +++ b/test/tools/javac/api/T6395981.java	Wed Dec 26 14:25:03 2012 -0800
     6.3 @@ -1,5 +1,5 @@
     6.4  /*
     6.5 - * Copyright (c) 2006, 2011 Oracle and/or its affiliates. All rights reserved.
     6.6 + * Copyright (c) 2006, 2011, Oracle and/or its affiliates. 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/test/tools/javac/defaultMethods/defaultMethodExecution/DefaultMethodRegressionTests.java	Thu Dec 20 09:18:36 2012 -0800
     7.2 +++ b/test/tools/javac/defaultMethods/defaultMethodExecution/DefaultMethodRegressionTests.java	Wed Dec 26 14:25:03 2012 -0800
     7.3 @@ -1,5 +1,5 @@
     7.4  /*
     7.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
     7.6 + * Copyright (c) 2012, Oracle and/or its affiliates. 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/test/tools/javac/diags/examples/DuplicateAnnotation.java	Thu Dec 20 09:18:36 2012 -0800
     8.2 +++ b/test/tools/javac/diags/examples/DuplicateAnnotation.java	Wed Dec 26 14:25:03 2012 -0800
     8.3 @@ -1,5 +1,5 @@
     8.4  /*
     8.5 - * Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
     8.6 + * Copyright (c) 2010, 2012, Oracle and/or its affiliates. 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/lambda/methodReferenceExecution/MethodReferenceTestKinds.java	Thu Dec 20 09:18:36 2012 -0800
     9.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestKinds.java	Wed Dec 26 14:25:03 2012 -0800
     9.3 @@ -1,5 +1,5 @@
     9.4  /*
     9.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
     9.6 + * Copyright (c) 2012, Oracle and/or its affiliates. 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

    10.1 --- a/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase1.java	Thu Dec 20 09:18:36 2012 -0800
    10.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase1.java	Wed Dec 26 14:25:03 2012 -0800
    10.3 @@ -1,5 +1,5 @@
    10.4  /*
    10.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    10.6 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    10.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.8   *
    10.9   * This code is free software; you can redistribute it and/or modify it

    11.1 --- a/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase2.java	Thu Dec 20 09:18:36 2012 -0800
    11.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase2.java	Wed Dec 26 14:25:03 2012 -0800
    11.3 @@ -1,5 +1,5 @@
    11.4  /*
    11.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    11.6 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    11.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    11.8   *
    11.9   * This code is free software; you can redistribute it and/or modify it

    12.1 --- a/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase4.java	Thu Dec 20 09:18:36 2012 -0800
    12.2 +++ b/test/tools/javac/lambda/methodReferenceExecution/MethodReferenceTestSueCase4.java	Wed Dec 26 14:25:03 2012 -0800
    12.3 @@ -1,5 +1,5 @@
    12.4  /*
    12.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    12.6 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    12.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.8   *
    12.9   * This code is free software; you can redistribute it and/or modify it

    13.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/AttributeInjector.java	Thu Dec 20 09:18:36 2012 -0800
    13.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/AttributeInjector.java	Wed Dec 26 14:25:03 2012 -0800
    13.3 @@ -1,5 +1,5 @@
    13.4  /*
    13.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    13.6 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    13.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.8   *
    13.9   * This code is free software; you can redistribute it and/or modify it

    14.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFile.java	Thu Dec 20 09:18:36 2012 -0800
    14.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFile.java	Wed Dec 26 14:25:03 2012 -0800
    14.3 @@ -1,5 +1,5 @@
    14.4  /*
    14.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    14.6 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    14.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.8   *
    14.9   * This code is free software; you can redistribute it and/or modify it

    15.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFilePreprocessor.java	Thu Dec 20 09:18:36 2012 -0800
    15.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassFilePreprocessor.java	Wed Dec 26 14:25:03 2012 -0800
    15.3 @@ -1,5 +1,5 @@
    15.4  /*
    15.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    15.6 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    15.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    15.8   *
    15.9   * This code is free software; you can redistribute it and/or modify it

    16.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassToInterfaceConverter.java	Thu Dec 20 09:18:36 2012 -0800
    16.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/ClassToInterfaceConverter.java	Wed Dec 26 14:25:03 2012 -0800
    16.3 @@ -1,5 +1,5 @@
    16.4  /*
    16.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    16.6 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    16.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    16.8   *
    16.9   * This code is free software; you can redistribute it and/or modify it

    17.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/Compiler.java	Thu Dec 20 09:18:36 2012 -0800
    17.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/Compiler.java	Wed Dec 26 14:25:03 2012 -0800
    17.3 @@ -1,5 +1,5 @@
    17.4  /*
    17.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    17.6 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    17.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    17.8   *
    17.9   * This code is free software; you can redistribute it and/or modify it

    18.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/DirectedClassLoader.java	Thu Dec 20 09:18:36 2012 -0800
    18.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/DirectedClassLoader.java	Wed Dec 26 14:25:03 2012 -0800
    18.3 @@ -1,5 +1,5 @@
    18.4  /*
    18.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    18.6 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    18.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    18.8   *
    18.9   * This code is free software; you can redistribute it and/or modify it

    19.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/SourceModel.java	Thu Dec 20 09:18:36 2012 -0800
    19.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/SourceModel.java	Wed Dec 26 14:25:03 2012 -0800
    19.3 @@ -1,5 +1,5 @@
    19.4  /*
    19.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    19.6 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    19.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    19.8   *
    19.9   * This code is free software; you can redistribute it and/or modify it

    20.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/TestHarness.java	Thu Dec 20 09:18:36 2012 -0800
    20.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/separate/TestHarness.java	Wed Dec 26 14:25:03 2012 -0800
    20.3 @@ -1,5 +1,5 @@
    20.4  /*
    20.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    20.6 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    20.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    20.8   *
    20.9   * This code is free software; you can redistribute it and/or modify it

    21.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java	Thu Dec 20 09:18:36 2012 -0800
    21.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java	Wed Dec 26 14:25:03 2012 -0800
    21.3 @@ -1,5 +1,5 @@
    21.4  /*
    21.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    21.6 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    21.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    21.8   *
    21.9   * This code is free software; you can redistribute it and/or modify it

    22.1 --- a/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java	Thu Dec 20 09:18:36 2012 -0800
    22.2 +++ b/test/tools/javac/lambdaShapes/org/openjdk/tests/vm/FDSeparateCompilationTest.java	Wed Dec 26 14:25:03 2012 -0800
    22.3 @@ -1,5 +1,5 @@
    22.4  /*
    22.5 - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
    22.6 + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
    22.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    22.8   *
    22.9   * This code is free software; you can redistribute it and/or modify it

    23.1 --- a/test/tools/javac/nativeHeaders/javahComparison/CompareTest.java	Thu Dec 20 09:18:36 2012 -0800
    23.2 +++ b/test/tools/javac/nativeHeaders/javahComparison/CompareTest.java	Wed Dec 26 14:25:03 2012 -0800
    23.3 @@ -1,5 +1,5 @@
    23.4  /*
    23.5 - * Copyright (c) 2007,2012 Oracle and/or its affiliates. All rights reserved.
    23.6 + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
    23.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    23.8   *
    23.9   * This code is free software; you can redistribute it and/or modify it

    24.1 --- a/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java	Thu Dec 20 09:18:36 2012 -0800
    24.2 +++ b/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java	Wed Dec 26 14:25:03 2012 -0800
    24.3 @@ -1,5 +1,5 @@
    24.4  /*
    24.5 - * Copyright (c) 2006, 2011 Oracle and/or its affiliates. All rights reserved.
    24.6 + * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
    24.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    24.8   *
    24.9   * This code is free software; you can redistribute it and/or modify it

Mercurial Repository: jdk8-mips64-public/langtools

mercurial