Skip to content

Commit 289c5e9

Browse files
paulpadriaanm
authored andcommitted
Removing the code which has been deprecated sin...
Removing the code which has been deprecated since 2.8.0. Contributed by Simon Ochsenreither, although deleting code is such fun one hesitates to call it a contribution. Still, we will. Closes SI-4860, no review.
1 parent cb5724e commit 289c5e9

File tree

4 files changed

+6
-42
lines changed

4 files changed

+6
-42
lines changed

src/library/scala/xml/HasKeyValue.scala

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/library/scala/xml/XML.scala

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,6 @@ object XML extends XMLLoader[Elem]
4949
def withSAXParser(p: SAXParser): XMLLoader[Elem] =
5050
new XMLLoader[Elem] { override val parser: SAXParser = p }
5151

52-
@deprecated("Use save() instead", "2.8.0")
53-
final def saveFull(filename: String, node: Node, xmlDecl: Boolean, doctype: dtd.DocType): Unit =
54-
save(filename, node, encoding, xmlDecl, doctype)
55-
56-
@deprecated("Use save() instead", "2.8.0")
57-
final def saveFull(filename: String, node: Node, enc: String, xmlDecl: Boolean, doctype: dtd.DocType): Unit =
58-
save(filename, node, enc, xmlDecl, doctype)
59-
6052
/** Saves a node to a file with given filename using given encoding
6153
* optionally with xmldecl and doctype declaration.
6254
*

test/files/jvm/backendBugUnapply.scala

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
object Test {
2-
import scala.xml.{Node,HasKeyValue}
3-
4-
def domatch(x:Node): Node = {
5-
val hasBar = new HasKeyValue("bar")
2+
import scala.xml.{Node,UnprefixedAttribute}
63

4+
def domatch(x:Node) =
75
x match {
8-
case Node("foo", hasBar(z), _*) => z
6+
case Node("foo", UnprefixedAttribute("bar", z, _), _*) => z
97
case _ => null
108
}
11-
}
129

1310
def main(args: Array[String]): Unit = {
1411
println(domatch(<foo bar="baz"><hi/></foo>))

test/files/jvm/unittest_xml.scala

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@ object Test {
99

1010
object MetaDataTest {
1111

12-
import scala.xml.{ HasKeyValue, TopScope, NamespaceBinding, Node, Atom, Text }
12+
import scala.xml.{ TopScope, NamespaceBinding, Node, Atom, Text }
1313

1414
def domatch(x:Node): Node = {
15-
val hasBar = new HasKeyValue("bar")
1615
x match {
17-
//case Node("foo", hasBar(z), _*) => z
18-
case Node("foo", md, _*) if !hasBar.unapplySeq(md).isEmpty =>
16+
case Node("foo", md @ UnprefixedAttribute(_, value, _), _*) if !value.isEmpty =>
1917
md("bar")(0)
2018
case _ => new Atom(3)
2119
}
2220
}
21+
2322
def run() {
2423

2524
var x: MetaData = Null

0 commit comments

Comments
 (0)