summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgakuzzzz <gaku_github@t2v.jp>2012-04-12 00:36:38 +0900
committergakuzzzz <gaku_github@t2v.jp>2012-04-12 00:36:38 +0900
commit9ea4ca3c80ece5c3c9ce6573aabc1920cf519507 (patch)
tree73266fc046eac6d9c56719ab15fd4889909f5484
parentb448f13d431a1a4e9d23c6acbf4bd15ccb647e3f (diff)
downloadscala-9ea4ca3c80ece5c3c9ce6573aabc1920cf519507.tar.gz
scala-9ea4ca3c80ece5c3c9ce6573aabc1920cf519507.tar.bz2
scala-9ea4ca3c80ece5c3c9ce6573aabc1920cf519507.zip
This change enables the alphanumeric method to be called from SecureRandom
-rw-r--r--src/library/scala/util/Random.scala20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/library/scala/util/Random.scala b/src/library/scala/util/Random.scala
index 791582c9ec..62cba1fc5b 100644
--- a/src/library/scala/util/Random.scala
+++ b/src/library/scala/util/Random.scala
@@ -120,15 +120,6 @@ class Random(val self: java.util.Random) {
bf(xs) ++= buf result
}
-}
-
-/** The object `Random` offers a default implementation
- * of scala.util.Random and random-related convenience methods.
- *
- * @since 2.8
- */
-object Random extends Random {
-
/** Returns a Stream of pseudorandomly chosen alphanumeric characters,
* equally chosen from A-Z, a-z, and 0-9.
*
@@ -141,3 +132,14 @@ object Random extends Random {
}
}
+
+/** The object `Random` offers a default implementation
+ * of scala.util.Random and random-related convenience methods.
+ *
+ * @since 2.8
+ */
+object Random extends Random {
+
+ implicit def javaRandomToRandom(r: java.util.Random): Random = new Random(r)
+
+}