Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/javadoc/Main.java	Mon Sep 29 22:11:26 2008 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javadoc/Main.java	Wed Oct 01 16:26:33 2008 -0700
     1.3 @@ -45,7 +45,7 @@
     1.4       * Command line interface.
     1.5       * @param args   The command line parameters.
     1.6       */
     1.7 -    public static void main(String[] args) {
     1.8 +    public static void main(String... args) {
     1.9          System.exit(execute(args));
    1.10      }
    1.11  
    1.12 @@ -54,7 +54,7 @@
    1.13       * @param args   The command line parameters.
    1.14       * @return The return code.
    1.15       */
    1.16 -    public static int execute(String[] args) {
    1.17 +    public static int execute(String... args) {
    1.18          Start jdoc = new Start();
    1.19          return jdoc.begin(args);
    1.20      }
    1.21 @@ -65,7 +65,7 @@
    1.22       * @param args   The command line parameters.
    1.23       * @return The return code.
    1.24       */
    1.25 -    public static int execute(String programName, String[] args) {
    1.26 +    public static int execute(String programName, String... args) {
    1.27          Start jdoc = new Start(programName);
    1.28          return jdoc.begin(args);
    1.29      }
    1.30 @@ -79,7 +79,7 @@
    1.31       */
    1.32      public static int execute(String programName,
    1.33                                String defaultDocletClassName,
    1.34 -                              String[] args) {
    1.35 +                              String... args) {
    1.36          Start jdoc = new Start(programName, defaultDocletClassName);
    1.37          return jdoc.begin(args);
    1.38      }
    1.39 @@ -99,7 +99,7 @@
    1.40                                PrintWriter warnWriter,
    1.41                                PrintWriter noticeWriter,
    1.42                                String defaultDocletClassName,
    1.43 -                              String[] args) {
    1.44 +                              String... args) {
    1.45          Start jdoc = new Start(programName,
    1.46                                 errWriter, warnWriter, noticeWriter,
    1.47                                 defaultDocletClassName);

     2.1 --- a/src/share/classes/com/sun/tools/javadoc/Start.java	Mon Sep 29 22:11:26 2008 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/javadoc/Start.java	Wed Oct 01 16:26:33 2008 -0700
     2.3 @@ -28,17 +28,11 @@
     2.4  import com.sun.javadoc.*;
     2.5  
     2.6  import com.sun.tools.javac.main.CommandLine;
     2.7 -import com.sun.tools.javac.main.JavaCompiler;
     2.8  import com.sun.tools.javac.util.Context;
     2.9  import com.sun.tools.javac.util.List;
    2.10  import com.sun.tools.javac.util.ListBuffer;
    2.11  import com.sun.tools.javac.util.Options;
    2.12  
    2.13 -import com.sun.tools.javadoc.Messager;
    2.14 -import com.sun.tools.javadoc.DocletInvoker;
    2.15 -import com.sun.tools.javadoc.RootDocImpl;
    2.16 -import com.sun.tools.javadoc.ModifierFilter;
    2.17 -
    2.18  import java.io.IOException;
    2.19  import java.io.File;
    2.20  import java.io.FileNotFoundException;
    2.21 @@ -139,7 +133,7 @@
    2.22      /**
    2.23       * Main program - external wrapper
    2.24       */
    2.25 -    int begin(String argv[]) {
    2.26 +    int begin(String... argv) {
    2.27          boolean failed = false;
    2.28  
    2.29          try {
    2.30 @@ -178,7 +172,7 @@
    2.31      /**
    2.32       * Main program - internal
    2.33       */
    2.34 -    private boolean parseAndExecute(String argv[]) throws IOException {
    2.35 +    private boolean parseAndExecute(String... argv) throws IOException {
    2.36          long tm = System.currentTimeMillis();
    2.37  
    2.38          ListBuffer<String> javaNames = new ListBuffer<String>();