summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-05-06 22:30:34 +0000
committerPaul Phillips <paulp@improving.org>2009-05-06 22:30:34 +0000
commit5103735f4b13899421a37091b4e47fd69493e697 (patch)
treea90fd9f07495a03a829e6c742a1d657e229f6e62 /src
parent1b2c72aeed98aed042f3f87354a56a612c5f7981 (diff)
downloadscala-5103735f4b13899421a37091b4e47fd69493e697.tar.gz
scala-5103735f4b13899421a37091b4e47fd69493e697.tar.bz2
scala-5103735f4b13899421a37091b4e47fd69493e697.zip
Removed java 1.4 charset workaround and a stray...
Removed java 1.4 charset workaround and a stray 1.4 mention.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/compat/Platform.scala7
1 files changed, 1 insertions, 6 deletions
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
}