changeset 1076:b9c11a152207

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Fri, 27 May 2011 00:01:06 -0700
parents 88bf21461a6b 9f25c6a3ac23
children 0902944b6b93
files
diffstat 22 files changed, 22 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri May 20 20:04:23 2011 -0700
+++ b/.hgtags	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/src/share/classes/com/sun/source/tree/UnionTypeTree.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/ClassTranslator.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/src/share/classes/com/sun/tools/classfile/Dependencies.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/4241573/T4241573.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/6508981/TestInferBinaryName.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/TryWithResources/DuplicateResource.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/api/6411310/Test.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/api/T6838467.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/api/T6877206.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/api/TestClientCodeWrapper.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/api/TestJavacTask_Lock.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/api/TestJavacTask_Multiple.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/api/TestJavacTask_ParseAttrGen.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/multicatch/model/ModelChecker.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java	Fri May 27 00:01:06 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	Fri May 20 20:04:23 2011 -0700
+++ b/test/tools/javac/tree/T6963934.java	Fri May 27 00:01:06 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