summaryrefslogtreecommitdiff
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
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
-rw-r--r--src/library/scala/collection/JavaConverters.scala5
-rw-r--r--src/library/scala/collection/convert/DecorateAsJava.scala12
2 files changed, 11 insertions, 6 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
diff --git a/src/library/scala/collection/convert/DecorateAsJava.scala b/src/library/scala/collection/convert/DecorateAsJava.scala
index 6658b6feea..e6aa5da067 100644
--- a/src/library/scala/collection/convert/DecorateAsJava.scala
+++ b/src/library/scala/collection/convert/DecorateAsJava.scala
@@ -16,7 +16,7 @@ import WrapAsJava._
import scala.language.implicitConversions
-/** A collection of decorators that allow to convert between
+/** A collection of decorators that allow converting between
* Scala and Java collections using `asScala` and `asJava` methods.
*
* The following conversions are supported via `asJava`, `asScala`
@@ -38,8 +38,8 @@ import scala.language.implicitConversions
* val sl2 : scala.collection.mutable.Buffer[Int] = jl.asScala
* assert(sl eq sl2)
* }}}
- * The following conversions also are supported, but the
- * direction Scala to Java is done my a more specifically named method:
+ * The following conversions are also supported, but the
+ * direction from Scala to Java is done by the more specifically named methods:
* `asJavaCollection`, `asJavaEnumeration`, `asJavaDictionary`.
*
* - `scala.collection.Iterable` <=> `java.util.Collection`
@@ -53,10 +53,12 @@ import scala.language.implicitConversions
* - `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
*/
-
trait DecorateAsJava {
/**
* Adds an `asJava` method that implicitly converts a Scala `Iterator` to a