Skip to content

Commit c7c1c34

Browse files
dubinskydubinsky
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

+3-3
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

+3-3
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

+2-2
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

+2-2
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

+12-12
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

+1-1
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

+1-1
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

+2-2
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

+1-1
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

+1-1
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")

‎shared/src/main/scala/scala/xml/MetaData.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ abstract class MetaData
150150
case m: MetaData => this.asAttrMap == m.asAttrMap
151151
case _ => false
152152
}
153-
protected def basisForHashCode: Seq[Any] = List(this.asAttrMap)
153+
override protected def basisForHashCode: Seq[Any] = List(this.asAttrMap)
154154

155155
/** filters this sequence of meta data */
156156
override def filter(f: MetaData => Boolean): MetaData =

‎shared/src/main/scala/scala/xml/NamespaceBinding.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ case class NamespaceBinding(prefix: String, uri: String, parent: NamespaceBindin
6868
case _ => false
6969
}
7070

71-
def basisForHashCode: Seq[Any] = List(prefix, uri, parent)
71+
override def basisForHashCode: Seq[Any] = List(prefix, uri, parent)
7272

7373
def buildString(stop: NamespaceBinding): String = sbToString(buildString(_, stop))
7474

‎shared/src/main/scala/scala/xml/Node.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ abstract class Node extends NodeSeq {
165165
/**
166166
* returns a sequence consisting of only this node
167167
*/
168-
def theSeq: Seq[Node] = this :: Nil
168+
override def theSeq: Seq[Node] = this :: Nil
169169

170170
/**
171171
* String representation of this node

‎shared/src/main/scala/scala/xml/NodeSeq.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import scala.collection.Seq
2727
object NodeSeq {
2828
final val Empty = fromSeq(Nil)
2929
def fromSeq(s: Seq[Node]): NodeSeq = new NodeSeq {
30-
def theSeq = s
30+
override def theSeq = s
3131
}
3232

3333
// ---
@@ -50,10 +50,10 @@ object NodeSeq {
5050
*/
5151
abstract class NodeSeq extends AbstractSeq[Node] with immutable.Seq[Node] with ScalaVersionSpecificNodeSeq with Equality with Serializable {
5252
def theSeq: Seq[Node]
53-
def length = theSeq.length
53+
override def length = theSeq.length
5454
override def iterator = theSeq.iterator
5555

56-
def apply(i: Int): Node = theSeq(i)
56+
override def apply(i: Int): Node = theSeq(i)
5757
def apply(f: Node => Boolean): NodeSeq = filter(f)
5858

5959
def xml_sameElements[A](that: Iterable[A]): Boolean = {
@@ -66,7 +66,7 @@ abstract class NodeSeq extends AbstractSeq[Node] with immutable.Seq[Node] with S
6666
!these.hasNext && !those.hasNext
6767
}
6868

69-
protected def basisForHashCode: Seq[Any] = theSeq
69+
override protected def basisForHashCode: Seq[Any] = theSeq
7070

7171
override def canEqual(other: Any) = other match {
7272
case _: NodeSeq => true

‎shared/src/main/scala/scala/xml/Null.scala

+11-11
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ case object Null extends MetaData {
3030
override def append(m: MetaData, scope: NamespaceBinding = TopScope): MetaData = m
3131
override def filter(f: MetaData => Boolean): MetaData = this
3232

33-
def copy(next: MetaData) = next
34-
def getNamespace(owner: Node) = null
33+
override def copy(next: MetaData) = next
34+
override def getNamespace(owner: Node) = null
3535

3636
override def hasNext = false
37-
def next = null
38-
def key = null
39-
def value = null
40-
def isPrefixed = false
37+
override def next = null
38+
override def key = null
39+
override def value = null
40+
override def isPrefixed = false
4141

4242
override def length = 0
4343
override def length(i: Int) = i
@@ -48,12 +48,12 @@ case object Null extends MetaData {
4848
}
4949
override protected def basisForHashCode: Seq[Any] = Nil
5050

51-
def apply(namespace: String, scope: NamespaceBinding, key: String) = null
52-
def apply(key: String) =
51+
override def apply(namespace: String, scope: NamespaceBinding, key: String) = null
52+
override def apply(key: String) =
5353
if (isNameStart(key.head)) null
5454
else throw new IllegalArgumentException("not a valid attribute name '" + key + "', so can never match !")
5555

56-
protected def toString1(sb: StringBuilder) = ()
56+
override protected def toString1(sb: StringBuilder) = ()
5757
override protected def toString1(): String = ""
5858

5959
override def toString(): String = ""
@@ -62,6 +62,6 @@ case object Null extends MetaData {
6262

6363
override def wellformed(scope: NamespaceBinding) = true
6464

65-
def remove(key: String) = this
66-
def remove(namespace: String, scope: NamespaceBinding, key: String) = this
65+
override def remove(key: String) = this
66+
override def remove(namespace: String, scope: NamespaceBinding, key: String) = this
6767
}

‎shared/src/main/scala/scala/xml/PrefixedAttribute.scala

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import scala.collection.Seq
2424
* @param next1
2525
*/
2626
class PrefixedAttribute(
27-
val pre: String,
28-
val key: String,
29-
val value: Seq[Node],
27+
override val pre: String,
28+
override val key: String,
29+
override val value: Seq[Node],
3030
val next1: MetaData)
3131
extends Attribute {
32-
val next = if (value ne null) next1 else next1.remove(key)
32+
override val next = if (value ne null) next1 else next1.remove(key)
3333

3434
/** same as this(pre, key, Text(value), next), or no attribute if value is null */
3535
def this(pre: String, key: String, value: String, next: MetaData) =
@@ -43,19 +43,19 @@ class PrefixedAttribute(
4343
* Returns a copy of this unprefixed attribute with the given
4444
* next field.
4545
*/
46-
def copy(next: MetaData) =
46+
override def copy(next: MetaData) =
4747
new PrefixedAttribute(pre, key, value, next)
4848

49-
def getNamespace(owner: Node) =
49+
override def getNamespace(owner: Node) =
5050
owner.getNamespace(pre)
5151

5252
/** forwards the call to next (because caller looks for unprefixed attribute */
53-
def apply(key: String): Seq[Node] = next(key)
53+
override def apply(key: String): Seq[Node] = next(key)
5454

5555
/**
5656
* gets attribute value of qualified (prefixed) attribute with given key
5757
*/
58-
def apply(namespace: String, scope: NamespaceBinding, key: String): Seq[Node] = {
58+
override def apply(namespace: String, scope: NamespaceBinding, key: String): Seq[Node] = {
5959
if (key == this.key && scope.getURI(pre) == namespace)
6060
value
6161
else

‎shared/src/main/scala/scala/xml/ProcInstr.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ case class ProcInstr(target: String, proctext: String) extends SpecialNode {
3131
final override def doCollectNamespaces = false
3232
final override def doTransform = false
3333

34-
final def label = "#PI"
34+
final override def label = "#PI"
3535
override def text = ""
3636

3737
/**

‎shared/src/main/scala/scala/xml/SpecialNode.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ abstract class SpecialNode extends Node {
2828
final override def namespace = null
2929

3030
/** always empty */
31-
final def child = Nil
31+
final override def child = Nil
3232

3333
/** Append string representation to the given string buffer argument. */
3434
def buildString(sb: StringBuilder): StringBuilder

‎shared/src/main/scala/scala/xml/UnprefixedAttribute.scala

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import scala.collection.Seq
2121
* @author Burak Emir
2222
*/
2323
class UnprefixedAttribute(
24-
val key: String,
25-
val value: Seq[Node],
24+
override val key: String,
25+
override val value: Seq[Node],
2626
next1: MetaData)
2727
extends Attribute {
28-
final val pre = null
29-
val next = if (value ne null) next1 else next1.remove(key)
28+
final override val pre = null
29+
override val next = if (value ne null) next1 else next1.remove(key)
3030

3131
/** same as this(key, Text(value), next), or no attribute if value is null */
3232
def this(key: String, value: String, next: MetaData) =
@@ -37,17 +37,17 @@ class UnprefixedAttribute(
3737
this(key, value.orNull, next)
3838

3939
/** returns a copy of this unprefixed attribute with the given next field*/
40-
def copy(next: MetaData) = new UnprefixedAttribute(key, value, next)
40+
override def copy(next: MetaData) = new UnprefixedAttribute(key, value, next)
4141

42-
final def getNamespace(owner: Node): String = null
42+
final override def getNamespace(owner: Node): String = null
4343

4444
/**
4545
* Gets value of unqualified (unprefixed) attribute with given key, null if not found
4646
*
4747
* @param key
4848
* @return value as Seq[Node] if key is found, null otherwise
4949
*/
50-
def apply(key: String): Seq[Node] =
50+
override def apply(key: String): Seq[Node] =
5151
if (key == this.key) value else next(key)
5252

5353
/**
@@ -58,7 +58,7 @@ class UnprefixedAttribute(
5858
* @param key
5959
* @return ..
6060
*/
61-
def apply(namespace: String, scope: NamespaceBinding, key: String): Seq[Node] =
61+
override def apply(namespace: String, scope: NamespaceBinding, key: String): Seq[Node] =
6262
next(namespace, scope, key)
6363
}
6464
object UnprefixedAttribute {

0 commit comments

Comments
 (0)