summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/JavaConverters.scala
diff options
context:
space:
mode:
authorJanek Bogucki <janekdb@gmail.com>2015-12-12 20:46:54 +0000
committerJanek Bogucki <janekdb@gmail.com>2015-12-12 20:46:54 +0000
commit231984470ccf9cbcfbf54567de1d49c7447b7641 (patch)
treef355f3be5449f459d1efc527a1c52e3ccbee0d03 /src/library/scala/collection/JavaConverters.scala
parent5e99f82159842c5e2b60a1427e129b0b720a0d38 (diff)
downloadscala-231984470ccf9cbcfbf54567de1d49c7447b7641.tar.gz
scala-231984470ccf9cbcfbf54567de1d49c7447b7641.tar.bz2
scala-231984470ccf9cbcfbf54567de1d49c7447b7641.zip
Document JavaConverters conversion from java.util.Properties to Map
Also - Fix grammar on duplicated DecorateAsJava comment by copying over from JavaConverters - Remove author tags
Diffstat (limited to 'src/library/scala/collection/JavaConverters.scala')
-rw-r--r--src/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 875f6e1c02..86e86d4584 100644
--- a/src/library/scala/collection/JavaConverters.scala
+++ b/src/library/scala/collection/JavaConverters.scala
@@ -52,7 +52,10 @@ import convert._
* - `scala.collection.Set` => `java.util.Set`
* - `scala.collection.Map` => `java.util.Map`
*
- * @author Martin Odersky
+ * The following one way conversion is provided via `asScala`:
+ *
+ * - `java.util.Properties` => `scala.collection.mutable.Map`
+ *
* @since 2.8.1
*/
object JavaConverters extends DecorateAsJava with DecorateAsScala