diff options
author | Paul Phillips <paulp@improving.org> | 2009-11-18 23:24:23 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2009-11-18 23:24:23 +0000 |
commit | 2a6a02e9a782b7621e3dc79d2f07fca074b11bb6 (patch) | |
tree | 54a5c40bcd7bdb8895dd35bf66da62007b51fa94 /src/library | |
parent | d92679d81c8674e2e21cc18103d10ab16a3b8e0d (diff) | |
download | scala-2a6a02e9a782b7621e3dc79d2f07fca074b11bb6.tar.gz scala-2a6a02e9a782b7621e3dc79d2f07fca074b11bb6.tar.bz2 scala-2a6a02e9a782b7621e3dc79d2f07fca074b11bb6.zip |
More deprecation soothing.
warning count.
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/Enumeration.scala | 2 | ||||
-rw-r--r-- | src/library/scala/collection/immutable/List.scala | 8 | ||||
-rw-r--r-- | src/library/scala/reflect/Print.scala | 2 | ||||
-rw-r--r-- | src/library/scala/runtime/ScalaRunTime.scala | 2 | ||||
-rw-r--r-- | src/library/scala/util/Random.scala | 2 | ||||
-rw-r--r-- | src/library/scala/xml/NamespaceBinding.scala | 2 | ||||
-rw-r--r-- | src/library/scala/xml/TopScope.scala | 1 |
7 files changed, 10 insertions, 9 deletions
diff --git a/src/library/scala/Enumeration.scala b/src/library/scala/Enumeration.scala index 01f99d550a..86e0dbe708 100644 --- a/src/library/scala/Enumeration.scala +++ b/src/library/scala/Enumeration.scala @@ -176,7 +176,7 @@ abstract class Enumeration(initial: Int, names: String*) { val value = m.invoke(this) // invoke `id` method val idMeth = classOf[Val].getMethod("id") - val id: Int = idMeth.invoke(value).asInstanceOf[Integer].intValue() + val id: Int = idMeth.invoke(value).asInstanceOf[java.lang.Integer].intValue() nmap += (id -> name) } nmap(i) diff --git a/src/library/scala/collection/immutable/List.scala b/src/library/scala/collection/immutable/List.scala index d60ea0f58b..8c43bdb998 100644 --- a/src/library/scala/collection/immutable/List.scala +++ b/src/library/scala/collection/immutable/List.scala @@ -653,7 +653,7 @@ object List extends SeqFactory[List] { * <code>[a0, ..., ak]</code>, <code>[b0, ..., bl]</code> and * <code>n = min(k,l)</code> */ - @deprecated("use `(xs, ys).map(f)' instead") + @deprecated("use `(xs, ys).zipped.map(f)' instead") def map2[A,B,C](xs: List[A], ys: List[B])(f: (A, B) => C): List[C] = { val b = new ListBuffer[C] var xc = xs @@ -677,7 +677,7 @@ object List extends SeqFactory[List] { * <code>[c<sub>0</sub>, ..., c<sub>m</sub>]</code> and * <code>n = min(k,l,m)</code> */ - @deprecated("use `(xs, ys, zs).map(f)' instead") + @deprecated("use `(xs, ys, zs).zipped.map(f)' instead") def map3[A,B,C,D](xs: List[A], ys: List[B], zs: List[C])(f: (A, B, C) => D): List[D] = { val b = new ListBuffer[D] var xc = xs @@ -702,7 +702,7 @@ object List extends SeqFactory[List] { * <code>[b<sub>0</sub>, ..., b<sub>l</sub>]</code> * and <code>n = min(k,l)</code> */ - @deprecated("use `(xs, ys).forall(f)' instead") + @deprecated("use `(xs, ys).zipped.forall(f)' instead") def forall2[A,B](xs: List[A], ys: List[B])(f: (A, B) => Boolean): Boolean = { var xc = xs var yc = ys @@ -724,7 +724,7 @@ object List extends SeqFactory[List] { * <code>[b<sub>0</sub>, ..., b<sub>l</sub>]</code> and * <code>n = min(k,l)</code> */ - @deprecated("use `(xs, ys).exists(f)' instead") + @deprecated("use `(xs, ys).zipped.exists(f)' instead") def exists2[A,B](xs: List[A], ys: List[B])(f: (A, B) => Boolean): Boolean = { var xc = xs var yc = ys diff --git a/src/library/scala/reflect/Print.scala b/src/library/scala/reflect/Print.scala index 6df7fb032a..ab9ffdc99b 100644 --- a/src/library/scala/reflect/Print.scala +++ b/src/library/scala/reflect/Print.scala @@ -106,6 +106,8 @@ object Print extends Function1[Any, String] { (List.map2(typeParams, typeBounds) ((tp, tb) => "[" + Print(tb._1) + " :> " + Print(tp) + " :> " + Print(tb._2) + "]")). mkString("[", ", ", "]") + " -> " + Print(resultType) + // val z = (typeParams, typeBounds).zip map { case (tp, tb) => "[" + Print(tb._1) + " :> " + Print(tp) + " :> " + Print(tb._2) + "]" } + // z.mkString("[", ", ", "]") + " -> " + Print(resultType) case _ => "???" } diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala index 6467751a1f..c25e042957 100644 --- a/src/library/scala/runtime/ScalaRunTime.scala +++ b/src/library/scala/runtime/ScalaRunTime.scala @@ -125,7 +125,7 @@ object ScalaRunTime { @inline def inlinedEquals(x: Object, y: Object): Boolean = if (x eq y) true else if (x eq null) false - else if (x.isInstanceOf[Number] || x.isInstanceOf[Character]) BoxesRunTime.equals2(x, y) + else if (x.isInstanceOf[java.lang.Number] || x.isInstanceOf[java.lang.Character]) BoxesRunTime.equals2(x, y) else x.equals(y) def _equals(x: Product, y: Any): Boolean = y match { diff --git a/src/library/scala/util/Random.scala b/src/library/scala/util/Random.scala index d1c04e996f..4a61377eea 100644 --- a/src/library/scala/util/Random.scala +++ b/src/library/scala/util/Random.scala @@ -119,7 +119,7 @@ object Random extends Random * @return the shuffled Traversable */ def shuffle[T, CC[X] <: Traversable[X]](coll: CC[T])(implicit bf: CanBuildFrom[CC[T], T, CC[T]]): CC[T] = { - val buf = new ArrayBuffer[T] ++ coll + val buf = new ArrayBuffer[T] ++= coll def swap(i1: Int, i2: Int) { val tmp = buf(i1) diff --git a/src/library/scala/xml/NamespaceBinding.scala b/src/library/scala/xml/NamespaceBinding.scala index 93485a17fe..8adda4197a 100644 --- a/src/library/scala/xml/NamespaceBinding.scala +++ b/src/library/scala/xml/NamespaceBinding.scala @@ -25,7 +25,7 @@ import collection.mutable.StringBuilder @SerialVersionUID(0 - 2518644165573446725L) case class NamespaceBinding(prefix: String, uri: String, parent: NamespaceBinding) extends AnyRef { - if (prefix != null && prefix.isEmpty) + if (prefix == "") throw new IllegalArgumentException("zero length prefix not allowed") def getURI(_prefix: String): String = diff --git a/src/library/scala/xml/TopScope.scala b/src/library/scala/xml/TopScope.scala index c458248ae3..41a1678a50 100644 --- a/src/library/scala/xml/TopScope.scala +++ b/src/library/scala/xml/TopScope.scala @@ -12,7 +12,6 @@ package scala.xml import collection.mutable.StringBuilder - /** top level namespace scope. only contains the predefined binding * for the "xml" prefix which is bound to * "http://www.w3.org/XML/1998/namespace" |