Merge pull request scala#191 from ashawley/google-copyright

Move Google copyright to file header
SethTisue · Feb 19, 2018 · 4a54464 · 4a54464
2 parents ff9c21c + 3cd00aa
commit 4a54464
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/shared/src/main/scala/scala/xml/Elem.scala b/shared/src/main/scala/scala/xml/Elem.scala
@@ -4,6 +4,8 @@
 **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
+**                                 Copyright 2008 Google Inc.           **
+**                                 All Rights Reserved.                 **
 \*                                                                      */
 
 package scala
@@ -14,9 +16,6 @@ package xml
  *  convenient construction and deconstruction. It is possible to deconstruct
  *  any `Node` instance (that is not a `SpecialNode` or a `Group`) using the
  *  syntax `case Elem(prefix, label, attribs, scope, child @ _*) => ...`
- *
- *  Copyright 2008 Google Inc. All Rights Reserved.
- *  @author Burak Emir <[email protected]>
  */
 object Elem {
   /**
@@ -83,9 +82,6 @@ object Elem {
  *  @param minimizeEmpty `true` if this element should be serialized as minimized (i.e. "&lt;el/&gt;") when
  *                       empty; `false` if it should be written out in long form.
  *  @param child         the children of this node
- *
- *  Copyright 2008 Google Inc. All Rights Reserved.
- *  @author Burak Emir <[email protected]>
  */
 class Elem(
   override val prefix: String,

diff --git a/shared/src/main/scala/scala/xml/MetaData.scala b/shared/src/main/scala/scala/xml/MetaData.scala
@@ -4,6 +4,8 @@
 **  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
+**                                 Copyright 2008 Google Inc.           **
+**                                 All Rights Reserved.                 **
 \*                                                                      */
 
 package scala
@@ -13,10 +15,6 @@ import Utility.sbToString
 import scala.annotation.tailrec
 import scala.collection.AbstractIterable
 
-/**
- * Copyright 2008 Google Inc. All Rights Reserved.
- * @author Burak Emir <[email protected]>
- */
 object MetaData {
   /**
    * appends all attributes from new_tail to attribs, without attempting to
@@ -78,9 +76,6 @@ object MetaData {
  *
  *  Namespace URIs are obtained by using the namespace scope of the element
  *  owning this attribute (see `getNamespace`).
- *
- *  Copyright 2008 Google Inc. All Rights Reserved.
- *  @author Burak Emir <[email protected]>
  */
 abstract class MetaData
   extends AbstractIterable[MetaData]