提交 eb1b7a70 编写于 作者: J jjg

6748601: javadoc API should allow varargs use

Reviewed-by: bpatel
上级 d2577d6c
...@@ -45,7 +45,7 @@ public class Main { ...@@ -45,7 +45,7 @@ public class Main {
* Command line interface. * Command line interface.
* @param args The command line parameters. * @param args The command line parameters.
*/ */
public static void main(String[] args) { public static void main(String... args) {
System.exit(execute(args)); System.exit(execute(args));
} }
...@@ -54,7 +54,7 @@ public class Main { ...@@ -54,7 +54,7 @@ public class Main {
* @param args The command line parameters. * @param args The command line parameters.
* @return The return code. * @return The return code.
*/ */
public static int execute(String[] args) { public static int execute(String... args) {
Start jdoc = new Start(); Start jdoc = new Start();
return jdoc.begin(args); return jdoc.begin(args);
} }
...@@ -65,7 +65,7 @@ public class Main { ...@@ -65,7 +65,7 @@ public class Main {
* @param args The command line parameters. * @param args The command line parameters.
* @return The return code. * @return The return code.
*/ */
public static int execute(String programName, String[] args) { public static int execute(String programName, String... args) {
Start jdoc = new Start(programName); Start jdoc = new Start(programName);
return jdoc.begin(args); return jdoc.begin(args);
} }
...@@ -79,7 +79,7 @@ public class Main { ...@@ -79,7 +79,7 @@ public class Main {
*/ */
public static int execute(String programName, public static int execute(String programName,
String defaultDocletClassName, String defaultDocletClassName,
String[] args) { String... args) {
Start jdoc = new Start(programName, defaultDocletClassName); Start jdoc = new Start(programName, defaultDocletClassName);
return jdoc.begin(args); return jdoc.begin(args);
} }
...@@ -99,7 +99,7 @@ public class Main { ...@@ -99,7 +99,7 @@ public class Main {
PrintWriter warnWriter, PrintWriter warnWriter,
PrintWriter noticeWriter, PrintWriter noticeWriter,
String defaultDocletClassName, String defaultDocletClassName,
String[] args) { String... args) {
Start jdoc = new Start(programName, Start jdoc = new Start(programName,
errWriter, warnWriter, noticeWriter, errWriter, warnWriter, noticeWriter,
defaultDocletClassName); defaultDocletClassName);
......
...@@ -28,17 +28,11 @@ package com.sun.tools.javadoc; ...@@ -28,17 +28,11 @@ package com.sun.tools.javadoc;
import com.sun.javadoc.*; import com.sun.javadoc.*;
import com.sun.tools.javac.main.CommandLine; import com.sun.tools.javac.main.CommandLine;
import com.sun.tools.javac.main.JavaCompiler;
import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.List; import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.ListBuffer; import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Options; import com.sun.tools.javac.util.Options;
import com.sun.tools.javadoc.Messager;
import com.sun.tools.javadoc.DocletInvoker;
import com.sun.tools.javadoc.RootDocImpl;
import com.sun.tools.javadoc.ModifierFilter;
import java.io.IOException; import java.io.IOException;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
...@@ -139,7 +133,7 @@ class Start { ...@@ -139,7 +133,7 @@ class Start {
/** /**
* Main program - external wrapper * Main program - external wrapper
*/ */
int begin(String argv[]) { int begin(String... argv) {
boolean failed = false; boolean failed = false;
try { try {
...@@ -178,7 +172,7 @@ class Start { ...@@ -178,7 +172,7 @@ class Start {
/** /**
* Main program - internal * Main program - internal
*/ */
private boolean parseAndExecute(String argv[]) throws IOException { private boolean parseAndExecute(String... argv) throws IOException {
long tm = System.currentTimeMillis(); long tm = System.currentTimeMillis();
ListBuffer<String> javaNames = new ListBuffer<String>(); ListBuffer<String> javaNames = new ListBuffer<String>();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册