Skip to content

Commit 2319844

Browse files
committed
Document JavaConverters conversion from java.util.Properties to Map
Also - Fix grammar on duplicated DecorateAsJava comment by copying over from JavaConverters - Remove author tags
1 parent 5e99f82 commit 2319844

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/library/scala/collection/JavaConverters.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ import convert._
5252
* - `scala.collection.Set` => `java.util.Set`
5353
* - `scala.collection.Map` => `java.util.Map`
5454
*
55-
* @author Martin Odersky
55+
* The following one way conversion is provided via `asScala`:
56+
*
57+
* - `java.util.Properties` => `scala.collection.mutable.Map`
58+
*
5659
* @since 2.8.1
5760
*/
5861
object JavaConverters extends DecorateAsJava with DecorateAsScala

src/library/scala/collection/convert/DecorateAsJava.scala

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import WrapAsJava._
1616
import scala.language.implicitConversions
1717

1818

19-
/** A collection of decorators that allow to convert between
19+
/** A collection of decorators that allow converting between
2020
* Scala and Java collections using `asScala` and `asJava` methods.
2121
*
2222
* The following conversions are supported via `asJava`, `asScala`
@@ -38,8 +38,8 @@ import scala.language.implicitConversions
3838
* val sl2 : scala.collection.mutable.Buffer[Int] = jl.asScala
3939
* assert(sl eq sl2)
4040
* }}}
41-
* The following conversions also are supported, but the
42-
* direction Scala to Java is done my a more specifically named method:
41+
* The following conversions are also supported, but the
42+
* direction from Scala to Java is done by the more specifically named methods:
4343
* `asJavaCollection`, `asJavaEnumeration`, `asJavaDictionary`.
4444
*
4545
* - `scala.collection.Iterable` <=> `java.util.Collection`
@@ -53,10 +53,12 @@ import scala.language.implicitConversions
5353
* - `scala.collection.Set` => `java.util.Set`
5454
* - `scala.collection.Map` => `java.util.Map`
5555
*
56-
* @author Martin Odersky
56+
* The following one way conversion is provided via `asScala`:
57+
*
58+
* - `java.util.Properties` => `scala.collection.mutable.Map`
59+
*
5760
* @since 2.8.1
5861
*/
59-
6062
trait DecorateAsJava {
6163
/**
6264
* Adds an `asJava` method that implicitly converts a Scala `Iterator` to a

0 commit comments

Comments
 (0)