Skip to content

Commit c7c1c34

Browse files
authored
Merge pull request #643 from dubinsky/add-overrides
Add missing `override`s.
2 parents 5e28d29 + 21fe99e commit c7c1c34

33 files changed

+146
-146
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ class XMLTestJVM {
3030
@UnitTest
3131
def equality = {
3232
val c = new Node {
33-
def label = "hello"
33+
override def label = "hello"
3434
override def hashCode() =
3535
Utility.hashCode(prefix, label, this.attributes.hashCode(), scope.hashCode(), child)
36-
def child = Elem(null, "world", e, sc)
36+
override def child = Elem(null, "world", e, sc)
3737
//def attributes = e
3838
override def text = ""
3939
}
@@ -792,7 +792,7 @@ class XMLTestJVM {
792792
}
793793

794794
def toSource(s: String) = new scala.io.Source {
795-
val iter = s.iterator
795+
override val iter = s.iterator
796796
override def reportError(pos: Int, msg: String, out: java.io.PrintStream = Console.err): Unit = {}
797797
}
798798

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class ConstructingParserTest {
1212
def t9060 = {
1313
val a = """<a xmlns:b·="http://example.com"/>"""
1414
val source = new Source {
15-
val iter = a.iterator
15+
override val iter = a.iterator
1616
override def reportError(pos: Int, msg: String, out: java.io.PrintStream = Console.err) = {}
1717
}
1818
val doc = ConstructingParser.fromSource(source, false).content(TopScope)
@@ -42,7 +42,7 @@ class ConstructingParserTest {
4242
</book>
4343

4444
val source = new Source {
45-
val iter = xml.iterator
45+
override val iter = xml.iterator
4646
override def reportError(pos: Int, msg: String, out: java.io.PrintStream = Console.err) = {}
4747
}
4848

@@ -65,7 +65,7 @@ class ConstructingParserTest {
6565
|</book>""".stripMargin
6666

6767
val source = new Source {
68-
val iter = xml.iterator
68+
override val iter = xml.iterator
6969
override def reportError(pos: Int, msg: String, out: java.io.PrintStream = Console.err) = {}
7070
}
7171

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ private[xml] object ScalaVersionSpecific {
1919
import NodeSeq.Coll
2020
type CBF[-From, -A, +C] = CanBuildFrom[From, A, C]
2121
object NodeSeqCBF extends CanBuildFrom[Coll, Node, NodeSeq] {
22-
def apply(from: Coll) = NodeSeq.newBuilder
23-
def apply() = NodeSeq.newBuilder
22+
override def apply(from: Coll) = NodeSeq.newBuilder
23+
override def apply() = NodeSeq.newBuilder
2424
}
2525
}
2626

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ class Atom[+A](val data: A) extends SpecialNode with Serializable {
4141
final override def doCollectNamespaces = false
4242
final override def doTransform = false
4343

44-
def label = "#PCDATA"
44+
override def label = "#PCDATA"
4545

4646
/**
4747
* Returns text, with some characters escaped according to the XML
4848
* specification.
4949
*/
50-
def buildString(sb: StringBuilder): StringBuilder =
50+
override def buildString(sb: StringBuilder): StringBuilder =
5151
Utility.escape(data.toString, sb)
5252

5353
override def text: String = data.toString

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,27 +55,27 @@ object Attribute {
5555
*/
5656
trait Attribute extends MetaData {
5757
def pre: String // will be null if unprefixed
58-
val key: String
59-
val value: Seq[Node]
60-
val next: MetaData
58+
override val key: String
59+
override val value: Seq[Node]
60+
override val next: MetaData
6161

62-
def apply(key: String): Seq[Node]
63-
def apply(namespace: String, scope: NamespaceBinding, key: String): Seq[Node]
64-
def copy(next: MetaData): Attribute
62+
override def apply(key: String): Seq[Node]
63+
override def apply(namespace: String, scope: NamespaceBinding, key: String): Seq[Node]
64+
override def copy(next: MetaData): Attribute
6565

66-
def remove(key: String) =
66+
override def remove(key: String) =
6767
if (!isPrefixed && this.key == key) next
6868
else copy(next remove key)
6969

70-
def remove(namespace: String, scope: NamespaceBinding, key: String) =
70+
override def remove(namespace: String, scope: NamespaceBinding, key: String) =
7171
if (this.key == key && (scope getURI pre) == namespace) next
7272
else copy(next.remove(namespace, scope, key))
7373

74-
def isPrefixed: Boolean = pre != null
74+
override def isPrefixed: Boolean = pre != null
7575

76-
def getNamespace(owner: Node): String
76+
override def getNamespace(owner: Node): String
7777

78-
def wellformed(scope: NamespaceBinding): Boolean = {
78+
override def wellformed(scope: NamespaceBinding): Boolean = {
7979
val arg = if (isPrefixed) scope getURI pre else null
8080
(next(arg, scope, key) == null) && (next wellformed scope)
8181
}
@@ -94,7 +94,7 @@ trait Attribute extends MetaData {
9494
/**
9595
* Appends string representation of only this attribute to stringbuffer.
9696
*/
97-
protected def toString1(sb: StringBuilder): Unit = {
97+
override protected def toString1(sb: StringBuilder): Unit = {
9898
if (value == null)
9999
return
100100
if (isPrefixed)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ package xml
2323
*/
2424
case class Comment(commentText: String) extends SpecialNode {
2525

26-
def label = "#REM"
26+
override def label = "#REM"
2727
override def text = ""
2828
final override def doCollectNamespaces = false
2929
final override def doTransform = false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class Document extends NodeSeq with Serializable {
9696

9797
// methods for NodeSeq
9898

99-
def theSeq: Seq[Node] = this.docElem
99+
override def theSeq: Seq[Node] = this.docElem
100100

101101
override def canEqual(other: Any) = other match {
102102
case _: Document => true

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ object Elem {
5353
*/
5454
class Elem(
5555
override val prefix: String,
56-
val label: String,
56+
override val label: String,
5757
attributes1: MetaData,
5858
override val scope: NamespaceBinding,
5959
val minimizeEmpty: Boolean,
60-
val child: Node*
60+
override val child: Node*
6161
) extends Node with Serializable {
6262

6363
final override def doCollectNamespaces = true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ package xml
2222
case class EntityRef(entityName: String) extends SpecialNode {
2323
final override def doCollectNamespaces = false
2424
final override def doTransform = false
25-
def label = "#ENTITY"
25+
override def label = "#ENTITY"
2626

2727
override def text = entityName match {
2828
case "lt" => "<"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ final case class Group(nodes: Seq[Node]) extends Node {
4141
*/
4242
private def fail(msg: String) = throw new UnsupportedOperationException("class Group does not support method '%s'" format msg)
4343

44-
def label = fail("label")
44+
override def label = fail("label")
4545
override def attributes = fail("attributes")
4646
override def namespace = fail("namespace")
4747
override def child = fail("child")

0 commit comments

Comments
 (0)