Mercurial > hg > release > icedtea7-forest-2.0 > langtools
changeset 1048:c455e2ae5c93 jdk7-b145
Merge
author | lana |
---|---|
date | Thu, 02 Jun 2011 13:38:55 -0700 |
parents | 9f25c6a3ac23 (diff) 6762754eb7c0 (current diff) |
children | 9ff91d0e7154 347349c981f2 0adb806caf9d bb1fdcebde01 |
files | |
diffstat | 22 files changed, 22 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Jun 01 11:25:50 2011 -0700 +++ b/.hgtags Thu Jun 02 13:38:55 2011 -0700 @@ -118,3 +118,4 @@ 90adb5d6adc7d99d27c8b142a31ac8921070274f jdk7-b141 7476b164194c1814704153e74d5ff7e965c6fdbf jdk7-b142 5faa9eedc44e201f2b13ad837e9077668b823d28 jdk7-b143 +8eb952f43b117d538f6ca5e9e43ff9ce7646c7ee jdk7-b144
--- a/src/share/classes/com/sun/source/tree/UnionTypeTree.java Wed Jun 01 11:25:50 2011 -0700 +++ b/src/share/classes/com/sun/source/tree/UnionTypeTree.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/src/share/classes/com/sun/tools/classfile/ClassTranslator.java Wed Jun 01 11:25:50 2011 -0700 +++ b/src/share/classes/com/sun/tools/classfile/ClassTranslator.java Thu Jun 02 13:38:55 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 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
--- a/src/share/classes/com/sun/tools/classfile/Dependencies.java Wed Jun 01 11:25:50 2011 -0700 +++ b/src/share/classes/com/sun/tools/classfile/Dependencies.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java Wed Jun 01 11:25:50 2011 -0700 +++ b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java Wed Jun 01 11:25:50 2011 -0700 +++ b/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/test/tools/javac/4241573/T4241573.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/4241573/T4241573.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/test/tools/javac/6508981/TestInferBinaryName.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/6508981/TestInferBinaryName.java Thu Jun 02 13:38:55 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 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
--- a/test/tools/javac/TryWithResources/DuplicateResource.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/TryWithResources/DuplicateResource.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/test/tools/javac/api/6411310/Test.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/api/6411310/Test.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/test/tools/javac/api/T6838467.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/api/T6838467.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/test/tools/javac/api/T6877206.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/api/T6877206.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/test/tools/javac/api/TestClientCodeWrapper.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/api/TestClientCodeWrapper.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/test/tools/javac/api/TestJavacTask_Lock.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/api/TestJavacTask_Lock.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/test/tools/javac/api/TestJavacTask_Multiple.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/api/TestJavacTask_Multiple.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/test/tools/javac/api/TestJavacTask_ParseAttrGen.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/api/TestJavacTask_ParseAttrGen.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/test/tools/javac/multicatch/model/ModelChecker.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/multicatch/model/ModelChecker.java Thu Jun 02 13:38:55 2011 -0700 @@ -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
--- a/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java Thu Jun 02 13:38:55 2011 -0700 @@ -3,7 +3,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, asrm + * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. * * This code is distributed in the hope that it will be useful, but WITHOUT
--- a/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java Thu Jun 02 13:38:55 2011 -0700 @@ -3,7 +3,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, asrm + * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. * * This code is distributed in the hope that it will be useful, but WITHOUT
--- a/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java Thu Jun 02 13:38:55 2011 -0700 @@ -3,7 +3,7 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, asrm + * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. * * This code is distributed in the hope that it will be useful, but WITHOUT
--- a/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java Thu Jun 02 13:38:55 2011 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2010 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, 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
--- a/test/tools/javac/tree/T6963934.java Wed Jun 01 11:25:50 2011 -0700 +++ b/test/tools/javac/tree/T6963934.java Thu Jun 02 13:38:55 2011 -0700 @@ -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