Fixed (most of) the varargs warnings in the com...

Fixed (most of) the varargs warnings in the compiler and libraries.
Fixing the remaining ones in scala.tools.nsc.ObjectRunner will have to
wait on a fix to #1003.

3 files changed, 9 insertions, 11 deletions

diff --git a/src/library/scala/Console.scala b/src/library/scala/Console.scala
index cd8a247633..6136c25bc7 100644
--- a/src/library/scala/Console.scala
+++ b/src/library/scala/Console.scala
@@ -184,7 +184,7 @@ object Console {
   def format(text: String, args: Any*): Unit =
       if (text eq null) "null" else
       out.printf(text, args.asInstanceOf[scala.runtime.BoxedObjectArray].
-                            unbox(args.getClass).asInstanceOf[Array[Object]])
+                            unbox(args.getClass).asInstanceOf[Array[Object]] : _*)
 
   /** Read a full line from the terminal.  Returns <code>null</code> if the end of the
    * input stream has been reached.
diff --git a/src/library/scala/mobile/Code.scala b/src/library/scala/mobile/Code.scala
index 0ff0092b23..180facb7eb 100644
--- a/src/library/scala/mobile/Code.scala
+++ b/src/library/scala/mobile/Code.scala
@@ -195,7 +195,7 @@ class Code(clazz: java.lang.Class[_]) {
   private def applyFun(methName: String, args: Array[JObject],
                        argTypes: Array[Class[T] forSome { type T }]): JObject = {
     try {
-      val method = clazz.getMethod(methName, argTypes)
+      val method = clazz.getMethod(methName, argTypes : _*)
       var obj: JObject = null
       if (! Modifier.isStatic(method.getModifiers())) {
         if (instance eq null) {
@@ -205,7 +205,7 @@ class Code(clazz: java.lang.Class[_]) {
             val cs = clazz.getConstructors()
 //Console.println("cs.length=" + cs.length);
             if (cs.length > 0) {
-              cs(0).newInstance(Array("")).asInstanceOf[AnyRef]
+              cs(0).newInstance("").asInstanceOf[AnyRef]
             } else {
               error("class " + clazz.getName() + " has no public constructor")
               null
@@ -214,15 +214,15 @@ class Code(clazz: java.lang.Class[_]) {
         }
         obj = instance
       }
-      val result = method.invoke(obj, args)
+      val result = method.invoke(obj, args : _*)
       if (result eq null) ().asInstanceOf[JObject] else result
     }
     catch {
       case me: NoSuchMethodException =>
         if (isConstructorName(methName)) {
           try {
-            val cstr = clazz.getConstructor(argTypes)
-            instance = cstr.newInstance(args).asInstanceOf[AnyRef]
+            val cstr = clazz.getConstructor(argTypes : _*)
+            instance = cstr.newInstance(args : _*).asInstanceOf[AnyRef]
             instance
           }
           catch {
diff --git a/src/library/scala/runtime/StringAdd.scala b/src/library/scala/runtime/StringAdd.scala
index b31ef93656..3ca1c2ebcc 100644
--- a/src/library/scala/runtime/StringAdd.scala
+++ b/src/library/scala/runtime/StringAdd.scala
@@ -17,8 +17,7 @@ import Predef._
 object StringAdd {
   // Needed for the format hack. Can be removed once we drop 1.4
   lazy val formatMethod: java.lang.reflect.Method = {
-    val paramTypes = Array[Class[T] forSome { type T }](classOf[String], classOf[Array[Object]])
-    classOf[String].getDeclaredMethod("format", paramTypes)
+    classOf[String].getDeclaredMethod("format", classOf[String], classOf[Array[Object]])
   }
 }
 final class StringAdd(self: Any) {
@@ -32,10 +31,9 @@ final class StringAdd(self: Any) {
    */
   def formatted(format: String): String = {
     // This should be:
-    // String.format(format, Array(self.asInstanceOf[Object]))
+    // String.format(format, self.asInstanceOf[Object])
     // However, the line above does not compile on Java 1.4 because String.format exists only in 1.5
     // Therefore, we do the following hack:
-    val args = Array(self.asInstanceOf[Object])
-    StringAdd.formatMethod.invoke(null, Array[Object](format, args)).asInstanceOf[String]
+    StringAdd.formatMethod.invoke(null, format, self.asInstanceOf[Object]).asInstanceOf[String]
   }
 }