diff options
author | michelou <michelou@epfl.ch> | 2007-02-07 14:37:44 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2007-02-07 14:37:44 +0000 |
commit | 9be1288dec994c96ab4619b7e3ffb096664ba01a (patch) | |
tree | 151e74cd5334f3ce38c758502032e6e2112705d1 /src/compiler/scala/tools/nsc | |
parent | 60b6ba084f25042e6e92e6506eaf28aa598dc097 (diff) | |
download | scala-9be1288dec994c96ab4619b7e3ffb096664ba01a.tar.gz scala-9be1288dec994c96ab4619b7e3ffb096664ba01a.tar.bz2 scala-9be1288dec994c96ab4619b7e3ffb096664ba01a.zip |
moved encoding value to object Properties
Diffstat (limited to 'src/compiler/scala/tools/nsc')
-rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 7 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/Properties.scala | 5 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/DocGenerator.scala | 4 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/DocUtil.scala | 10 |
4 files changed, 16 insertions, 10 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index ce01994aab..108d68d9b7 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2006 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Martin Odersky */ // $Id$ @@ -11,9 +11,8 @@ import java.io.{IOException, FileNotFoundException} import java.nio.charset._ import compat.Platform.currentTime import scala.tools.nsc.io.{SourceReader, AbstractFile} -import scala.tools.nsc.util.ClassPath -import scala.tools.nsc.util.{Position, SourceFile} import scala.tools.nsc.reporters._ +import scala.tools.nsc.util.{ClassPath, Position, SourceFile} import scala.collection.mutable.{HashSet, HashMap, ListBuffer} @@ -151,7 +150,7 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable private val reader: SourceReader = { def stdCharset: Charset = { - settings.encoding.value = "ISO-8859-1"; // A mandatory charset + settings.encoding.value = Properties.encodingString // A mandatory charset Charset.forName(settings.encoding.value) } val charset = diff --git a/src/compiler/scala/tools/nsc/Properties.scala b/src/compiler/scala/tools/nsc/Properties.scala index 9d7fb0fa33..277cc0a36c 100644 --- a/src/compiler/scala/tools/nsc/Properties.scala +++ b/src/compiler/scala/tools/nsc/Properties.scala @@ -37,6 +37,11 @@ object Properties { props.getProperty("copyright.string", defaultString) } + val encodingString: String = { + val defaultString = "ISO-8859-1" + props.getProperty("file.encoding", defaultString) + } + val scalaHome: String = System.getProperty("scala.home") diff --git a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala index 2c10dcf0cf..eb57ee720d 100644 --- a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala +++ b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala @@ -834,7 +834,7 @@ abstract class DocGenerator extends Models { <select id="kinds" onchange="gotoKind()"> <option value="#Classes" selected="selected">Classes</option> <option value="#Objects">Objects</option> - <option value="#Traits">Traits</option> + <!--<option value="#Traits">Traits</option>--> </select> <span id="alphabet" style="font-family:Courier;word-spacing:-8px;"> <a href={Unparsed("javascript:gotoName('A')")}>A</a> @@ -844,7 +844,7 @@ abstract class DocGenerator extends Models { <a href={Unparsed("javascript:gotoName('E')")}>E</a> <a href={Unparsed("javascript:gotoName('G')")}>G</a> <a href={Unparsed("javascript:gotoName('I')")}>I</a> - <a href={Unparsed("javascript:gotoName('K')")}>K</a> + <a href={Unparsed("javascript:gotoName('L')")}>L</a> <a href={Unparsed("javascript:gotoName('M')")}>M</a> <a href={Unparsed("javascript:gotoName('P')")}>P</a> <a href={Unparsed("javascript:gotoName('R')")}>R</a> diff --git a/src/compiler/scala/tools/nsc/doc/DocUtil.scala b/src/compiler/scala/tools/nsc/doc/DocUtil.scala index 3ca2a36689..95f05605eb 100644 --- a/src/compiler/scala/tools/nsc/doc/DocUtil.scala +++ b/src/compiler/scala/tools/nsc/doc/DocUtil.scala @@ -48,11 +48,13 @@ object DocUtil { <a href={href}>{t0}</a>; } - val encoding = "iso-8859-1" + val encoding = Properties.encodingString val header = - <meta http-equiv="content-type" content={"text/html; charset=" + encoding}/> - <meta name="generator" content={ "scaladoc (" + Properties.versionString +")" }/> - <link rel="stylesheet" type="text/css" href={ relative + "style.css" }/> + <meta http-equiv="content-type" + content={"text/html; charset=" + encoding}/> + <meta name="generator" + content={"scaladoc (" + Properties.versionString +")"}/> + <link rel="stylesheet" type="text/css" href={ relative + "style.css"}/> <script type="text/javascript" src={relative + "script.js"}></script>; def body0(hasBody: Boolean, nodes: NodeSeq): NodeSeq = |