summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/compiler/scala/tools/nsc/doc/ModelAdditions.scala4
-rw-r--r--src/compiler/scala/tools/nsc/doc/script.js18
2 files changed, 11 insertions, 11 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/ModelAdditions.scala b/src/compiler/scala/tools/nsc/doc/ModelAdditions.scala
index 9c77dd2a7b..7a684e3a51 100644
--- a/src/compiler/scala/tools/nsc/doc/ModelAdditions.scala
+++ b/src/compiler/scala/tools/nsc/doc/ModelAdditions.scala
@@ -177,7 +177,7 @@ class ModelAdditions(val global : Global) {
addition(UnitClass);
def boxedValDescr(what : String) = {
- val sym = definitions.getClass("scala.runtime.Boxed" + what);
+ val sym = definitions.getClass("java.lang." + what);
addition(sym);
comments(sym) = """
/** <p>
@@ -191,7 +191,7 @@ class ModelAdditions(val global : Global) {
* </p>
*/"""
};
- ("Float" :: "Long" :: "Number" :: "Int" :: Nil).foreach(boxedValDescr);
+ ("Float" :: "Long" :: "Number" :: "Integer" :: Nil).foreach(boxedValDescr);
object exceptions extends collection.jcl.TreeMap[String,(Symbol,String)] {
def f(name : String) = {
diff --git a/src/compiler/scala/tools/nsc/doc/script.js b/src/compiler/scala/tools/nsc/doc/script.js
index 592cf05ac0..3ca65b5d94 100644
--- a/src/compiler/scala/tools/nsc/doc/script.js
+++ b/src/compiler/scala/tools/nsc/doc/script.js
@@ -268,15 +268,15 @@ function init() {
api['scala/Null'] = scala_api_root;
api['scala/Short'] = scala_api_root;
api['scala/Unit'] = scala_api_root;
- api['scala/runtime/BoxedBoolean'] = scala_api_root;
- api['scala/runtime/BoxedByte'] = scala_api_root;
- api['scala/runtime/BoxedChar'] = scala_api_root;
- api['scala/runtime/BoxedDouble'] = scala_api_root;
- api['scala/runtime/BoxedInt'] = scala_api_root;
- api['scala/runtime/BoxedFloat'] = scala_api_root;
- api['scala/runtime/BoxedLong'] = scala_api_root;
- api['scala/runtime/BoxedNumber'] = scala_api_root;
- api['scala/runtime/BoxedShort'] = scala_api_root;
+ api['java/lang/Boolean'] = scala_api_root;
+ api['java/lang/Byte'] = scala_api_root;
+ api['java/lang/Character'] = scala_api_root;
+ api['java/lang/Double'] = scala_api_root;
+ api['java/lang/Integer'] = scala_api_root;
+ api['java/lang/Float'] = scala_api_root;
+ api['java/lang/Long'] = scala_api_root;
+ api['java/lang/Number'] = scala_api_root;
+ api['java/lang/Short'] = scala_api_root;
// initialize Ant classes
api['org/apache/tools/ant/AntClassLoader'] = ant_api_root;