added Nik's contrib to script.js

3 files changed, 54 insertions, 924 deletions

diff --git a/src/compiler/scala/tools/nsc/doc/script.js b/src/compiler/scala/tools/nsc/doc/script.js
index 90275c4e29..dc4e994470 100644
--- a/src/compiler/scala/tools/nsc/doc/script.js
+++ b/src/compiler/scala/tools/nsc/doc/script.js
@@ -1,4 +1,10 @@
 <!--
+// NSC -- new Scala compiler
+// Copyright 2005-2007 LAMP/EPFL
+// @author  Stephane Micheloud
+
+// $Id$
+
 function setWindowTitle(title) {
   parent.document.title = title;
 }
@@ -17,920 +23,44 @@ var eclipse_api_root = 'http://help.eclipse.org/help32/topic/org.eclipse.platfor
 
 var fjbg_api_root = 'http://lamp.epfl.ch/~linuxsoft/fjbg/api/';
 
+function get_api_root(key) {
+  root = null;
+  if      (key.indexOf("ch/epfl/lamp/fjbg/") == 0) { root = fjbg_api_root; }
+  else if (key.indexOf("java/"             ) == 0) { root = java_api_root; }
+  else if (key.indexOf("scala/"            ) == 0) { root = scala_api_root; }
+  else if (key.indexOf("org/apache/tools/" ) == 0) { root = ant_api_root; }
+  else if (key.indexOf("org/eclipse/"      ) == 0) { root = eclipse_api_root; }
+  return root;
+}
+
 var scala_src_root = 'http://scalasvn.epfl.ch/cgi-bin/viewvc.cgi/scala/trunk/';
 var lib_src_root = scala_src_root + 'src/library/';
 var comp_src_root = scala_src_root + 'src/compiler/';
 var actors_src_root = scala_src_root + 'src/actors/';
 var dbc_src_root = scala_src_root + 'src/dbc/';
 
-// hash tables
-var api = new Array()
-var src = new Array()
+function get_src_root(key) {
+  root = null;
+  if      (key.indexOf("scala/actors/") == 0) { root = actors_src_root; }
+  else if (key.indexOf("scala/dbc/"   ) == 0) { root = dbc_src_root; }
+  else if (key.indexOf("scala/tools/" ) == 0) { root = comp_src_root; }
+  else if (key.indexOf("scala/"       ) == 0) { root = lib_src_root; }
+  return root;
+}
 
 function init() {
-  // initialize Java classes
-  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/SequenceInputStream']              = java_api_root;
-  api['java/io/SerializablePermission']           = java_api_root;
-  api['java/io/StreamTokenizer']                  = java_api_root;
-  api['java/io/StringBufferInputStream']          = 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; //exception
-  api['java/rmi/AlreadyBoundException']           = java_api_root; //exception
-  api['java/rmi/ConnectException']                = java_api_root; //exception
-  api['java/rmi/ConnectIOException']              = java_api_root; //exception
-  api['java/rmi/MarshalException']                = java_api_root; //exception
-  api['java/rmi/MarshalledObject']                = java_api_root;
-  api['java/rmi/Naming']                          = java_api_root;
-  api['java/rmi/RMISecurityException']            = java_api_root; //exception
-  api['java/rmi/RMISecurityManager']              = java_api_root;
-  api['java/rmi/Remote']                          = java_api_root; //interface
-  api['java/rmi/ServerError']                     = java_api_root; //exception
-  api['java/rmi/ServerException']                 = java_api_root; //exception
-  api['java/rmi/ServerRuntimeException']          = java_api_root; //exception
-  api['java/rmi/StubNotFoundException']           = java_api_root; //exception
-  api['java/rmi/UnexpectedException']             = java_api_root; //exception
-  api['java/rmi/UnknownHostException']            = java_api_root; //exception
-  api['java/rmi/UnmarshalException']              = java_api_root; //exception
-
-  api['java/sql/Array']                           = java_api_root; //interface
-  api['java/sql/BatchUpdateException']            = java_api_root; //exception
-  api['java/sql/Blob']                            = java_api_root; //interface
-  api['java/sql/CallableStatement']               = java_api_root; //interface
-  api['java/sql/Clob']                            = java_api_root; //interface
-  api['java/sql/Connection']                      = java_api_root; //interface
-  api['java/sql/DataTruncation']                  = java_api_root; //exception
-  api['java/sql/DatabaseMetaData']                = java_api_root; //interface
-  api['java/sql/Date']                            = java_api_root;
-  api['java/sql/Driver']                          = java_api_root; //interface
-  api['java/sql/DriverManager']                   = java_api_root;
-  api['java/sql/DriverPropertyInfo']              = java_api_root;
-  api['java/sql/ParameterMetaData']               = java_api_root; //interface
-  api['java/sql/PreparedStatement']               = java_api_root; //interface
-  api['java/sql/Ref']                             = java_api_root; //interface
-  api['java/sql/ResultSet']                       = java_api_root; //interface
-  api['java/sql/ResultSetMetaData']               = java_api_root; //interface
-  api['java/sql/SQLData']                         = java_api_root; //interface
-  api['java/sql/SQLInput']                        = java_api_root; //interface
-  api['java/sql/SQLOutput']                       = java_api_root; //interface
-  api['java/sql/SQLException']                    = java_api_root; //exception
-  api['java/sql/SQLPermission']                   = java_api_root;
-  api['java/sql/SQLWarning']                      = java_api_root; //exception
-  api['java/sql/SavePoint']                       = java_api_root; //interface
-  api['java/sql/Statement']                       = java_api_root; //interface
-  api['java/sql/Struct']                          = java_api_root; //interface
-  api['java/sql/Time']                            = java_api_root;
-  api['java/sql/Timestamp']                       = java_api_root;
-  api['java/sql/Types']                           = java_api_root;
-
-  api['java/text/Annotation']                     = java_api_root;
-  api['java/text/AttributedCharacterIterator']    = java_api_root; //interface
-  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; //exception
-  api['java/text/ParsePosition']                  = java_api_root;
-  api['java/text/RuleBasedCollator']              = java_api_root;
-  api['java/text/SimpleDateFormat']               = java_api_root;
-  api['java/text/StringCharacterIterator']        = java_api_root;
-
-  api['java/util/AbstractCollection']             = java_api_root;
-  api['java/util/AbstractList']                   = java_api_root;
-  api['java/util/AbstractMap']                    = java_api_root;
-  api['java/util/AbstractSequentialList']         = java_api_root;
-  api['java/util/AbstractSet']                    = java_api_root;
-  api['java/util/ArrayList']                      = 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/EnumMap']                        = java_api_root;
-  api['java/util/EnumSet']                        = java_api_root;
-  api['java/util/Enumeration']                    = java_api_root; //interface
-  api['java/util/EventListener']                  = java_api_root; //interface
-  api['java/util/EventListenerProxy']             = java_api_root;
-  api['java/util/EventObject']                    = java_api_root;
-  api['java/util/Formattable']                    = java_api_root; //interface
-  api['java/util/Formatter']                      = java_api_root;
-  api['java/util/GregorianCalendar']              = java_api_root;
-  api['java/util/HashMap']                        = java_api_root;
-  api['java/util/HashSet']                        = java_api_root;
-  api['java/util/Hashtable']                      = java_api_root;
-  api['java/util/IdentityHashMap']                = java_api_root;
-  api['java/util/IllegalFormatException']         = java_api_root;
-  api['java/util/Iterator']                       = java_api_root; //interface
-  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/ListIterator']                   = java_api_root; //interface
-  api['java/util/ListResourceBundle']             = java_api_root;
-  api['java/util/Locale']                         = java_api_root;
-  api['java/util/Map']                            = java_api_root;
-  api['java/util/Observable']                     = java_api_root;
-  api['java/util/Observer']                       = java_api_root; //interface
-  api['java/util/PriorityQueue']                  = java_api_root;
-  api['java/util/Properties']                     = java_api_root;
-  api['java/util/PropertyPermission']             = java_api_root;
-  api['java/util/PropertyResourceBundle']         = java_api_root;
-  api['java/util/Queue']                          = java_api_root; //interface
-  api['java/util/Random']                         = java_api_root;
-  api['java/util/RandomAccess']                   = java_api_root; //interface
-  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/SimpleTimeZone']                 = java_api_root;
-  api['java/util/SortedMap']                      = java_api_root; //interface
-  api['java/util/SortedSet']                      = java_api_root; //infterface
-  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
-  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;
-
-  // initialize Ant classes
-  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/BuildListener']             = ant_api_root; //interface
-  api['org/apache/tools/ant/BuildLogger']               = ant_api_root; //interface
-  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/Executor']                  = ant_api_root; //interface
-  api['org/apache/tools/ant/FileScanner']               = ant_api_root; //interface
-  api['org/apache/tools/ant/Project']                   = ant_api_root;
-  api['org/apache/tools/ant/SubBuildListener']          = ant_api_root; //interface
-  api['org/apache/tools/ant/Target']                    = ant_api_root;
-  api['org/apache/tools/ant/Task']                      = ant_api_root;
-  api['org/apache/tools/ant/TaskContainer']             = ant_api_root; //interface
-  api['org/apache/tools/ant/TypeAdapter']               = ant_api_root; //interface
-  api['org/apache/tools/ant/XmlLogger']                 = 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/FileNameMapper']       = ant_api_root; //interface
-  api['org/apache/tools/ant/util/Base64Converter']      = ant_api_root;
-  api['org/apache/tools/ant/util/ChainedMapper']        = ant_api_root;
-  api['org/apache/tools/ant/util/DateUtils']            = ant_api_root;
-  api['org/apache/tools/ant/util/FileTokenizer']        = ant_api_root;
-  api['org/apache/tools/ant/util/FileUtils']            = ant_api_root;
-  api['org/apache/tools/ant/util/LoaderUtils']          = ant_api_root;
-  api['org/apache/tools/ant/util/Retryable']            = ant_api_root; //interface
-  api['org/apache/tools/ant/util/SourceFileScanner']    = ant_api_root;
-  api['org/apache/tools/ant/util/StringUtils']          = ant_api_root;
-  api['org/apache/tools/ant/util/TimeoutObserver']      = ant_api_root; //interface
-  api['org/apache/tools/ant/util/Tokenizer']            = ant_api_root; //interface
-  api['org/apache/tools/ant/util/UUEncoder']            = ant_api_root;
-  api['org/apache/tools/ant/util/Watchdog']             = ant_api_root;
-  api['org/apache/tools/ant/util/XMLFragment']          = ant_api_root;
-
-  api['org/apache/tools/bzip2/BZip2Constants']          = ant_api_root; //interface
-  api['org/apache/tools/bzip2/CBZip2InputStream']       = ant_api_root;
-  api['org/apache/tools/bzip2/CBZip2OutputStream']      = ant_api_root;
-
-  api['org/apache/tools/mail/ErrorInQuitException']     = ant_api_root; //exception
-  api['org/apache/tools/mail/MailMessage']              = ant_api_root;
-  api['org/apache/tools/mail/SmtpResponseReader']       = ant_api_root;
-
-  api['org/apache/tools/tar/TarBuffer']                 = ant_api_root;
-  api['org/apache/tools/tar/TarConstants']              = ant_api_root; //interface
-  api['org/apache/tools/tar/TarEntry']                  = ant_api_root;
-  api['org/apache/tools/tar/TarInputStream']            = ant_api_root;
-  api['org/apache/tools/tar/TarOutputStream']           = ant_api_root;
-  api['org/apache/tools/tar/TarUtils']                  = ant_api_root;
-
-  api['org/apache/tools/zip/AsiExtraField']             = ant_api_root;
-  api['org/apache/tools/zip/ExtraFieldUtils']           = ant_api_root;
-  api['org/apache/tools/zip/JarMarker']                 = ant_api_root;
-  api['org/apache/tools/zip/UnrecognizedExtraField']    = ant_api_root;
-  api['org/apache/tools/zip/ZipEntry']                  = ant_api_root;
-  api['org/apache/tools/zip/ZipExtraField']             = ant_api_root; //interface
-  api['org/apache/tools/zip/ZipFile']                   = ant_api_root;
-  api['org/apache/tools/zip/ZipLong']                   = ant_api_root;
-  api['org/apache/tools/zip/ZipOutputStream']           = ant_api_root;
-  api['org/apache/tools/zip/ZipShort']                  = ant_api_root;
-  api['org/apache/tools/zip/UnixStat']                  = ant_api_root; //interface
-
-  // initialize Eclipse classes
-  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
-  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/All$']                                     = lib_src_root;
-  src['scala/AllRef$']                                  = lib_src_root;
-  src['scala/Annotation']                               = lib_src_root;
-  src['scala/Application']                              = lib_src_root;
-  src['scala/Array']                                    = lib_src_root;
-  src['scala/Attribute']                                = lib_src_root;
-  src['scala/BigInt']                                   = lib_src_root;
-  src['scala/BufferedIterator']                         = lib_src_root;
-  src['scala/ByNameFunction']                           = lib_src_root;
-  src['scala/Cell']                                     = lib_src_root;
-  src['scala/ClassfileAnnotation']                      = lib_src_root;
-  src['scala/Console']                                  = lib_src_root; // object
-  src['scala/CountedIterator']                          = lib_src_root;
-  src['scala/Enumeration']                              = lib_src_root;
-  src['scala/Function']                                 = lib_src_root;
-  src['scala/Function0']                                = lib_src_root;
-  src['scala/Function1']                                = lib_src_root;
-  src['scala/Function2']                                = lib_src_root;
-  src['scala/Iterable']                                 = lib_src_root;
-  src['scala/IterableProxy']                            = lib_src_root;
-  src['scala/Iterator']                                 = lib_src_root;
-  src['scala/List']                                     = lib_src_root;
-  src['scala/MatchError']                               = lib_src_root;
-  src['scala/Math']                                     = lib_src_root; // object
-  src['scala/Nil']                                      = lib_src_root; // object
-  src['scala/None']                                     = lib_src_root; // object
-  src['scala/NotDefinedError']                          = lib_src_root;
-  src['scala/NotNull']                                  = lib_src_root;
-  src['scala/Option']                                   = lib_src_root;
-  src['scala/Ordered']                                  = lib_src_root;
-  src['scala/PartialFunction']                          = lib_src_root;
-  src['scala/Predef']                                   = lib_src_root; // object
-  src['scala/Product']                                  = lib_src_root;
-  src['scala/Proxy']                                    = lib_src_root;
-  src['scala/Range']                                    = lib_src_root;
-  src['scala/Responder']                                = lib_src_root;
-  src['scala/Seq']                                      = lib_src_root;
-  src['scala/SeqProxy']                                 = lib_src_root;
-  src['scala/SerialVersionUID']                         = lib_src_root;
-  src['scala/Some']                                     = lib_src_root;
-  src['scala/StaticAnnotation']                         = lib_src_root;
-  src['scala/Stream']                                   = lib_src_root;
-  src['scala/Symbol']                                   = lib_src_root;
-  src['scala/Tuple1']                                   = lib_src_root;
-  src['scala/Tuple2']                                   = lib_src_root;
-  src['scala/Tuple3']                                   = lib_src_root;
-  src['scala/Tuple4']                                   = lib_src_root;
-  src['scala/Tuple5']                                   = lib_src_root;
-  src['scala/Tuple6']                                   = lib_src_root;
-  src['scala/cloneable']                                = lib_src_root;
-  src['scala/deprecated']                               = lib_src_root;
-  src['scala/remote']                                   = lib_src_root;
-  src['scala/serializable']                             = lib_src_root;
-  src['scala/throws']                                   = lib_src_root;
-  src['scala/transient']                                = lib_src_root;
-  src['scala/unchecked']                                = lib_src_root;
-  src['scala/unsealed']                                 = lib_src_root;
-  src['scala/volatile']                                 = lib_src_root;
-
-  src['scala/actors/Actor']                             = actors_src_root;
-  src['scala/actors/ActorProxy']                        = actors_src_root;
-  src['scala/actors/Channel']                           = actors_src_root;
-  src['scala/actors/Debug']                             = actors_src_root;
-  src['scala/actors/Exit']                              = actors_src_root;
-  src['scala/actors/ExitActorException']                = actors_src_root;
-  src['scala/actors/FJTaskScheduler2']                  = actors_src_root;
-  src['scala/actors/Future']                            = actors_src_root;
-  src['scala/actors/Futures']                           = actors_src_root; // object
-  src['scala/actors/IScheduler']                        = actors_src_root;
-  src['scala/actors/InputChannel']                      = actors_src_root;
-  src['scala/actors/MessageQueue']                      = actors_src_root;
-  src['scala/actors/MessageQueueElement']               = actors_src_root;
-  src['scala/actors/OutputChannel']                     = actors_src_root;
-  src['scala/actors/Reaction']                          = actors_src_root;
-  src['scala/actors/Scheduler']                         = actors_src_root; // object
-  src['scala/actors/SingleThreadedScheduler']           = actors_src_root;
-  src['scala/actors/SuspendActorException']             = actors_src_root;
-  src['scala/actors/TIMEOUT']                           = actors_src_root; // object
-  src['scala/actors/TickedScheduler']                   = actors_src_root;
-  src['scala/actors/TimerThread']                       = actors_src_root; // object
-  src['scala/actors/WorkerThread']                      = actors_src_root;
-  src['scala/actors/remote/FreshNameCreator']           = actors_src_root;
-  src['scala/actors/remote/JavaSerizalizer']            = actors_src_root;
-  src['scala/actors/remote/NetKernel']                  = actors_src_root;
-  src['scala/actors/remote/RemoteActor']                = actors_src_root;
-  src['scala/actors/remote/Serializer']                 = actors_src_root;
-  src['scala/actors/remote/Service']                    = actors_src_root;
-  src['scala/actors/remote/TcpService']                 = actors_src_root;
-  
-  src['scala/collection/BitSet']                        = lib_src_root;
-  src['scala/collection/Map']                           = lib_src_root;
-  src['scala/collection/MapProxy']                      = lib_src_root;
-  src['scala/collection/Ranged']                        = lib_src_root;
-  src['scala/collection/Set']                           = lib_src_root;
-  src['scala/collection/SetProxy']                      = lib_src_root;
-  src['scala/collection/Sorted']                        = lib_src_root;
-  src['scala/collection/SortedMap']                     = lib_src_root;
-  src['scala/collection/SortedSet']                     = lib_src_root;
-  src['scala/collection/immutable/BitSet']              = lib_src_root;
-  src['scala/collection/immutable/EmptyMap']            = lib_src_root;
-  src['scala/collection/immutable/EmptySet']            = lib_src_root;
-  src['scala/collection/immutable/HashMap']             = lib_src_root;
-  src['scala/collection/immutable/HashSet']             = lib_src_root;
-  src['scala/collection/immutable/ImmutableIterator']   = lib_src_root;
-  src['scala/collection/immutable/ListMap']             = lib_src_root;
-  src['scala/collection/immutable/ListSet']             = lib_src_root;
-  src['scala/collection/immutable/Map']                 = lib_src_root;
-  src['scala/collection/immutable/Map1']                = lib_src_root;
-  src['scala/collection/immutable/Map2']                = lib_src_root;
-  src['scala/collection/immutable/Map3']                = lib_src_root;
-  src['scala/collection/immutable/Map4']                = lib_src_root;
-  src['scala/collection/immutable/Queue']               = lib_src_root;
-  src['scala/collection/immutable/RedBlack']            = lib_src_root;
-  src['scala/collection/immutable/Set']                 = lib_src_root;
-  src['scala/collection/immutable/Set1']                = lib_src_root;
-  src['scala/collection/immutable/Set2']                = lib_src_root;
-  src['scala/collection/immutable/Set3']                = lib_src_root;
-  src['scala/collection/immutable/Set4']                = lib_src_root;
-  src['scala/collection/immutable/SortedMap']           = lib_src_root;
-  src['scala/collection/immutable/SortedSet']           = lib_src_root;
-  src['scala/collection/immutable/Stack']               = lib_src_root;
-  src['scala/collection/immutable/Tree']                = lib_src_root;
-  src['scala/collection/immutable/TreeMap']             = lib_src_root;
-  src['scala/collection/immutable/TreeSet']             = lib_src_root;
-  src['scala/collection/immutable/UnbalancedTreeMap']   = lib_src_root;
-  src['scala/collection/jcl/ArrayList']                 = lib_src_root;
-  src['scala/collection/jcl/Buffer']                    = lib_src_root;
-  src['scala/collection/jcl/BufferIterator']            = lib_src_root;
-  src['scala/collection/jcl/BufferWrapper']             = lib_src_root;
-  src['scala/collection/jcl/Collection']                = lib_src_root;
-  src['scala/collection/jcl/CollectionWrapper']         = lib_src_root;
-  src['scala/collection/jcl/HashMap']                   = lib_src_root;
-  src['scala/collection/jcl/HashSet']                   = lib_src_root;
-  src['scala/collection/jcl/IdentityHashMap']           = lib_src_root;
-  src['scala/collection/jcl/IterableWrapper']           = lib_src_root;
-  src['scala/collection/jcl/LinkedHashMap']             = lib_src_root;
-  src['scala/collection/jcl/LinkedHashSet']             = lib_src_root;
-  src['scala/collection/jcl/LinkedList']                = lib_src_root;
-  src['scala/collection/jcl/Map']                       = lib_src_root;
-  src['scala/collection/jcl/MapWrapper']                = lib_src_root;
-  src['scala/collection/jcl/MutableIterable']           = lib_src_root;
-  src['scala/collection/jcl/MutableIterator']           = lib_src_root;
-  src['scala/collection/jcl/MutableSeq']                = lib_src_root;
-  src['scala/collection/jcl/Ranged']                    = lib_src_root;
-  src['scala/collection/jcl/SeqIterator']               = lib_src_root;
-  src['scala/collection/jcl/Set']                       = lib_src_root;
-  src['scala/collection/jcl/SetWrapper']                = lib_src_root;
-  src['scala/collection/jcl/Sorted']                    = lib_src_root;
-  src['scala/collection/jcl/SortedMap']                 = lib_src_root;
-  src['scala/collection/jcl/SortedMapWrapper']          = lib_src_root;
-  src['scala/collection/jcl/SortedSet']                 = lib_src_root;
-  src['scala/collection/jcl/SortedSetWrapper']          = lib_src_root;
-  src['scala/collection/jcl/TreeMap']                   = lib_src_root;
-  src['scala/collection/jcl/TreeSet']                   = lib_src_root;
-  src['scala/collection/jcl/WeakHashMap']               = lib_src_root;
-  src['scala/collection/mutable/ArrayBuffer']           = lib_src_root;
-  src['scala/collection/mutable/BitSet']                = lib_src_root;
-  src['scala/collection/mutable/Buffer']                = lib_src_root;
-  src['scala/collection/mutable/BufferProxy']           = lib_src_root;
-  src['scala/collection/mutable/DefaultEntry']          = lib_src_root;
-  src['scala/collection/mutable/HashMap']               = lib_src_root;
-  src['scala/collection/mutable/HashSet']               = lib_src_root;
-  src['scala/collection/mutable/JavaMapAdaptor']        = lib_src_root;
-  src['scala/collection/mutable/Location']              = lib_src_root;
-  src['scala/collection/mutable/Map']                   = lib_src_root;
-  src['scala/collection/mutable/MapProxy']              = lib_src_root;
-  src['scala/collection/mutable/Message']               = lib_src_root;
-  src['scala/collection/mutable/MultiMap']              = lib_src_root;
-  src['scala/collection/mutable/MutableList']           = lib_src_root;
-  src['scala/collection/mutable/ObservableBuffer']      = lib_src_root;
-  src['scala/collection/mutable/ObservableMap']         = lib_src_root;
-  src['scala/collection/mutable/ObservableSet']         = lib_src_root;
-  src['scala/collection/mutable/PriorityQueue']         = lib_src_root;
-  src['scala/collection/mutable/PriorityQueueProxy']    = lib_src_root;
-  src['scala/collection/mutable/Queue']                 = lib_src_root;
-  src['scala/collection/mutable/QueueProxy']            = lib_src_root;
-  src['scala/collection/mutable/ResizableArray']        = lib_src_root;
-  src['scala/collection/mutable/RevertableHistory']     = lib_src_root;
-  src['scala/collection/mutable/Scriptable']            = lib_src_root;
-  src['scala/collection/mutable/Set']                   = lib_src_root;
-  src['scala/collection/mutable/SetProxy']              = lib_src_root;
-  src['scala/collection/mutable/SingleLinkedList']      = lib_src_root;
-  src['scala/collection/mutable/Stack']                 = lib_src_root;
-  src['scala/collection/mutable/StackProxy']            = lib_src_root;
-  src['scala/collection/mutable/Subscriber']            = lib_src_root;
-  src['scala/collection/mutable/SynchronizedBuffer']    = lib_src_root;
-  src['scala/collection/mutable/SynchronizedMap']       = lib_src_root;
-  src['scala/collection/mutable/SynchronizedQueue']     = lib_src_root;
-  src['scala/collection/mutable/SynchronizedSet']       = lib_src_root;
-  src['scala/collection/mutable/SynchronizedStack']     = lib_src_root;
-  src['scala/collection/mutable/Undoable']              = lib_src_root;
-  src['scala/compat/StringBuilder']                     = lib_src_root;
-  src['scala/compat/Math']                              = lib_src_root;
-  src['scala/compat/Platform']                          = lib_src_root;
-  src['scala/concurrent/Actor']                         = lib_src_root;
-  src['scala/concurrent/Channel']                       = lib_src_root;
-  src['scala/concurrent/Lock']                          = lib_src_root;
-  src['scala/concurrent/MailBox']                       = lib_src_root;
-  src['scala/concurrent/NameServer']                    = lib_src_root;
-  src['scala/concurrent/Pid']                           = lib_src_root;
-  src['scala/concurrent/Process']                       = lib_src_root;
-  src['scala/concurrent/SyncChannel']                   = lib_src_root;
-  src['scala/concurrent/SyncVar']                       = lib_src_root;
-  src['scala/concurrent/TIMEOUT']                       = lib_src_root; // object
-  src['scala/concurrent/jolib']                         = lib_src_root; // object
-  src['scala/concurrent/ops']                           = lib_src_root; // object
-  src['scala/concurrent/pilib']                         = lib_src_root; // object
-
-  src['scala/io/BytePickle']                            = lib_src_root;
-  src['scala/io/Position']                              = lib_src_root;
-  src['scala/io/Source']                                = lib_src_root;
-  src['scala/io/UTF8Codec']                             = lib_src_root;
-
-  src['scala/reflect/BeanProperty']                     = lib_src_root;
-  src['scala/reflect/Code']                             = lib_src_root;
-  src['scala/reflect/Print']                            = lib_src_root;
-  src['scala/reflect/Symbol']                           = lib_src_root;
-  src['scala/reflect/Tree']                             = lib_src_root;
-  src['scala/reflect/Type']                             = lib_src_root;
-  src['scala/reflect/TypedCode']                        = lib_src_root;
-
-  src['scala/runtime/BoxedAnyArray']                    = lib_src_root;
-  src['scala/runtime/BoxedArray']                       = lib_src_root;
-  src['scala/runtime/BoxedBooleanArray']                = lib_src_root;
-  src['scala/runtime/BoxedByteArray']                   = lib_src_root;
-  src['scala/runtime/BoxedCharArray']                   = lib_src_root;
-  src['scala/runtime/BoxedDoubleArray']                 = lib_src_root;
-  src['scala/runtime/BoxedFloatArray']                  = lib_src_root;
-  src['scala/runtime/BoxedIntArray']                    = lib_src_root;
-  src['scala/runtime/BoxedLongArray']                   = lib_src_root;
-  src['scala/runtime/BoxedObjectArray']                 = lib_src_root;
-  src['scala/runtime/BoxedShortArray']                  = lib_src_root;
-  src['scala/runtime/NonLocalReturnException']          = lib_src_root;
-  src['scala/runtime/Nothing$']                         = lib_src_root;
-  src['scala/runtime/Null$']                            = lib_src_root;
-  src['scala/runtime/RichBoolean']                      = lib_src_root;
-  src['scala/runtime/RichByte']                         = lib_src_root;
-  src['scala/runtime/RichChar']                         = lib_src_root;
-  src['scala/runtime/RichDouble']                       = lib_src_root;
-  src['scala/runtime/RichException']                    = lib_src_root;
-  src['scala/runtime/RichFloat']                        = lib_src_root;
-  src['scala/runtime/RichInt']                          = lib_src_root;
-  src['scala/runtime/RichLong']                         = lib_src_root;
-  src['scala/runtime/RichShort']                        = lib_src_root;
-  src['scala/runtime/RichString']                       = lib_src_root;
-  src['scala/runtime/ScalaRunTime']                     = lib_src_root;
-  src['scala/runtime/StringAdd']                        = lib_src_root;
-
-  src['scala/testing/Benchmark']                        = lib_src_root;
-  src['scala/testing/SUnit']                            = lib_src_root;
-  src['scala/testing/UnitTest']                         = lib_src_root; // object
-
-  src['scala/text/DocBreak']                            = lib_src_root;
-  src['scala/text/DocCons']                             = lib_src_root;
-  src['scala/text/DocGroup']                            = lib_src_root;
-  src['scala/text/DocNest']                             = lib_src_root;
-  src['scala/text/DocNil']                              = lib_src_root;
-  src['scala/text/DocText']                             = lib_src_root;
-  src['scala/text/Document']                            = lib_src_root;
-
-  src['scala/util/Fluid']                               = lib_src_root;
-  src['scala/util/Sorting']                             = lib_src_root;
-  src['scala/util/automata/BaseBerrySethi']             = lib_src_root;
-  src['scala/util/automata/DetWordAutom']               = lib_src_root;
-  src['scala/util/automata/Inclusion']                  = lib_src_root;
-  src['scala/util/automata/NondetWordAutomata']         = lib_src_root;
-  src['scala/util/automata/SubsetConstruction']         = lib_src_root;
-  src['scala/util/automata/WordBerrySethi']             = lib_src_root;
-  src['scala/util/grammar/HedgeRHS']                    = lib_src_root;
-  src['scala/util/grammar/TreeRHS']                     = lib_src_root;
-  src['scala/util/logging/ConsoleLogger']               = lib_src_root;
-  src['scala/util/logging/Logged']                      = lib_src_root;
-  src['scala/util/parsing/CharInputStreamIterator']     = lib_src_root;
-  src['scala/util/parsing/Parsers']                     = lib_src_root;
-  src['scala/util/parsing/SimpleTokenizer']             = lib_src_root;
-  src['scala/util/regexp/Base']                         = lib_src_root;
-  src['scala/util/regexp/PointedHedgeExp']              = lib_src_root;
-  src['scala/util/regexp/SyntaxError']                  = lib_src_root;
-  src['scala/util/regexp/WordExp']                      = lib_src_root;
-
-  src['scala/xml/Atom']                                 = lib_src_root;
-  src['scala/xml/Comment']                              = lib_src_root;
-  src['scala/xml/Document']                             = lib_src_root;
-  src['scala/xml/Elem']                                 = lib_src_root;
-  src['scala/xml/Entityef']                             = lib_src_root;
-  src['scala/xml/Group']                                = lib_src_root;
-  src['scala/xml/HasKeyValue']                          = lib_src_root;
-  src['scala/xml/MalformedAttributeException']          = lib_src_root;
-  src['scala/xml/MetaData']                             = lib_src_root;
-  src['scala/xml/NamespaceBinding']                     = lib_src_root;
-  src['scala/xml/Node']                                 = lib_src_root;
-  src['scala/xml/NodeBuffer']                           = lib_src_root;
-  src['scala/xml/NodeSeq']                              = lib_src_root;
-  src['scala/xml/NodeTraverser']                        = lib_src_root;
-  src['scala/xml/Null']                                 = lib_src_root; // object
-  src['scala/xml/PrettyPrinter']                        = lib_src_root;
-  src['scala/xml/SpecialNode']                          = lib_src_root;
-  src['scala/xml/Text']                                 = lib_src_root;
-  src['scala/xml/TextBuffer']                           = lib_src_root;
-  src['scala/xml/TopScope']                             = lib_src_root; // object
-  src['scala/xml/TypeSymbol']                           = lib_src_root;
-  src['scala/xml/Unparsed']                             = lib_src_root;
-  src['scala/xml/UnprefixedAttribute']                  = lib_src_root;
-  src['scala/xml/Utility']                              = lib_src_root;
-  src['scala/xml/XML']                                  = lib_src_root;
-  src['scala/xml/dtd/ContentModel']                     = lib_src_root;
-  src['scala/xml/dtd/ContentModelParser']               = lib_src_root;
-  src['scala/xml/dtd/DTD']                              = lib_src_root;
-  src['scala/xml/dtd/Decl']                             = lib_src_root;
-  src['scala/xml/dtd/DocType']                          = lib_src_root;
-  src['scala/xml/dtd/DtdTypeSymbol']                    = lib_src_root;
-  src['scala/xml/dtd/ElementValidator']                 = lib_src_root;
-  src['scala/xml/dtd/ExternalID']                       = lib_src_root;
-  src['scala/xml/dtd/Scanner']                          = lib_src_root;
-  src['scala/xml/dtd/Tokens']                           = lib_src_root;
-  src['scala/xml/factory/Binder']                       = lib_src_root;
-  src['scala/xml/factory/LoggedNodeFactory']            = lib_src_root;
-  src['scala/xml/factory/NodeFactory']                  = lib_src_root;
-  src['scala/xml/parsing/ConstructingHandler']          = lib_src_root;
-  src['scala/xml/parsing/ConstructingParser']           = lib_src_root;
-  src['scala/xml/parsing/DefaultMarkupHandler']         = lib_src_root;
-  src['scala/xml/parsing/ExternalSources']              = lib_src_root;
-  src['scala/xml/parsing/FactoryAdapter']               = lib_src_root;
-  src['scala/xml/parsing/FatalError']                   = lib_src_root;
-  src['scala/xml/parsing/MarkupHandler']                = lib_src_root;
-  src['scala/xml/parsing/MarkupParser']                 = lib_src_root;
-  src['scala/xml/parsing/NoBindingFactoryAdapter']      = lib_src_root;
-  src['scala/xml/parsing/TokenTests']                   = lib_src_root;
-  src['scala/xml/parsing/ValidatingMarkupHandler']      = lib_src_root;
-  src['scala/xml/path/Expression']                      = lib_src_root;
-  src['scala/xml/pull/XMLEvent']                        = lib_src_root;
-  src['scala/xml/pull/XMLEventReader']                  = lib_src_root;
-  src['scala/xml/transform/BasicTransformer']           = lib_src_root;
-  src['scala/xml/transform/RewriteRule']                = lib_src_root;
-  src['scala/xml/transform/RuleTransformer']            = lib_src_root;
-
-  // scala-dbc-src.jar
-  src['scala/dbc/DataType']                             = dbc_src_root;
-  src['scala/dbc/Database']                             = dbc_src_root;
-  src['scala/dbc/Syntax']                               = dbc_src_root;
-  src['scala/dbc/Utilities']                            = dbc_src_root;
-  src['scala/dbc/Value']                                = dbc_src_root;
-  src['scala/dbc/Vendor']                               = dbc_src_root;
-  src['scala/dbc/datatype/ApproximateNumeric']          = dbc_src_root;
-  src['scala/dbc/datatype/Boolean']                     = dbc_src_root;
-  src['scala/dbc/datatype/Character']                   = dbc_src_root;
-  src['scala/dbc/datatype/CharacterLargeObject']        = dbc_src_root;
-  src['scala/dbc/datatype/CharacterVarying']            = dbc_src_root;
-  src['scala/dbc/datatype/ExactNumeric']                = dbc_src_root;
-  src['scala/dbc/datatype/Factory']                     = dbc_src_root;
-  src['scala/dbc/datatype/Numeric']                     = dbc_src_root;
-  src['scala/dbc/datatype/String']                      = dbc_src_root;
-  src['scala/dbc/datatype/Unknown']                     = dbc_src_root;
-  src['scala/dbc/exception/IncompatibleSchema']         = dbc_src_root;
-  src['scala/dbc/exception/UnsupportedFeature']         = dbc_src_root;
-  src['scala/dbc/result/Field']                         = dbc_src_root;
-  src['scala/dbc/result/FieldMetadata']                 = dbc_src_root;
-  src['scala/dbc/result/Relation']                      = dbc_src_root;
-  src['scala/dbc/result/Status']                        = dbc_src_root;
-  src['scala/dbc/result/Tuple']                         = dbc_src_root;
-  src['scala/dbc/statement/AccessMode']                 = dbc_src_root;
-  src['scala/dbc/statement/DerivedColumn']              = dbc_src_root;
-  src['scala/dbc/statement/Expression']                 = dbc_src_root;
-  src['scala/dbc/statement/Insert']                     = dbc_src_root;
-  src['scala/dbc/statement/InsertionData']              = dbc_src_root;
-  src['scala/dbc/statement/IsolationLevel']             = dbc_src_root;
-  src['scala/dbc/statement/JoinType']                   = dbc_src_root;
-  src['scala/dbc/statement/Jointure']                   = dbc_src_root;
-  src['scala/dbc/statement/Relation']                   = dbc_src_root;
-  src['scala/dbc/statement/Select']                     = dbc_src_root;
-  src['scala/dbc/statement/SetClause']                  = dbc_src_root;
-  src['scala/dbc/statement/SetQuantifier']              = dbc_src_root;
-  src['scala/dbc/statement/Statement']                  = dbc_src_root;
-  src['scala/dbc/statement/Status']                     = dbc_src_root;
-  src['scala/dbc/statement/Table']                      = dbc_src_root;
-  src['scala/dbc/statement/Transaction']                = dbc_src_root;
-  src['scala/dbc/statement/Update']                     = dbc_src_root;
-  src['scala/dbc/statement/expression/Aggregate']       = dbc_src_root;
-  src['scala/dbc/statement/expression/BinaryOperator']  = dbc_src_root;
-  src['scala/dbc/statement/expression/Constant']        = dbc_src_root;
-  src['scala/dbc/statement/expression/Default']         = dbc_src_root;
-  src['scala/dbc/statement/expression/Field']           = dbc_src_root;
-  src['scala/dbc/statement/expression/FunctionCall']    = dbc_src_root;
-  src['scala/dbc/statement/expression/Select']          = dbc_src_root;
-  src['scala/dbc/statement/expression/SetFunction']     = dbc_src_root;
-  src['scala/dbc/statement/expression/TypeCast']        = dbc_src_root;
-  src['scala/dbc/statement/expression/UnaryOperator']   = dbc_src_root;
-  src['scala/dbc/syntax/DataTypeUtil']                  = dbc_src_root;
-  src['scala/dbc/syntax/Database']                      = dbc_src_root;
-  src['scala/dbc/syntax/Statement']                     = dbc_src_root;
-  src['scala/dbc/syntax/StatementExpression']           = dbc_src_root;
-  src['scala/dbc/value/ApproximateNumeric']             = dbc_src_root;
-  src['scala/dbc/value/Boolean']                        = dbc_src_root;
-  src['scala/dbc/value/Character']                      = dbc_src_root;
-  src['scala/dbc/value/CharacterLargeObject']           = dbc_src_root;
-  src['scala/dbc/value/CharacterVarying']               = dbc_src_root;
-  src['scala/dbc/value/Conversion']                     = dbc_src_root;
-  src['scala/dbc/value/ExactNumeric']                   = dbc_src_root;
-  src['scala/dbc/value/Factory']                        = dbc_src_root;
-  src['scala/dbc/value/Unknown']                        = dbc_src_root;
-
-  // scala-compiler-src.jar
-  src['scala/tools/ant/FastScalac']                     = comp_src_root;
-  src['scala/tools/ant/ScalaBazaar']                    = comp_src_root;
-  src['scala/tools/ant/ScalaTool']                      = comp_src_root;
-  src['scala/tools/ant/Scalac']                         = comp_src_root;
-  src['scala/tools/ant/Scaladoc']                       = comp_src_root;
-  src['scala/tools/nsc/CompilationUnits']               = comp_src_root;
-  src['scala/tools/nsc/CompileClient']                  = comp_src_root;
-  src['scala/tools/nsc/CompileServer']                  = comp_src_root;
-  src['scala/tools/nsc/CompileSocket']                  = comp_src_root;
-  src['scala/tools/nsc/CompilerCommand']                = comp_src_root;
-  src['scala/tools/nsc/CompilerRun']                    = comp_src_root;
-  src['scala/tools/nsc/ConsoleWriter']                  = comp_src_root;
-  src['scala/tools/nsc/EvalLoop']                       = comp_src_root;
-  src['scala/tools/nsc/FatalError']                     = comp_src_root;
-  src['scala/tools/nsc/GenericRunnerCommand']           = comp_src_root;
-  src['scala/tools/nsc/GenericRunnerSettings']          = comp_src_root;
-  src['scala/tools/nsc/Global']                         = comp_src_root;
-  src['scala/tools/nsc/Interpreter']                    = comp_src_root;
-  src['scala/tools/nsc/InterpreterCommand']             = comp_src_root;
-  src['scala/tools/nsc/InterpreterLoop']                = comp_src_root;
-  src['scala/tools/nsc/InterpreterResults']             = comp_src_root;
-  src['scala/tools/nsc/Main']                           = comp_src_root;
-  src['scala/tools/nsc/MainGenericRunner']              = comp_src_root;
-  src['scala/tools/nsc/MainInterpreter']                = comp_src_root;
-  src['scala/tools/nsc/MainTokenMetric']                = comp_src_root;
-  src['scala/tools/nsc/NoPhase']                        = comp_src_root;
-  src['scala/tools/nsc/ObjectRunner']                   = comp_src_root;
-  src['scala/tools/nsc/Phase']                          = comp_src_root;
-  src['scala/tools/nsc/PositionConfiguration']          = comp_src_root;
-  src['scala/tools/nsc/Properties']                     = comp_src_root;
-  src['scala/tools/nsc/ScriptRunner']                   = comp_src_root;
-  src['scala/tools/nsc/Settings']                       = comp_src_root;
-  src['scala/tools/nsc/ast/TreeBrowsers']               = comp_src_root;
-  src['scala/tools/nsc/ast/TreeGen']                    = comp_src_root;
-  src['scala/tools/nsc/ast/TreeInfo']                   = comp_src_root;
-  src['scala/tools/nsc/ast/TreePrinters']               = comp_src_root;
-  src['scala/tools/nsc/ast/Trees']                      = comp_src_root;
-  src['scala/tools/nsc/ast/parser/MarkupParsers']       = comp_src_root;
-  src['scala/tools/nsc/ast/parser/Parsers']             = comp_src_root;
-  src['scala/tools/nsc/ast/parser/Scanners']            = comp_src_root;
-  src['scala/tools/nsc/ast/parser/SymbolicXMLBuilder']  = comp_src_root;
-  src['scala/tools/nsc/ast/parser/SyntaxAnalyzer']      = comp_src_root;
-  src['scala/tools/nsc/ast/parser/Tokens']              = comp_src_root;
-  src['scala/tools/nsc/ast/parser/TreeBuilder']         = comp_src_root;
-  src['scala/tools/nsc/backend/ScalaPrimitives']        = comp_src_root;
-  src['scala/tools/nsc/backend/WorklistAlgorithm']      = comp_src_root;
-  src['scala/tools/nsc/backend/jvm/GenJVM']             = comp_src_root;
-  src['scala/tools/nsc/backend/msil/GenMSIL']           = comp_src_root;
-  src['scala/tools/nsc/doc/DocGenerator']               = comp_src_root;
-  src['scala/tools/nsc/doc/DocUtil']                    = comp_src_root;
-  src['scala/tools/nsc/symtab/Definitions']             = comp_src_root;
-  src['scala/tools/nsc/typechecker/Analyzer']           = comp_src_root;
-  src['scala/tools/nsc/typechecker/ConstantFolder']     = comp_src_root;
-  src['scala/tools/nsc/typechecker/Contexts']           = comp_src_root;
-  src['scala/tools/nsc/typechecker/EtaExpansion']       = comp_src_root;
-  src['scala/tools/nsc/typechecker/Infer']              = comp_src_root;
-  src['scala/tools/nsc/typechecker/Namers']             = comp_src_root;
-  src['scala/tools/nsc/typechecker/RefChecks']          = comp_src_root;
-  src['scala/tools/nsc/typechecker/SuperAccessors']     = comp_src_root;
-  src['scala/tools/nsc/typechecker/SyntheticMethods']   = comp_src_root;
-  src['scala/tools/nsc/typechecker/TreeCheckers']       = comp_src_root;
-  src['scala/tools/nsc/typechecker/Typers']             = comp_src_root;
-  src['scala/tools/nsc/typechecker/Variances']          = comp_src_root;
-  src['scala/tools/nsc/util/CharArrayReader']           = comp_src_root;
-  src['scala/tools/nsc/util/ClassPath']                 = comp_src_root;
-  src['scala/tools/nsc/util/FreshNameCreator']          = comp_src_root;
-  src['scala/tools/nsc/util/HashSet']                   = comp_src_root;
-  src['scala/tools/nsc/util/LinkedList']                = comp_src_root;
-  src['scala/tools/nsc/util/ListBuffer']                = comp_src_root;
-  src['scala/tools/nsc/util/NameTransformer']           = comp_src_root;
-  src['scala/tools/nsc/util/Position']                  = comp_src_root;
-  src['scala/tools/nsc/util/Set']                       = comp_src_root;
-  src['scala/tools/nsc/util/ShowPickled']               = comp_src_root;
-  src['scala/tools/nsc/util/SourceFile']                = comp_src_root;
-  src['scala/tools/nsc/util/TreeSet']                   = comp_src_root;
-  src['scala/tools/util/AbstractTimer']                 = comp_src_root;
-  src['scala/tools/util/SocketConnection']              = comp_src_root;
-  src['scala/tools/util/SocketServer']                  = comp_src_root;
-  src['scala/tools/util/StringOps']                     = comp_src_root;
-  src['scala/tools/util/UTF8Codec']                     = comp_src_root;
-
-  var elems = document.getElementsByTagName('a');
+  elems = document.getElementsByTagName('a');
   for (i = 0; i < elems.length; i++) {
     try {
       key = elems[i].getAttribute('class');
       href = elems[i].getAttribute('href');
-      api_root = api[key];
+      api_root = get_api_root(key);
       if (api_root != null) {
         href1 = href.substring(href.lastIndexOf("#"))
         value = api_root + key + ".html" + href1;
         elems[i].setAttribute('href', value);
       }
-      src_root = src[key];
+      src_root = get_src_root(key);
       if (src_root != null) {
         value = src_root + key + '.scala?view=markup';
         elems[i].setAttribute('href', value);
diff --git a/src/library/scala/Console.scala b/src/library/scala/Console.scala
index 0897f9a7cb..64ab6d2e69 100644
--- a/src/library/scala/Console.scala
+++ b/src/library/scala/Console.scala
@@ -11,8 +11,8 @@
 
 package scala
 
-import java.io.{InputStream, Reader, InputStreamReader, BufferedReader}
-import java.io.{OutputStream, PrintStream}
+import java.io.{BufferedReader, InputStream, InputStreamReader,
+                OutputStream, Reader}
 import java.text.MessageFormat
 
 import scala.util.DynamicVariable
@@ -170,9 +170,9 @@ object Console {
    *    <code>text</code>. The arguments that are inserted into specific
    *    locations in <code>text</code> are provided with parameter
    *    <code>args</code>. See class <a href="" target="contentFrame"
-   *    class="java_text_MessageFormat"><code>java.text.MessageFormat</code></a>
+   *    class="java/text/MessageFormat"><code>java.text.MessageFormat</code></a>
    *    for a full specification of the <a href="#syntax" target="contentFrame"
-   *    class="java_util_Formatter">format syntax</a>.
+   *    class="java/util/Formatter">format syntax</a>.
    *  </p>
    *
    *  @param text the format of the text to print out.
@@ -300,39 +300,39 @@ object Console {
     var res: List[Any] = Nil
     while (i >= 0) {
       res = (a(i) match {
-        case x: java.lang.Boolean => x.booleanValue()
-        case x: java.lang.Byte => x.byteValue()
-        case x: java.lang.Short => x.shortValue()
+        case x: java.lang.Boolean   => x.booleanValue()
+        case x: java.lang.Byte      => x.byteValue()
+        case x: java.lang.Short     => x.shortValue()
         case x: java.lang.Character => x.charValue()
-        case x: java.lang.Integer => x.intValue()
-        case x: java.lang.Long => x.longValue()
-        case x: java.lang.Float => x.floatValue()
-        case x: java.lang.Double => x.doubleValue()
+        case x: java.lang.Integer   => x.intValue()
+        case x: java.lang.Long      => x.longValue()
+        case x: java.lang.Float     => x.floatValue()
+        case x: java.lang.Double    => x.doubleValue()
         case x => x
       }) :: res;
-      i = i - 1
+      i -= 1
     }
     res
   }
 
   private def textParams(s: Seq[Any]): Array[AnyRef] = {
-    val res = new Array[AnyRef](s.length);
-    var i: Int = 0;
-    val iter = s.elements;
+    val res = new Array[AnyRef](s.length)
+    var i: Int = 0
+    val iter = s.elements
     while (iter.hasNext) {
       res(i) = iter.next match {
         case x: Boolean => new java.lang.Boolean(x)
-        case x: Byte => new java.lang.Byte(x)
-        case x: Short => new java.lang.Short(x)
-        case x: Char => new java.lang.Character(x)
-        case x: Int => new java.lang.Integer(x)
-        case x: Long => new java.lang.Long(x)
-        case x: Float => new java.lang.Float(x)
-        case x: Double => new java.lang.Double(x)
-        case x: Unit => "()"
-        case x: AnyRef => x
+        case x: Byte    => new java.lang.Byte(x)
+        case x: Short   => new java.lang.Short(x)
+        case x: Char    => new java.lang.Character(x)
+        case x: Int     => new java.lang.Integer(x)
+        case x: Long    => new java.lang.Long(x)
+        case x: Float   => new java.lang.Float(x)
+        case x: Double  => new java.lang.Double(x)
+        case x: Unit    => "()"
+        case x: AnyRef  => x
       }
-      i = i + 1
+      i += 1
     }
     res
   }
diff --git a/src/library/scala/throws.scala b/src/library/scala/throws.scala
index cc6b59ed6f..c93ec8d3c8 100644
--- a/src/library/scala/throws.scala
+++ b/src/library/scala/throws.scala
@@ -17,8 +17,8 @@ package scala
  *  </p><pre>
  *    <b>class</b> Reader(fname: String) {
  *      <b>private val</b> in =
- *        <b>new</b> BufferedReader(<b>new</b> <a class="java_io_FileReader" href="" target="_top">FileReader</a>(fname))
- *      @throws(classOf[<a class="java_io_IOException" href="" target="_top">IOException</a>])
+ *        <b>new</b> BufferedReader(<b>new</b> <a class="java/io/FileReader" href="" target="_top">FileReader</a>(fname))
+ *      @throws(classOf[<a class="java/io/IOException" href="" target="_top">IOException</a>])
  *      <b>def</b> read() = in.read()
  *    }</pre>
  *