diff options
| -rw-r--r-- | docs/README | 4 | ||||
| -rw-r--r-- | src/library/scala/compat/Platform.scala | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/docs/README b/docs/README index f63f2e2fa9..26ec7b6204 100644 --- a/docs/README +++ b/docs/README @@ -2,11 +2,11 @@ Scala Software Distributions ---------------------------- -- scala-<major>.<minor>.<patch>.tar.bz2 Unis distribution +- scala-<major>.<minor>.<patch>.tar.bz2 Unix distribution - scala-<major>.<minor>.<patch>.tar.gz Unix distribution - scala-<major>.<minor>.<patch>.zip Windows distribution -The standard distributions require Java 1.4.x or above. If you don't +The standard distributions require Java 1.5 or above. If you don't know which version of Java you have, run the command "java -version". diff --git a/src/library/scala/compat/Platform.scala b/src/library/scala/compat/Platform.scala index b638e2b4db..8c1d84771a 100644 --- a/src/library/scala/compat/Platform.scala +++ b/src/library/scala/compat/Platform.scala @@ -11,7 +11,6 @@ package scala.compat - import java.lang.System import Predef._ @@ -52,9 +51,5 @@ object Platform { def collectGarbage: Unit = System.gc() /** The name of the default character set encoding as a string */ - def defaultCharsetName: String = { - import java.io._ - new OutputStreamWriter(new ByteArrayOutputStream).getEncoding() - } - + def defaultCharsetName: String = java.nio.charset.Charset.defaultCharset.name } |