From 6d65d1a4400afbbcd27c141b62be2d0bb23fd34a Mon Sep 17 00:00:00 2001
From: katleman <unknown>
Date: Wed, 25 May 2011 13:32:10 -0700
Subject: [PATCH] 7044486: open jdk repos have files with incorrect copyright
 headers, which can end up in src bundles Reviewed-by: ohair, trims

---
 src/share/classes/com/sun/source/tree/UnionTypeTree.java        | 2 +-
 src/share/classes/com/sun/tools/classfile/ClassTranslator.java  | 2 +-
 src/share/classes/com/sun/tools/classfile/Dependencies.java     | 2 +-
 .../classes/javax/lang/model/util/AbstractTypeVisitor7.java     | 2 +-
 .../classes/javax/lang/model/util/ElementKindVisitor7.java      | 2 +-
 test/tools/javac/4241573/T4241573.java                          | 2 +-
 test/tools/javac/6508981/TestInferBinaryName.java               | 2 +-
 test/tools/javac/TryWithResources/DuplicateResource.java        | 2 +-
 test/tools/javac/api/6411310/Test.java                          | 2 +-
 test/tools/javac/api/T6838467.java                              | 2 +-
 test/tools/javac/api/T6877206.java                              | 2 +-
 test/tools/javac/api/TestClientCodeWrapper.java                 | 2 +-
 test/tools/javac/api/TestJavacTask_Lock.java                    | 2 +-
 test/tools/javac/api/TestJavacTask_Multiple.java                | 2 +-
 test/tools/javac/api/TestJavacTask_ParseAttrGen.java            | 2 +-
 test/tools/javac/multicatch/model/ModelChecker.java             | 2 +-
 .../TestMissingElement2/TestMissingGenericInterface1.java       | 2 +-
 .../TestMissingElement2/TestMissingGenericInterface2.java       | 2 +-
 .../model/element/TestMissingElement2/TestMissingInterface.java | 2 +-
 .../processing/model/util/deprecation/TestDeprecation.java      | 2 +-
 test/tools/javac/tree/T6963934.java                             | 2 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/share/classes/com/sun/source/tree/UnionTypeTree.java b/src/share/classes/com/sun/source/tree/UnionTypeTree.java
index 75e38676..2a4b935f 100644
--- a/src/share/classes/com/sun/source/tree/UnionTypeTree.java
+++ b/src/share/classes/com/sun/source/tree/UnionTypeTree.java
@@ -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 --git a/src/share/classes/com/sun/tools/classfile/ClassTranslator.java b/src/share/classes/com/sun/tools/classfile/ClassTranslator.java
index 3bdd5d8b..f40a8d5e 100644
--- a/src/share/classes/com/sun/tools/classfile/ClassTranslator.java
+++ b/src/share/classes/com/sun/tools/classfile/ClassTranslator.java
@@ -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
diff --git a/src/share/classes/com/sun/tools/classfile/Dependencies.java b/src/share/classes/com/sun/tools/classfile/Dependencies.java
index 5d36d009..cffa7780 100644
--- a/src/share/classes/com/sun/tools/classfile/Dependencies.java
+++ b/src/share/classes/com/sun/tools/classfile/Dependencies.java
@@ -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 --git a/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java
index 82471264..a0988e9f 100644
--- a/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java
+++ b/src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java
@@ -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 --git a/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java b/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java
index ec5a8233..7e8974f7 100644
--- a/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java
+++ b/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java
@@ -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 --git a/test/tools/javac/4241573/T4241573.java b/test/tools/javac/4241573/T4241573.java
index cc51dbef..73a039b4 100644
--- a/test/tools/javac/4241573/T4241573.java
+++ b/test/tools/javac/4241573/T4241573.java
@@ -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 --git a/test/tools/javac/6508981/TestInferBinaryName.java b/test/tools/javac/6508981/TestInferBinaryName.java
index b14bdc01..e94ba29b 100644
--- a/test/tools/javac/6508981/TestInferBinaryName.java
+++ b/test/tools/javac/6508981/TestInferBinaryName.java
@@ -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
diff --git a/test/tools/javac/TryWithResources/DuplicateResource.java b/test/tools/javac/TryWithResources/DuplicateResource.java
index 78961abc..85f3aa04 100644
--- a/test/tools/javac/TryWithResources/DuplicateResource.java
+++ b/test/tools/javac/TryWithResources/DuplicateResource.java
@@ -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 --git a/test/tools/javac/api/6411310/Test.java b/test/tools/javac/api/6411310/Test.java
index aec6c7db..26a98928 100644
--- a/test/tools/javac/api/6411310/Test.java
+++ b/test/tools/javac/api/6411310/Test.java
@@ -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 --git a/test/tools/javac/api/T6838467.java b/test/tools/javac/api/T6838467.java
index b08412d6..50877970 100644
--- a/test/tools/javac/api/T6838467.java
+++ b/test/tools/javac/api/T6838467.java
@@ -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 --git a/test/tools/javac/api/T6877206.java b/test/tools/javac/api/T6877206.java
index 3c82bb3e..d3a09a51 100644
--- a/test/tools/javac/api/T6877206.java
+++ b/test/tools/javac/api/T6877206.java
@@ -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 --git a/test/tools/javac/api/TestClientCodeWrapper.java b/test/tools/javac/api/TestClientCodeWrapper.java
index 33d941cf..29982fad 100644
--- a/test/tools/javac/api/TestClientCodeWrapper.java
+++ b/test/tools/javac/api/TestClientCodeWrapper.java
@@ -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 --git a/test/tools/javac/api/TestJavacTask_Lock.java b/test/tools/javac/api/TestJavacTask_Lock.java
index cc27c117..d4b67c1b 100644
--- a/test/tools/javac/api/TestJavacTask_Lock.java
+++ b/test/tools/javac/api/TestJavacTask_Lock.java
@@ -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 --git a/test/tools/javac/api/TestJavacTask_Multiple.java b/test/tools/javac/api/TestJavacTask_Multiple.java
index c80cc6e0..dc78d824 100644
--- a/test/tools/javac/api/TestJavacTask_Multiple.java
+++ b/test/tools/javac/api/TestJavacTask_Multiple.java
@@ -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 --git a/test/tools/javac/api/TestJavacTask_ParseAttrGen.java b/test/tools/javac/api/TestJavacTask_ParseAttrGen.java
index e318b3e0..44e1c82f 100644
--- a/test/tools/javac/api/TestJavacTask_ParseAttrGen.java
+++ b/test/tools/javac/api/TestJavacTask_ParseAttrGen.java
@@ -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 --git a/test/tools/javac/multicatch/model/ModelChecker.java b/test/tools/javac/multicatch/model/ModelChecker.java
index 97ccca16..96c45e07 100644
--- a/test/tools/javac/multicatch/model/ModelChecker.java
+++ b/test/tools/javac/multicatch/model/ModelChecker.java
@@ -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 --git a/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java b/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java
index 0c0982e2..770630cc 100644
--- a/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java
+++ b/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java
@@ -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
diff --git a/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java b/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java
index d531ba22..48f09f67 100644
--- a/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java
+++ b/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java
@@ -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
diff --git a/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java b/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java
index 5ab77b66..8f3bca9f 100644
--- a/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java
+++ b/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java
@@ -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
diff --git a/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java b/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java
index ce9b2cdf..f4097594 100644
--- a/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java
+++ b/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java
@@ -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
diff --git a/test/tools/javac/tree/T6963934.java b/test/tools/javac/tree/T6963934.java
index 03efb299..a64e16dc 100644
--- a/test/tools/javac/tree/T6963934.java
+++ b/test/tools/javac/tree/T6963934.java
@@ -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
-- 
GitLab