summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/JavaConverters.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-01-10 11:18:59 -0800
committerPaul Phillips <paulp@improving.org>2012-01-10 11:18:59 -0800
commit25fcbd7021cad1e3c7b50c2b8f5c586008579bf9 (patch)
treeec012beaf0ca12bfaab5e16d3efa8ec53c243728 /src/library/scala/collection/JavaConverters.scala
parent21fb32f41b47e22f2e35b0b6f4604aa63a5d4a32 (diff)
downloadscala-25fcbd7021cad1e3c7b50c2b8f5c586008579bf9.tar.gz
scala-25fcbd7021cad1e3c7b50c2b8f5c586008579bf9.tar.bz2
scala-25fcbd7021cad1e3c7b50c2b8f5c586008579bf9.zip
Traitified JavaConverters.
So it can be used as a mixin.
Diffstat (limited to 'src/library/scala/collection/JavaConverters.scala')
-rwxr-xr-xsrc/library/scala/collection/JavaConverters.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/library/scala/collection/JavaConverters.scala b/src/library/scala/collection/JavaConverters.scala
index 94f7e9701b..d213e60112 100755
--- a/src/library/scala/collection/JavaConverters.scala
+++ b/src/library/scala/collection/JavaConverters.scala
@@ -48,7 +48,8 @@ package scala.collection
* @author Martin Odersky
* @since 2.8.1
*/
-object JavaConverters {
+
+trait JavaConverters {
import java.{ lang => jl, util => ju }
import java.util.{ concurrent => juc }
import JavaConversions._
@@ -536,3 +537,5 @@ object JavaConverters {
propertiesAsScalaMapConverter(p)
}
+
+object JavaConverters extends JavaConverters \ No newline at end of file