added external links to library source files

3 files changed, 407 insertions, 299 deletions

diff --git a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala
index 59132f77a3..af4a110b02 100644
--- a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala
+++ b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala
@@ -95,7 +95,7 @@ abstract class DocGenerator extends Models {
      */
     def urlFor(tpe: Type, target: String): NodeSeq = try {
       if (tpe.symbol.hasFlag(Flags.JAVA) || (tpe.symbol.sourceFile eq null))
-        <a class={tpe.toString().replace('.', '_')} href=""
+        <a class={tpe.toString().replace('.', '/')} href=""
           target={target}>{tpe.toString()}</a>
       /*
       else if (tpe.symbol.sourceFile eq null)
@@ -456,7 +456,7 @@ abstract class DocGenerator extends Models {
             def aref1(sym: Symbol): NodeSeq = {
               val isJava = sym hasFlag Flags.JAVA
               if (isJava || (sym.sourceFile eq null)) {
-                <a class={sym.owner.fullNameString.replace('.', '_')}
+                <a class={sym.owner.fullNameString.replace('.', '/')}
                   href={"#" + docName(sym)}
                   target={contentFrame}>{sym.nameString}</a>
               }
@@ -687,13 +687,22 @@ abstract class DocGenerator extends Models {
         <tr><td></td></tr>
       </table>;
 
-    private def header0: NodeSeq = <span>
-      <hr/> in {aref(urlFor(clazz.tree.symbol.owner), "_self", clazz.tree.symbol.owner.fullNameString('.'))}
-      <div class="entity">
-        {Text(codeFor(kind))}
-        <span class="entity">{Text(clazz.tree.symbol.nameString)}</span>
-      </div><hr/>
-    </span>;
+    private def header0: NodeSeq = {
+      val sym = clazz.tree.symbol
+      val name = sym.fullNameString.replace("$object", "")
+      <span>
+        <hr/>
+        in {aref(urlFor(sym.owner), "_self", sym.owner.fullNameString('.'))}
+        <div class="entity">
+          {Text(codeFor(kind))}
+          <span class="entity">{Text(sym.nameString)}</span>
+          <a class={name.replace('.', '/')} href="">
+            <img style="border:none;" src={relative +"/source.png"} alt="source" title={name}/>
+          </a>
+        </div>
+        <hr/>
+      </span>;
+    }
   }
 
   private val kinds =
diff --git a/src/compiler/scala/tools/nsc/doc/script.js b/src/compiler/scala/tools/nsc/doc/script.js
index f844e639c8..0f7d60c36e 100644
--- a/src/compiler/scala/tools/nsc/doc/script.js
+++ b/src/compiler/scala/tools/nsc/doc/script.js
@@ -17,316 +17,415 @@ var eclipse_api_root = 'http://help.eclipse.org/help32/topic/org.eclipse.platfor
 
 var fjbg_api_root = 'http://lamp.epfl.ch/~linuxsoft/fjbg/api/';
 
-// hashtable_classes
-var table = new Array()
+var svn_root = 'http://scalasvn.epfl.ch/cgi-bin/viewvc.cgi/scala/branches/2.4.0-RC2';
+var lib_svn_root = svn_root + '/src/library/';
+var comp_svn_root = svn_root + '/src/compiler/';
+var actors_svn_root = svn_root + '/src/actors/';
+
+// hash tables
+var api = new Array()
+var src = new Array()
 
 function init() {
   // initialize Java classes
-  table['java_io_BufferedReader']                   = java_api_root;
-  table['java_io_BufferedWriter']                   = java_api_root;
-  table['java_io_Console']                          = java_api_root; //(1.6)
-  table['java_io_DataInputStream']                  = java_api_root;
-  table['java_io_DataOutputStream']                 = java_api_root;
-  table['java_io_File']                             = java_api_root;
-  table['java_io_FileDescriptor']                   = java_api_root;
-  table['java_io_FileReader']                       = java_api_root;
-  table['java_io_FileWriter']                       = java_api_root;
-  table['java_io_Flushable']                        = java_api_root; //interface (1.5)
-  table['java_io_IOException']                      = java_api_root;
-  table['java_io_InputStream']                      = java_api_root;
-  table['java_io_OutputStream']                     = java_api_root;
-  table['java_io_PrintStream']                      = java_api_root;
-  table['java_io_PrintWriter']                      = java_api_root;
-  table['java_io_Reader']                           = java_api_root;
-  table['java_io_StringReader']                     = java_api_root;
-  table['java_io_StringWriter']                     = java_api_root;
-  table['java_io_Writer']                           = java_api_root;
-  table['java_lang_ArithmeticException']            = java_api_root;
-  table['java_lang_ArrayIndexOutOfBoundsException'] = java_api_root;
-  table['java_lang_Boolean']                        = java_api_root;
-  table['java_lang_Byte']                           = java_api_root;
-  table['java_lang_Character']                      = java_api_root;
-  table['java_lang_Class']                          = java_api_root;
-  table['java_lang_ClassCastException']             = java_api_root;
-  table['java_lang_Clonable']                       = java_api_root; //interface
-  table['java_lang_CloneNotSupportedException']     = java_api_root;
-  table['java_lang_Comparable']                     = java_api_root; //interface
-  table['java_lang_Exception']                      = java_api_root;
-  table['java_lang_Float']                          = java_api_root;
-  table['java_lang_IllegalAccessException']         = java_api_root;
-  table['java_lang_IllegalArgumentException']       = java_api_root;
-  table['java_lang_IndexOutOfBoundsException']      = java_api_root;
-  table['java_lang_InterruptedException']           = java_api_root;
-  table['java_lang_Long']                           = java_api_root;
-  table['java_lang_Math']                           = java_api_root;
-  table['java_lang_NullPointerException']           = java_api_root;
-  table['java_lang_NumberFormatException']          = java_api_root;
-  table['java_lang_Object']                         = java_api_root;
-  table['java_lang_Runnable']                       = java_api_root; //interface
-  table['java_lang_Runtime']                        = java_api_root;
-  table['java_lang_RuntimeException']               = java_api_root;
-  table['java_lang_RuntimePermission']              = java_api_root;
-  table['java_lang_Short']                          = java_api_root;
-  table['java_lang_StrictMath']                     = java_api_root;
-  table['java_lang_String']                         = java_api_root;
-  table['java_lang_System']                         = java_api_root;
-  table['java_lang_Thread']                         = java_api_root;
-  table['java_lang_ThreadGroup']                    = java_api_root;
-  table['java_lang_ThreadLocal']                    = java_api_root;
-  table['java_lang_Throwable']                      = java_api_root;
-  table['java_lang_Void']                           = java_api_root;
-  table['java_math_BigDecimal']                     = java_api_root;
-  table['java_math_BigInteger']                     = java_api_root;
-  table['java_math_MathContext']                    = java_api_root;
-  table['java_net_Authenticator']                   = java_api_root;
-  table['java_net_BindException']                   = java_api_root;
-  table['java_net_HttpURLConnection']               = java_api_root;
-  table['java_net_IDN']                             = java_api_root; //(1.6)
-  table['java_net_Inet4Address']                    = java_api_root;
-  table['java_net_Inet6Address']                    = java_api_root;
-  table['java_net_InetAddress']                     = java_api_root;
-  table['java_net_NetPermission']                   = java_api_root;
-  table['java_net_ProtocolException']               = java_api_root;
-  table['java_net_Proxy']                           = java_api_root;
-  table['java_net_ServerSocket']                    = java_api_root;
-  table['java_net_Socket']                          = java_api_root;
-  table['java_net_SocketException']                 = java_api_root;
-  table['java_net_SocketPermission']                = java_api_root;
-  table['java_net_URI']                             = java_api_root;
-  table['java_net_URL']                             = java_api_root;
-  table['java_net_URLClassLoader']                  = java_api_root;
-  table['java_net_URLConnection']                   = java_api_root;
-  table['java_net_URLDecoder']                      = java_api_root;
-  table['java_net_URLStreamHandler']                = java_api_root;
-  table['java_nio_Buffer']                          = java_api_root;
-  table['java_nio_ByteBuffer']                      = java_api_root;
-  table['java_nio_BufferOverflowException']         = java_api_root;
-  table['java_nio_ByteOrder']                       = java_api_root;
-  table['java_nio_CharBuffer']                      = java_api_root;
-  table['java_nio_DoubleBuffer']                    = java_api_root;
-  table['java_nio_FloatBuffer']                     = java_api_root;
-  table['java_nio_IntBuffer']                       = java_api_root;
-  table['java_nio_LongBuffer']                      = java_api_root;
-  table['java_nio_MappedByteBuffer']                = java_api_root;
-  table['java_nio_ShortBuffer']                     = java_api_root;
-  table['java_nio_channels_Channels']               = java_api_root;
-  table['java_nio_channels_DatagramChannel']        = java_api_root;
-  table['java_nio_channels_FileChannel']            = java_api_root;
-  table['java_nio_channels_FileLock']               = java_api_root;
-  table['java_nio_channels_Pipe']                   = java_api_root;
-  table['java_nio_channels_ReadableByteChannel']    = java_api_root;
-  table['java_nio_channels_Selector']               = java_api_root;
-  table['java_nio_channels_ServerSocketChannel']    = java_api_root;
-  table['java_nio_channels_SocketChannel']          = java_api_root;
-  table['java_nio_charset_CharsetDecoder']          = java_api_root;
-  table['java_rmi_AccessException']                 = java_api_root;
-  table['java_rmi_MarshalledObject']                = java_api_root;
-  table['java_rmi_Naming']                          = java_api_root;
-  table['java_rmi_RMISecurityManager']              = java_api_root;
-  table['java_rmi_Remote']                          = java_api_root; //interface
-  table['java_sql_Array']                           = java_api_root; //interface
-  table['java_sql_Blob']                            = java_api_root; //interface
-  table['java_sql_CallableStatement']               = java_api_root; //interface
-  table['java_sql_Connection']                      = java_api_root; //interface
-  table['java_sql_Date']                            = java_api_root;
-  table['java_sql_DriverManager']                   = java_api_root;
-  table['java_sql_ResultSet']                       = java_api_root; //interface
-  table['java_sql_ResultSetMetaData']               = java_api_root; //interface
-  table['java_sql_SQLPermission']                   = java_api_root;
-  table['java_sql_Time']                            = java_api_root;
-  table['java_sql_Timestamp']                       = java_api_root;
-  table['java_sql_Types']                           = java_api_root;
-  table['java_text_MessageFormat']                  = java_api_root;
-  table['java_text_Annotation']                     = java_api_root;
-  table['java_text_AttributedCharacterIterator']    = java_api_root;
-  table['java_text_AttributedString']               = java_api_root;
-  table['java_text_Bidi']                           = java_api_root;
-  table['java_text_BreakIterator']                  = java_api_root;
-  table['java_text_CharacterIterator']              = java_api_root; //interface
-  table['java_text_ChoiceFormat']                   = java_api_root;
-  table['java_text_CollationKey']                   = java_api_root;
-  table['java_text_Collator']                       = java_api_root;
-  table['java_text_DateFormat']                     = java_api_root;
-  table['java_text_DecimalFormat']                  = java_api_root;
-  table['java_text_FieldPosition']                  = java_api_root;
-  table['java_text_Format']                         = java_api_root;
-  table['java_text_Formatter']                      = java_api_root;
-  table['java_text_MessageFormat']                  = java_api_root;
-  table['java_text_Normalizer']                     = java_api_root;
-  table['java_text_NumberFormat']                   = java_api_root;
-  table['java_text_ParseException']                 = java_api_root;
-  table['java_text_ParsePosition']                  = java_api_root;
-  table['java_text_SimpleDateFormat']               = java_api_root;
-  table['java_text_StringCharacterIterator']        = java_api_root;
-  table['java_util_Arrays']                         = java_api_root;
-  table['java_util_BitSet']                         = java_api_root;
-  table['java_util_Calendar']                       = java_api_root;
-  table['java_util_Collection']                     = java_api_root; //interface
-  table['java_util_Collections']                    = java_api_root;
-  table['java_util_Comparator']                     = java_api_root; //interface
-  table['java_util_Currency']                       = java_api_root;
-  table['java_util_Date']                           = java_api_root;
-  table['java_util_Dictionary']                     = java_api_root;
-  table['java_util_Formatter']                      = java_api_root;
-  table['java_util_HashMap']                        = java_api_root;
-  table['java_util_HashSet']                        = java_api_root;
-  table['java_util_Hashtable']                      = java_api_root;
-  table['java_util_IllegalFormatException']         = java_api_root;
-  table['java_util_LinkedHashMap']                  = java_api_root;
-  table['java_util_LinkedHashSet']                  = java_api_root;
-  table['java_util_LinkedList']                     = java_api_root;
-  table['java_util_List']                           = java_api_root; //interface
-  table['java_util_Map']                            = java_api_root;
-  table['java_util_Observable']                     = java_api_root;
-  table['java_util_PriorityQueue']                  = java_api_root;
-  table['java_util_Properties']                     = java_api_root;
-  table['java_util_Random']                         = java_api_root;
-  table['java_util_ResourceBundle']                 = java_api_root;
-  table['java_util_Scanner']                        = java_api_root; //(1.5)
-  table['java_util_Set']                            = java_api_root;
-  table['java_util_Stack']                          = java_api_root;
-  table['java_util_StringTokenizer']                = java_api_root;
-  table['java_util_Timer']                          = java_api_root;
-  table['java_util_TimerTask']                      = java_api_root;
-  table['java_util_TimeZone']                       = java_api_root;
-  table['java_util_TreeMap']                        = java_api_root;
-  table['java_util_TreeSet']                        = java_api_root;
-  table['java_util_UUID']                           = java_api_root;
-  table['java_util_Vector']                         = java_api_root;
-  table['java_util_WeakHashMap']                    = java_api_root;
+  api['java/io/BufferedReader']                   = java_api_root;
+  api['java/io/BufferedWriter']                   = java_api_root;
+  api['java/io/Console']                          = java_api_root; //(1.6)
+  api['java/io/DataInputStream']                  = java_api_root;
+  api['java/io/DataOutputStream']                 = java_api_root;
+  api['java/io/File']                             = java_api_root;
+  api['java/io/FileDescriptor']                   = java_api_root;
+  api['java/io/FileReader']                       = java_api_root;
+  api['java/io/FileWriter']                       = java_api_root;
+  api['java/io/Flushable']                        = java_api_root; //interface (1.5)
+  api['java/io/IOException']                      = java_api_root;
+  api['java/io/InputStream']                      = java_api_root;
+  api['java/io/OutputStream']                     = java_api_root;
+  api['java/io/PrintStream']                      = java_api_root;
+  api['java/io/PrintWriter']                      = java_api_root;
+  api['java/io/Reader']                           = java_api_root;
+  api['java/io/StringReader']                     = java_api_root;
+  api['java/io/StringWriter']                     = java_api_root;
+  api['java/io/Writer']                           = java_api_root;
+  api['java/lang/ArithmeticException']            = java_api_root;
+  api['java/lang/ArrayIndexOutOfBoundsException'] = java_api_root;
+  api['java/lang/Boolean']                        = java_api_root;
+  api['java/lang/Byte']                           = java_api_root;
+  api['java/lang/Character']                      = java_api_root;
+  api['java/lang/Class']                          = java_api_root;
+  api['java/lang/ClassCastException']             = java_api_root;
+  api['java/lang/Clonable']                       = java_api_root; //interface
+  api['java/lang/CloneNotSupportedException']     = java_api_root;
+  api['java/lang/Comparable']                     = java_api_root; //interface
+  api['java/lang/Exception']                      = java_api_root;
+  api['java/lang/Float']                          = java_api_root;
+  api['java/lang/IllegalAccessException']         = java_api_root;
+  api['java/lang/IllegalArgumentException']       = java_api_root;
+  api['java/lang/IndexOutOfBoundsException']      = java_api_root;
+  api['java/lang/InterruptedException']           = java_api_root;
+  api['java/lang/Long']                           = java_api_root;
+  api['java/lang/Math']                           = java_api_root;
+  api['java/lang/NullPointerException']           = java_api_root;
+  api['java/lang/NumberFormatException']          = java_api_root;
+  api['java/lang/Object']                         = java_api_root;
+  api['java/lang/Runnable']                       = java_api_root; //interface
+  api['java/lang/Runtime']                        = java_api_root;
+  api['java/lang/RuntimeException']               = java_api_root;
+  api['java/lang/RuntimePermission']              = java_api_root;
+  api['java/lang/Short']                          = java_api_root;
+  api['java/lang/StrictMath']                     = java_api_root;
+  api['java/lang/String']                         = java_api_root;
+  api['java/lang/System']                         = java_api_root;
+  api['java/lang/Thread']                         = java_api_root;
+  api['java/lang/ThreadGroup']                    = java_api_root;
+  api['java/lang/ThreadLocal']                    = java_api_root;
+  api['java/lang/Throwable']                      = java_api_root;
+  api['java/lang/Void']                           = java_api_root;
+  api['java/math/BigDecimal']                     = java_api_root;
+  api['java/math/BigInteger']                     = java_api_root;
+  api['java/math/MathContext']                    = java_api_root;
+  api['java/net/Authenticator']                   = java_api_root;
+  api['java/net/BindException']                   = java_api_root;
+  api['java/net/HttpURLConnection']               = java_api_root;
+  api['java/net/IDN']                             = java_api_root; //(1.6)
+  api['java/net/Inet4Address']                    = java_api_root;
+  api['java/net/Inet6Address']                    = java_api_root;
+  api['java/net/InetAddress']                     = java_api_root;
+  api['java/net/NetPermission']                   = java_api_root;
+  api['java/net/ProtocolException']               = java_api_root;
+  api['java/net/Proxy']                           = java_api_root;
+  api['java/net/ServerSocket']                    = java_api_root;
+  api['java/net/Socket']                          = java_api_root;
+  api['java/net/SocketException']                 = java_api_root;
+  api['java/net/SocketPermission']                = java_api_root;
+  api['java/net/URI']                             = java_api_root;
+  api['java/net/URL']                             = java_api_root;
+  api['java/net/URLClassLoader']                  = java_api_root;
+  api['java/net/URLConnection']                   = java_api_root;
+  api['java/net/URLDecoder']                      = java_api_root;
+  api['java/net/URLStreamHandler']                = java_api_root;
+  api['java/nio/Buffer']                          = java_api_root;
+  api['java/nio/ByteBuffer']                      = java_api_root;
+  api['java/nio/BufferOverflowException']         = java_api_root;
+  api['java/nio/ByteOrder']                       = java_api_root;
+  api['java/nio/CharBuffer']                      = java_api_root;
+  api['java/nio/DoubleBuffer']                    = java_api_root;
+  api['java/nio/FloatBuffer']                     = java_api_root;
+  api['java/nio/IntBuffer']                       = java_api_root;
+  api['java/nio/LongBuffer']                      = java_api_root;
+  api['java/nio/MappedByteBuffer']                = java_api_root;
+  api['java/nio/ShortBuffer']                     = java_api_root;
+  api['java/nio/channels/Channels']               = java_api_root;
+  api['java/nio/channels/DatagramChannel']        = java_api_root;
+  api['java/nio/channels/FileChannel']            = java_api_root;
+  api['java/nio/channels/FileLock']               = java_api_root;
+  api['java/nio/channels/Pipe']                   = java_api_root;
+  api['java/nio/channels/ReadableByteChannel']    = java_api_root;
+  api['java/nio/channels/Selector']               = java_api_root;
+  api['java/nio/channels/ServerSocketChannel']    = java_api_root;
+  api['java/nio/channels/SocketChannel']          = java_api_root;
+  api['java/nio/charset/CharsetDecoder']          = java_api_root;
+  api['java/rmi/AccessException']                 = java_api_root;
+  api['java/rmi/MarshalledObject']                = java_api_root;
+  api['java/rmi/Naming']                          = java_api_root;
+  api['java/rmi/RMISecurityManager']              = java_api_root;
+  api['java/rmi/Remote']                          = java_api_root; //interface
+  api['java/sql/Array']                           = java_api_root; //interface
+  api['java/sql/Blob']                            = java_api_root; //interface
+  api['java/sql/CallableStatement']               = java_api_root; //interface
+  api['java/sql/Connection']                      = java_api_root; //interface
+  api['java/sql/Date']                            = java_api_root;
+  api['java/sql/DriverManager']                   = java_api_root;
+  api['java/sql/ResultSet']                       = java_api_root; //interface
+  api['java/sql/ResultSetMetaData']               = java_api_root; //interface
+  api['java/sql/SQLPermission']                   = java_api_root;
+  api['java/sql/Time']                            = java_api_root;
+  api['java/sql/Timestamp']                       = java_api_root;
+  api['java/sql/Types']                           = java_api_root;
+  api['java/text/MessageFormat']                  = java_api_root;
+  api['java/text/Annotation']                     = java_api_root;
+  api['java/text/AttributedCharacterIterator']    = java_api_root;
+  api['java/text/AttributedString']               = java_api_root;
+  api['java/text/Bidi']                           = java_api_root;
+  api['java/text/BreakIterator']                  = java_api_root;
+  api['java/text/CharacterIterator']              = java_api_root; //interface
+  api['java/text/ChoiceFormat']                   = java_api_root;
+  api['java/text/CollationKey']                   = java_api_root;
+  api['java/text/Collator']                       = java_api_root;
+  api['java/text/DateFormat']                     = java_api_root;
+  api['java/text/DecimalFormat']                  = java_api_root;
+  api['java/text/FieldPosition']                  = java_api_root;
+  api['java/text/Format']                         = java_api_root;
+  api['java/text/Formatter']                      = java_api_root;
+  api['java/text/MessageFormat']                  = java_api_root;
+  api['java/text/Normalizer']                     = java_api_root;
+  api['java/text/NumberFormat']                   = java_api_root;
+  api['java/text/ParseException']                 = java_api_root;
+  api['java/text/ParsePosition']                  = java_api_root;
+  api['java/text/SimpleDateFormat']               = java_api_root;
+  api['java/text/StringCharacterIterator']        = java_api_root;
+  api['java/util/Arrays']                         = java_api_root;
+  api['java/util/BitSet']                         = java_api_root;
+  api['java/util/Calendar']                       = java_api_root;
+  api['java/util/Collection']                     = java_api_root; //interface
+  api['java/util/Collections']                    = java_api_root;
+  api['java/util/Comparator']                     = java_api_root; //interface
+  api['java/util/Currency']                       = java_api_root;
+  api['java/util/Date']                           = java_api_root;
+  api['java/util/Dictionary']                     = java_api_root;
+  api['java/util/Formatter']                      = java_api_root;
+  api['java/util/HashMap']                        = java_api_root;
+  api['java/util/HashSet']                        = java_api_root;
+  api['java/util/Hashapi']                      = java_api_root;
+  api['java/util/IllegalFormatException']         = java_api_root;
+  api['java/util/LinkedHashMap']                  = java_api_root;
+  api['java/util/LinkedHashSet']                  = java_api_root;
+  api['java/util/LinkedList']                     = java_api_root;
+  api['java/util/List']                           = java_api_root; //interface
+  api['java/util/Map']                            = java_api_root;
+  api['java/util/Observable']                     = java_api_root;
+  api['java/util/PriorityQueue']                  = java_api_root;
+  api['java/util/Properties']                     = java_api_root;
+  api['java/util/Random']                         = java_api_root;
+  api['java/util/ResourceBundle']                 = java_api_root;
+  api['java/util/Scanner']                        = java_api_root; //(1.5)
+  api['java/util/Set']                            = java_api_root;
+  api['java/util/Stack']                          = java_api_root;
+  api['java/util/StringTokenizer']                = java_api_root;
+  api['java/util/Timer']                          = java_api_root;
+  api['java/util/TimerTask']                      = java_api_root;
+  api['java/util/TimeZone']                       = java_api_root;
+  api['java/util/TreeMap']                        = java_api_root;
+  api['java/util/TreeSet']                        = java_api_root;
+  api['java/util/UUID']                           = java_api_root;
+  api['java/util/Vector']                         = java_api_root;
+  api['java/util/WeakHashMap']                    = java_api_root;
 
   // initialize Scala primitive classes
-  table['scala_Any']                             = scala_api_root;
-  table['scala_AnyRef']                          = scala_api_root;
-  table['scala_AnyVal']                          = scala_api_root;
-  table['scala_Boolean']                         = scala_api_root;
-  table['scala_Byte']                            = scala_api_root;
-  table['scala_Char']                            = scala_api_root;
-  table['scala_Double']                          = scala_api_root;
-  table['scala_Float']                           = scala_api_root;
-  table['scala_Int']                             = scala_api_root;
-  table['scala_Null']                            = scala_api_root;
-  table['scala_Long']                            = scala_api_root;
-  table['scala_Nothing']                         = scala_api_root;
-  table['scala_Null']                            = scala_api_root;
-  table['scala_Short']                           = scala_api_root;
-  table['scala_Unit']                            = scala_api_root;
-  table['scala_runtime_BoxedBoolean']            = scala_api_root;
-  table['scala_runtime_BoxedByte']               = scala_api_root;
-  table['scala_runtime_BoxedChar']               = scala_api_root;
-  table['scala_runtime_BoxedDouble']             = scala_api_root;
-  table['scala_runtime_BoxedInt']                = scala_api_root;
-  table['scala_runtime_BoxedFloat']              = scala_api_root;
-  table['scala_runtime_BoxedLong']               = scala_api_root;
-  table['scala_runtime_BoxedNumber']             = scala_api_root;
-  table['scala_runtime_BoxedShort']              = scala_api_root;
+  api['scala/Any']                             = scala_api_root;
+  api['scala/AnyRef']                          = scala_api_root;
+  api['scala/AnyVal']                          = scala_api_root;
+  api['scala/Boolean']                         = scala_api_root;
+  api['scala/Byte']                            = scala_api_root;
+  api['scala/Char']                            = scala_api_root;
+  api['scala/Double']                          = scala_api_root;
+  api['scala/Float']                           = scala_api_root;
+  api['scala/Int']                             = scala_api_root;
+  api['scala/Null']                            = scala_api_root;
+  api['scala/Long']                            = scala_api_root;
+  api['scala/Nothing']                         = scala_api_root;
+  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;
 
   // initialize Ant classes
-  table['org_apache_tools_ant_AntClassLoader']            = ant_api_root;
-  table['org_apache_tools_ant_AntTypeDefinition']         = ant_api_root;
-  table['org_apache_tools_ant_BuildEvent']                = ant_api_root;
-  table['org_apache_tools_ant_ComponentHelper']           = ant_api_root;
-  table['org_apache_tools_ant_DefaultLogger']             = ant_api_root;
-  table['org_apache_tools_ant_DemuxInputStream']          = ant_api_root;
-  table['org_apache_tools_ant_DemuxOutputStream']         = ant_api_root;
-  table['org_apache_tools_ant_Diagnostics']               = ant_api_root;
-  table['org_apache_tools_ant_DirectoryScanner']          = ant_api_root;
-  table['org_apache_tools_ant_Project']                   = ant_api_root;
-  table['org_apache_tools_ant_Target']                    = ant_api_root;
-  table['org_apache_tools_ant_Task']                      = ant_api_root;
-  table['org_apache_tools_ant_taskdefs_Ant']              = ant_api_root;
-  table['org_apache_tools_ant_taskdefs_Available']        = ant_api_root;
-  table['org_apache_tools_ant_taskdefs_MatchingTask']     = ant_api_root;
-  table['org_apache_tools_ant_types_FileSet']             = ant_api_root;
-  table['org_apache_tools_ant_types_FilterChain']         = ant_api_root;
-  table['org_apache_tools_ant_types_FilterSet']           = ant_api_root;
-  table['org_apache_tools_ant_types_Path']                = ant_api_root;
-  table['org_apache_tools_ant_types_Reference']           = ant_api_root;
-  table['org_apache_tools_ant_types_Resource']            = ant_api_root;
-  table['org_apache_tools_ant_util_FileUtils']            = ant_api_root;
-  table['org_apache_tools_mail_MailMessage']              = ant_api_root;
-  table['org_apache_tools_zip_ZipFile']                   = ant_api_root;
+  api['org/apache/tools/ant/AntClassLoader']            = ant_api_root;
+  api['org/apache/tools/ant/AntTypeDefinition']         = ant_api_root;
+  api['org/apache/tools/ant/BuildEvent']                = ant_api_root;
+  api['org/apache/tools/ant/ComponentHelper']           = ant_api_root;
+  api['org/apache/tools/ant/DefaultLogger']             = ant_api_root;
+  api['org/apache/tools/ant/DemuxInputStream']          = ant_api_root;
+  api['org/apache/tools/ant/DemuxOutputStream']         = ant_api_root;
+  api['org/apache/tools/ant/Diagnostics']               = ant_api_root;
+  api['org/apache/tools/ant/DirectoryScanner']          = ant_api_root;
+  api['org/apache/tools/ant/Project']                   = ant_api_root;
+  api['org/apache/tools/ant/Target']                    = ant_api_root;
+  api['org/apache/tools/ant/Task']                      = ant_api_root;
+  api['org/apache/tools/ant/taskdefs/Ant']              = ant_api_root;
+  api['org/apache/tools/ant/taskdefs/Available']        = ant_api_root;
+  api['org/apache/tools/ant/taskdefs/MatchingTask']     = ant_api_root;
+  api['org/apache/tools/ant/types/FileSet']             = ant_api_root;
+  api['org/apache/tools/ant/types/FilterChain']         = ant_api_root;
+  api['org/apache/tools/ant/types/FilterSet']           = ant_api_root;
+  api['org/apache/tools/ant/types/Path']                = ant_api_root;
+  api['org/apache/tools/ant/types/Reference']           = ant_api_root;
+  api['org/apache/tools/ant/types/Resource']            = ant_api_root;
+  api['org/apache/tools/ant/util/FileUtils']            = ant_api_root;
+  api['org/apache/tools/mail/MailMessage']              = ant_api_root;
+  api['org/apache/tools/zip/ZipFile']                   = ant_api_root;
 
   // initialize Eclipse classes
-  table['org_eclipse_ant_core_Property']                  = eclipse_api_root;
-  table['org_eclipse_ant_core_Task']                      = eclipse_api_root;
-  table['org_eclipse_ant_core_Type']                      = eclipse_api_root;
-  table['org_eclipse_core_runtime_Assert']                = eclipse_api_root;
-  table['org_eclipse_core_runtime_AssertFailedException'] = eclipse_api_root;
-  table['org_eclipse_core_runtime_CoreException']         = eclipse_api_root;
-  table['org_eclipse_core_runtime_Path']                  = eclipse_api_root;
-  table['org_eclipse_core_runtime_Platform']              = eclipse_api_root;
-  table['org_eclipse_core_runtime_Plugin']                = eclipse_api_root;
-  table['org_eclipse_core_runtime_Preferences']           = eclipse_api_root;
-  table['org_eclipse_core_runtime_RegistryFactory']       = eclipse_api_root;
-  table['org_eclipse_core_runtime_Status']                = eclipse_api_root;
-  table['org_eclipse_debug_core_ILaunch']                 = eclipse_api_root;
-  table['org_eclipse_debug_core_ILaunchConfiguration']    = eclipse_api_root;
-  table['org_eclipse_debug_core_ILaunchManager']          = eclipse_api_root;
-  table['org_eclipse_debug_core_ILaunchMode']             = eclipse_api_root;
-  table['org_eclipse_debug_core_IProcessFactory']         = eclipse_api_root;
-  table['org_eclipse_jdt_core_IAccessRule']               = eclipse_api_root;
-  table['org_eclipse_jdt_core_IBuffer']                   = eclipse_api_root;
-  table['org_eclipse_jdt_core_IClassFile']                = eclipse_api_root;
-  table['org_eclipse_jdt_core_IClasspathEntry']           = eclipse_api_root;
-  table['org_eclipse_jdt_core_ICodeAssist']               = eclipse_api_root;
-  table['org_eclipse_jdt_core_ICodeFormatter']            = eclipse_api_root;
-  table['org_eclipse_jdt_core_ICompilationUnit']          = eclipse_api_root;
-  table['org_eclipse_jdt_core_IField']                    = eclipse_api_root;
-  table['org_eclipse_jdt_core_IImportContainer']          = eclipse_api_root;
-  table['org_eclipse_jdt_core_IInitializer']              = eclipse_api_root;
-  table['org_eclipse_jdt_core_IJavaElement']              = eclipse_api_root;
-  table['org_eclipse_jdt_core_IMember']                   = eclipse_api_root;
-  table['org_eclipse_jdt_core_IMethod']                   = eclipse_api_root;
-  table['org_eclipse_jdt_core_IOpenable']                 = eclipse_api_root;
-  table['org_eclipse_jdt_core_IParent']                   = eclipse_api_root;
-  table['org_eclipse_jdt_core_ISourceRange']              = eclipse_api_root;
-  table['org_eclipse_jdt_core_IType']                     = eclipse_api_root;
-  table['org_eclipse_jdt_core_IWorkingCopy']              = eclipse_api_root;
-  table['org_eclipse_jdt_launching_JavaRuntime']          = eclipse_api_root;
-  table['org_eclipse_jdt_launching_LibraryLocation']      = eclipse_api_root;
-  table['org_eclipse_jdt_launching_PropertyChangeEvent']  = eclipse_api_root;
-  table['org_eclipse_jdt_launching_SocketUtil']           = eclipse_api_root;
-  table['org_eclipse_jdt_launching_VMStandin']            = eclipse_api_root;
+  api['org/eclipse/ant/core/Property']                  = eclipse_api_root;
+  api['org/eclipse/ant/core/Task']                      = eclipse_api_root;
+  api['org/eclipse/ant/core/Type']                      = eclipse_api_root;
+  api['org/eclipse/core/runtime/Assert']                = eclipse_api_root;
+  api['org/eclipse/core/runtime/AssertFailedException'] = eclipse_api_root;
+  api['org/eclipse/core/runtime/CoreException']         = eclipse_api_root;
+  api['org/eclipse/core/runtime/Path']                  = eclipse_api_root;
+  api['org/eclipse/core/runtime/Platform']              = eclipse_api_root;
+  api['org/eclipse/core/runtime/Plugin']                = eclipse_api_root;
+  api['org/eclipse/core/runtime/Preferences']           = eclipse_api_root;
+  api['org/eclipse/core/runtime/RegistryFactory']       = eclipse_api_root;
+  api['org/eclipse/core/runtime/Status']                = eclipse_api_root;
+  api['org/eclipse/debug/core/ILaunch']                 = eclipse_api_root;
+  api['org/eclipse/debug/core/ILaunchConfiguration']    = eclipse_api_root;
+  api['org/eclipse/debug/core/ILaunchManager']          = eclipse_api_root;
+  api['org/eclipse/debug/core/ILaunchMode']             = eclipse_api_root;
+  api['org/eclipse/debug/core/IProcessFactory']         = eclipse_api_root;
+  api['org/eclipse/jdt/core/IAccessRule']               = eclipse_api_root;
+  api['org/eclipse/jdt/core/IBuffer']                   = eclipse_api_root;
+  api['org/eclipse/jdt/core/IClassFile']                = eclipse_api_root;
+  api['org/eclipse/jdt/core/IClasspathEntry']           = eclipse_api_root;
+  api['org/eclipse/jdt/core/ICodeAssist']               = eclipse_api_root;
+  api['org/eclipse/jdt/core/ICodeFormatter']            = eclipse_api_root;
+  api['org/eclipse/jdt/core/ICompilationUnit']          = eclipse_api_root;
+  api['org/eclipse/jdt/core/IField']                    = eclipse_api_root;
+  api['org/eclipse/jdt/core/IImportContainer']          = eclipse_api_root;
+  api['org/eclipse/jdt/core/IInitializer']              = eclipse_api_root;
+  api['org/eclipse/jdt/core/IJavaElement']              = eclipse_api_root;
+  api['org/eclipse/jdt/core/IMember']                   = eclipse_api_root;
+  api['org/eclipse/jdt/core/IMethod']                   = eclipse_api_root;
+  api['org/eclipse/jdt/core/IOpenable']                 = eclipse_api_root;
+  api['org/eclipse/jdt/core/IParent']                   = eclipse_api_root;
+  api['org/eclipse/jdt/core/ISourceRange']              = eclipse_api_root;
+  api['org/eclipse/jdt/core/IType']                     = eclipse_api_root;
+  api['org/eclipse/jdt/core/IWorkingCopy']              = eclipse_api_root;
+  api['org/eclipse/jdt/launching/JavaRuntime']          = eclipse_api_root;
+  api['org/eclipse/jdt/launching/LibraryLocation']      = eclipse_api_root;
+  api['org/eclipse/jdt/launching/PropertyChangeEvent']  = eclipse_api_root;
+  api['org/eclipse/jdt/launching/SocketUtil']           = eclipse_api_root;
+  api['org/eclipse/jdt/launching/VMStandin']            = eclipse_api_root;
 
   // initialize FJBG classes
-  table['ch_epfl_lamp_fjbg_FJBGContext']                  = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JAccessFlags']                 = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JArrayType']                   = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JAttribute']                   = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JAttributeFactory']            = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JClass']                       = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JCode']                        = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JCodeAttribute']               = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JConstantPool']                = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JExtendedCode']                = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JField']                       = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JFieldOrMethod']               = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JInnerClassesAttribute']       = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JLabel']                       = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JLineNumberTableAttribute']    = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JLocalVariable']               = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JMember']                      = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JMethod']                      = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JMethodType']                  = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JObjectType']                  = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JOpcode']                      = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JOtherAttribute']              = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JReferenceType']               = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JSourceFileAttribute']         = fjbg_api_root;
-  table['ch_epfl_lamp_fjbg_JType']                        = fjbg_api_root;
-  table['ch_epfl_lamp_util_ByteArray']                    = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/FJBGContext']                  = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JAccessFlags']                 = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JArrayType']                   = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JAttribute']                   = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JAttributeFactory']            = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JClass']                       = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JCode']                        = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JCodeAttribute']               = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JConstantPool']                = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JExtendedCode']                = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JField']                       = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JFieldOrMethod']               = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JInnerClassesAttribute']       = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JLabel']                       = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JLineNumberapiAttribute']      = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JLocalVariable']               = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JMember']                      = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JMethod']                      = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JMethodType']                  = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JObjectType']                  = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JOpcode']                      = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JOtherAttribute']              = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JReferenceType']               = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JSourceFileAttribute']         = fjbg_api_root;
+  api['ch/epfl/lamp/fjbg/JType']                        = fjbg_api_root;
+  api['ch/epfl/lamp/util/ByteArray']                    = fjbg_api_root;
+
+  // scala-library-src.jar
+  src['scala/Annotation']                               = lib_svn_root;
+  src['scala/Application']                              = lib_svn_root;
+  src['scala/Array']                                    = lib_svn_root;
+  src['scala/Attribute']                                = lib_svn_root;
+  src['scala/BigInt']                                   = lib_svn_root;
+  src['scala/BufferedIterator']                         = lib_svn_root;
+  src['scala/Cell']                                     = lib_svn_root;
+  src['scala/Console']                                  = lib_svn_root; // object
+  src['scala/Enumeration']                              = lib_svn_root;
+  src['scala/List']                                     = lib_svn_root;
+  src['scala/MatchError']                               = lib_svn_root;
+  src['scala/Math']                                     = lib_svn_root; // object
+  src['scala/Nil']                                      = lib_svn_root; // object
+  src['scala/None']                                     = lib_svn_root; // object
+  src['scala/Option']                                   = lib_svn_root;
+  src['scala/Predef']                                   = lib_svn_root; // object
+  src['scala/Seq']                                      = lib_svn_root;
+  src['scala/Some']                                     = lib_svn_root;
+  src['scala/Stream']                                   = lib_svn_root;
+  src['scala/Symbol']                                   = lib_svn_root;
+  src['scala/cloneable']                                = lib_svn_root;
+  src['scala/deprecated']                               = lib_svn_root;
+  src['scala/remote']                                   = lib_svn_root;
+  src['scala/serializable']                             = lib_svn_root;
+  src['scala/throws']                                   = lib_svn_root;
+  src['scala/transient']                                = lib_svn_root;
+  src['scala/unchecked']                                = lib_svn_root;
+  src['scala/unsealed']                                 = lib_svn_root;
+  src['scala/volatile']                                 = lib_svn_root;
+
+  src['scala/collection/BitSet']                        = lib_svn_root;
+  src['scala/collection/Map']                           = lib_svn_root;
+  src['scala/collection/MapProxy']                      = lib_svn_root;
+  src['scala/collection/Ranged']                        = lib_svn_root;
+  src['scala/collection/Set']                           = lib_svn_root;
+  src['scala/collection/SetProxy']                      = lib_svn_root;
+  src['scala/collection/Sorted']                        = lib_svn_root;
+  src['scala/collection/SortedMap']                     = lib_svn_root;
+  src['scala/collection/SortedSet']                     = lib_svn_root;
+  src['scala/collection/immutable/BitSet']              = lib_svn_root;
+  src['scala/collection/immutable/HashMap']             = lib_svn_root;
+  src['scala/collection/immutable/HashSet']             = lib_svn_root;
+  src['scala/collection/mutable/ArrayBuffer']           = lib_svn_root;
+  src['scala/collection/mutable/BitSet']                = lib_svn_root;
+  src['scala/collection/mutable/HashMap']               = lib_svn_root;
+  src['scala/collection/mutable/HashSet']               = lib_svn_root;
+
+  src['scala/util/Fluid']                               = lib_svn_root;
+  src['scala/util/RichSorting']                         = lib_svn_root;
+  src['scala/util/Sorting']                             = lib_svn_root;
+
+  src['scala/xml/Atom']                                 = lib_svn_root;
+  src['scala/xml/Comment']                              = lib_svn_root;
+  src['scala/xml/Document']                             = lib_svn_root;
+  src['scala/xml/Elem']                                 = lib_svn_root;
+  src['scala/xml/Entityef']                             = lib_svn_root;
+  src['scala/xml/Group']                                = lib_svn_root;
+  src['scala/xml/HasKeyValue']                          = lib_svn_root;
+  src['scala/xml/Node']                                 = lib_svn_root;
+  src['scala/xml/NodeBuffer']                           = lib_svn_root;
+  src['scala/xml/NodeSeq']                              = lib_svn_root;
+  src['scala/xml/NodeTraverser']                        = lib_svn_root;
+  src['scala/xml/Null']                                 = lib_svn_root;
+  src['scala/xml/PrettyPrinter']                        = lib_svn_root;
+  src['scala/xml/SpecialNode']                          = lib_svn_root;
+  src['scala/xml/Text']                                 = lib_svn_root;
+  src['scala/xml/TextBuffer']                           = lib_svn_root;
+  src['scala/xml/TypeSymbol']                           = lib_svn_root;
+  src['scala/xml/Unparsed']                             = lib_svn_root;
+  src['scala/xml/UnprefixedAttribute']                  = lib_svn_root;
+
+  // scala-actors-src.jar
+  src['scala/actors/Actor']                             = actors_svn_root;
+  src['scala/actors/Debug']                             = actors_svn_root;
+  // declared in 'Scheduler'
+  //src['scala/actors/IScheduler']                        = actors_svn_root;
+  src['scala/actors/Reaction']                          = actors_svn_root;
+  src['scala/actors/Scheduler']                         = actors_svn_root;
+
+  src['scala/actors/remote/JavaSerizalizer']            = actors_svn_root;
+  src['scala/actors/remote/Service']                    = actors_svn_root;
+
+  // scala-compiler-src.jar
+  src['scala/tools/nsc/Global']                         = comp_svn_root;
+  src['scala/tools/nsc/symtab/Definitions']             = comp_svn_root;
 
   var elems = document.getElementsByTagName('a');
   for (i = 0; i < elems.length; i++) {
     try {
       key = elems[i].getAttribute('class');
       href = elems[i].getAttribute('href');
-      api_root = table[key];
+      api_root = api[key];
       if (api_root != null) {
         href1 = href.substring(href.lastIndexOf("#"))
-        value = api_root + key.replace(/_/g, "/") + ".html" + href1;
+        value = api_root + key + ".html" + href1;
+        elems[i].setAttribute('href', value);
+      }
+      src_root = src[key];
+      if (src_root != null) {
+        value = src_root + key + '.scala?view=markup';
         elems[i].setAttribute('href', value);
+        elems[i].setAttribute('target' , '_top');
       }
     }
     catch (e) {
diff --git a/src/compiler/scala/tools/nsc/doc/source.png b/src/compiler/scala/tools/nsc/doc/source.png
new file mode 100644
index 0000000000..ecbca8cad7
--- /dev/null
+++ b/src/compiler/scala/tools/nsc/doc/source.png