summaryrefslogtreecommitdiff
path: root/test/files/run/map_java_conversions.scala
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2016-03-25 23:53:00 -0700
committerLukas Rytz <lukas.rytz@gmail.com>2016-04-22 09:56:30 +0200
commit0c5b42d974fbd3703f29f0232e2c9215e41fb379 (patch)
tree0d2b5a511344ac305064f7c29e21c7378e35ebe4 /test/files/run/map_java_conversions.scala
parentf55dd2084eca97c576a982473ab6701f98fb79a7 (diff)
downloadscala-0c5b42d974fbd3703f29f0232e2c9215e41fb379.tar.gz
scala-0c5b42d974fbd3703f29f0232e2c9215e41fb379.tar.bz2
scala-0c5b42d974fbd3703f29f0232e2c9215e41fb379.zip
SI-9684 Deprecate JavaConversions
Implicit conversions are now in package convert as ImplicitConversions, ImplicitConversionsToScala and ImplicitConversionsToJava. Deprecated WrapAsJava, WrapAsScala and the values in package object. Improve documentation.
Diffstat (limited to 'test/files/run/map_java_conversions.scala')
-rw-r--r--test/files/run/map_java_conversions.scala11
1 files changed, 3 insertions, 8 deletions
diff --git a/test/files/run/map_java_conversions.scala b/test/files/run/map_java_conversions.scala
index c007b3e0eb..e287b0eb09 100644
--- a/test/files/run/map_java_conversions.scala
+++ b/test/files/run/map_java_conversions.scala
@@ -1,20 +1,16 @@
-
-
-
-
+import collection.convert.ImplicitConversionsToScala._
+import collection.JavaConverters._
object Test {
def main(args: Array[String]) {
- import collection.JavaConversions._
-
test(new java.util.HashMap[String, String])
test(new java.util.Properties)
testConcMap
}
def testConcMap {
- import collection.JavaConversions._
+ import collection.convert.ImplicitConversionsToScala._
val concMap = new java.util.concurrent.ConcurrentHashMap[String, String]
@@ -50,7 +46,6 @@ object Test {
for (i <- 0 until 10) m += (("key" + i, "value" + i))
for ((k, v) <- m) assert(k.startsWith("key"))
}
-
}