mirror of
https://github.com/openjdk/jdk.git
synced 2026-03-12 08:53:12 +00:00
Merge
This commit is contained in:
commit
ebc51f0813
@ -45,7 +45,7 @@ public class Main {
|
||||
* Command line interface.
|
||||
* @param args The command line parameters.
|
||||
*/
|
||||
public static void main(String[] args) {
|
||||
public static void main(String... args) {
|
||||
System.exit(execute(args));
|
||||
}
|
||||
|
||||
@ -54,7 +54,7 @@ public class Main {
|
||||
* @param args The command line parameters.
|
||||
* @return The return code.
|
||||
*/
|
||||
public static int execute(String[] args) {
|
||||
public static int execute(String... args) {
|
||||
Start jdoc = new Start();
|
||||
return jdoc.begin(args);
|
||||
}
|
||||
@ -65,7 +65,7 @@ public class Main {
|
||||
* @param args The command line parameters.
|
||||
* @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);
|
||||
return jdoc.begin(args);
|
||||
}
|
||||
@ -79,7 +79,7 @@ public class Main {
|
||||
*/
|
||||
public static int execute(String programName,
|
||||
String defaultDocletClassName,
|
||||
String[] args) {
|
||||
String... args) {
|
||||
Start jdoc = new Start(programName, defaultDocletClassName);
|
||||
return jdoc.begin(args);
|
||||
}
|
||||
@ -99,7 +99,7 @@ public class Main {
|
||||
PrintWriter warnWriter,
|
||||
PrintWriter noticeWriter,
|
||||
String defaultDocletClassName,
|
||||
String[] args) {
|
||||
String... args) {
|
||||
Start jdoc = new Start(programName,
|
||||
errWriter, warnWriter, noticeWriter,
|
||||
defaultDocletClassName);
|
||||
|
||||
@ -28,17 +28,11 @@ package com.sun.tools.javadoc;
|
||||
import com.sun.javadoc.*;
|
||||
|
||||
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.List;
|
||||
import com.sun.tools.javac.util.ListBuffer;
|
||||
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.File;
|
||||
import java.io.FileNotFoundException;
|
||||
@ -139,7 +133,7 @@ class Start {
|
||||
/**
|
||||
* Main program - external wrapper
|
||||
*/
|
||||
int begin(String argv[]) {
|
||||
int begin(String... argv) {
|
||||
boolean failed = false;
|
||||
|
||||
try {
|
||||
@ -178,7 +172,7 @@ class Start {
|
||||
/**
|
||||
* Main program - internal
|
||||
*/
|
||||
private boolean parseAndExecute(String argv[]) throws IOException {
|
||||
private boolean parseAndExecute(String... argv) throws IOException {
|
||||
long tm = System.currentTimeMillis();
|
||||
|
||||
ListBuffer<String> javaNames = new ListBuffer<String>();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user