uncurried Console.printf

1 files changed, 66 insertions, 1 deletions

diff --git a/src/compiler/scala/tools/nsc/doc/script.js b/src/compiler/scala/tools/nsc/doc/script.js
index b62b36019b..f844e639c8 100644
--- a/src/compiler/scala/tools/nsc/doc/script.js
+++ b/src/compiler/scala/tools/nsc/doc/script.js
@@ -3,7 +3,8 @@ function setWindowTitle(title) {
   parent.document.title = title;
 }
 
-var java_api_root = 'http://java.sun.com/j2se/1.5.0/docs/api/';
+var java_api_root = 'http://java.sun.com/javase/6/docs/api/';
+//var java_api_root = 'http://java.sun.com/j2se/1.5.0/docs/api/';
 //var java_api_root = 'http://lamp.epfl.ch/~linuxsoft/java/jdk1.5/docs/api/';
 
 var scala_doc_url = parent.document.URL;
@@ -23,12 +24,14 @@ 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;
@@ -75,15 +78,26 @@ function init() {
   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;
@@ -122,12 +136,63 @@ function init() {
   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;
 
   // initialize Scala primitive classes