Merge pull request #643 from dubinsky/add-overrides

Add missing `override`s.

Author: dubinsky

jvm/src/test/scala/scala/xml/XMLTest.scala

@@ -30,10 +30,10 @@ class XMLTestJVM {
   @UnitTest
   def equality = {
     val c = new Node {
-      def label = "hello"
+      override def label = "hello"
       override def hashCode() =
         Utility.hashCode(prefix, label, this.attributes.hashCode(), scope.hashCode(), child)
-      def child = Elem(null, "world", e, sc)
+      override def child = Elem(null, "world", e, sc)
       //def attributes = e
       override def text = ""
     }
@@ -792,7 +792,7 @@ class XMLTestJVM {
   }
 
   def toSource(s: String) = new scala.io.Source {
-    val iter = s.iterator
+    override val iter = s.iterator
     override def reportError(pos: Int, msg: String, out: java.io.PrintStream = Console.err): Unit = {}
   }
 

jvm/src/test/scala/scala/xml/parsing/ConstructingParserTest.scala

@@ -12,7 +12,7 @@ class ConstructingParserTest {
   def t9060 = {
     val a = """<a xmlns:b·="http://example.com"/>"""
     val source = new Source {
-      val iter = a.iterator
+      override val iter = a.iterator
       override def reportError(pos: Int, msg: String, out: java.io.PrintStream = Console.err) = {}
     }
     val doc = ConstructingParser.fromSource(source, false).content(TopScope)
@@ -42,7 +42,7 @@ class ConstructingParserTest {
 </book>
 
     val source = new Source {
-      val iter = xml.iterator
+      override val iter = xml.iterator
       override def reportError(pos: Int, msg: String, out: java.io.PrintStream = Console.err) = {}
     }
 
@@ -65,7 +65,7 @@ class ConstructingParserTest {
          |</book>""".stripMargin
 
     val source = new Source {
-      val iter = xml.iterator
+      override val iter = xml.iterator
       override def reportError(pos: Int, msg: String, out: java.io.PrintStream = Console.err) = {}
     }
 

shared/src/main/scala-2.13-/scala/xml/ScalaVersionSpecific.scala

@@ -19,8 +19,8 @@ private[xml] object ScalaVersionSpecific {
   import NodeSeq.Coll
   type CBF[-From, -A, +C] = CanBuildFrom[From, A, C]
   object NodeSeqCBF extends CanBuildFrom[Coll, Node, NodeSeq] {
-    def apply(from: Coll) = NodeSeq.newBuilder
-    def apply() = NodeSeq.newBuilder
+    override def apply(from: Coll) = NodeSeq.newBuilder
+    override def apply() = NodeSeq.newBuilder
   }
 }
 

shared/src/main/scala/scala/xml/Atom.scala

@@ -41,13 +41,13 @@ class Atom[+A](val data: A) extends SpecialNode with Serializable {
   final override def doCollectNamespaces = false
   final override def doTransform = false
 
-  def label = "#PCDATA"
+  override def label = "#PCDATA"
 
   /**
    * Returns text, with some characters escaped according to the XML
    *  specification.
    */
-  def buildString(sb: StringBuilder): StringBuilder =
+  override def buildString(sb: StringBuilder): StringBuilder =
     Utility.escape(data.toString, sb)
 
   override def text: String = data.toString

shared/src/main/scala/scala/xml/Attribute.scala

@@ -55,27 +55,27 @@ object Attribute {
  */
 trait Attribute extends MetaData {
   def pre: String // will be null if unprefixed
-  val key: String
-  val value: Seq[Node]
-  val next: MetaData
+  override val key: String
+  override val value: Seq[Node]
+  override val next: MetaData
 
-  def apply(key: String): Seq[Node]
-  def apply(namespace: String, scope: NamespaceBinding, key: String): Seq[Node]
-  def copy(next: MetaData): Attribute
+  override def apply(key: String): Seq[Node]
+  override def apply(namespace: String, scope: NamespaceBinding, key: String): Seq[Node]
+  override def copy(next: MetaData): Attribute
 
-  def remove(key: String) =
+  override def remove(key: String) =
     if (!isPrefixed && this.key == key) next
     else copy(next remove key)
 
-  def remove(namespace: String, scope: NamespaceBinding, key: String) =
+  override def remove(namespace: String, scope: NamespaceBinding, key: String) =
     if (this.key == key && (scope getURI pre) == namespace) next
     else copy(next.remove(namespace, scope, key))
 
-  def isPrefixed: Boolean = pre != null
+  override def isPrefixed: Boolean = pre != null
 
-  def getNamespace(owner: Node): String
+  override def getNamespace(owner: Node): String
 
-  def wellformed(scope: NamespaceBinding): Boolean = {
+  override def wellformed(scope: NamespaceBinding): Boolean = {
     val arg = if (isPrefixed) scope getURI pre else null
     (next(arg, scope, key) == null) && (next wellformed scope)
   }
@@ -94,7 +94,7 @@ trait Attribute extends MetaData {
   /**
    * Appends string representation of only this attribute to stringbuffer.
    */
-  protected def toString1(sb: StringBuilder): Unit = {
+  override protected def toString1(sb: StringBuilder): Unit = {
     if (value == null)
       return
     if (isPrefixed)

shared/src/main/scala/scala/xml/Comment.scala

@@ -23,7 +23,7 @@ package xml
  */
 case class Comment(commentText: String) extends SpecialNode {
 
-  def label = "#REM"
+  override def label = "#REM"
   override def text = ""
   final override def doCollectNamespaces = false
   final override def doTransform = false

shared/src/main/scala/scala/xml/Document.scala

@@ -96,7 +96,7 @@ class Document extends NodeSeq with Serializable {
 
   // methods for NodeSeq
 
-  def theSeq: Seq[Node] = this.docElem
+  override def theSeq: Seq[Node] = this.docElem
 
   override def canEqual(other: Any) = other match {
     case _: Document => true

shared/src/main/scala/scala/xml/Elem.scala

@@ -53,11 +53,11 @@ object Elem {
  */
 class Elem(
   override val prefix: String,
-  val label: String,
+  override val label: String,
   attributes1: MetaData,
   override val scope: NamespaceBinding,
   val minimizeEmpty: Boolean,
-  val child: Node*
+  override val child: Node*
 ) extends Node with Serializable {
 
   final override def doCollectNamespaces = true

shared/src/main/scala/scala/xml/EntityRef.scala

@@ -22,7 +22,7 @@ package xml
 case class EntityRef(entityName: String) extends SpecialNode {
   final override def doCollectNamespaces = false
   final override def doTransform = false
-  def label = "#ENTITY"
+  override def label = "#ENTITY"
 
   override def text = entityName match {
     case "lt"   => "<"

shared/src/main/scala/scala/xml/Group.scala

@@ -41,7 +41,7 @@ final case class Group(nodes: Seq[Node]) extends Node {
    */
   private def fail(msg: String) = throw new UnsupportedOperationException("class Group does not support method '%s'" format msg)
 
-  def label = fail("label")
+  override def label = fail("label")
   override def attributes = fail("attributes")
   override def namespace = fail("namespace")
   override def child = fail("child")