You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@groovy.apache.org by pa...@apache.org on 2015/06/08 03:39:59 UTC
incubator-groovy git commit: formatting
Repository: incubator-groovy
Updated Branches:
refs/heads/master 39687b9d8 -> e593ef34c
formatting
Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/e593ef34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/e593ef34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/e593ef34
Branch: refs/heads/master
Commit: e593ef34ca09b90fdf25db706d0cc0f7fc400d7b
Parents: 39687b9
Author: Paul King <pa...@asert.com.au>
Authored: Mon Jun 8 11:38:52 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Mon Jun 8 11:39:43 2015 +1000
----------------------------------------------------------------------
src/main/groovy/ui/GroovyMain.java | 52 ++++++++++++++++-----------------
1 file changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/e593ef34/src/main/groovy/ui/GroovyMain.java
----------------------------------------------------------------------
diff --git a/src/main/groovy/ui/GroovyMain.java b/src/main/groovy/ui/GroovyMain.java
index 6b73f71..83def81 100644
--- a/src/main/groovy/ui/GroovyMain.java
+++ b/src/main/groovy/ui/GroovyMain.java
@@ -29,7 +29,6 @@ import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.codehaus.groovy.control.CompilationFailedException;
@@ -51,6 +50,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.regex.Pattern;
+import static org.apache.commons.cli.Option.builder;
+
/**
* A Command line to execute groovy.
*
@@ -174,31 +175,30 @@ public class GroovyMain {
* @return an options parser.
*/
private static Options buildOptions() {
- Options options = new Options();
- options.addOption(Option.builder("classpath").hasArg().argName("path").desc("Specify where to find the class files - must be first argument").build());
- options.addOption(Option.builder("cp").longOpt("classpath").hasArg().argName("path").desc("Aliases for '-classpath'").build());
- options.addOption(Option.builder("D").longOpt("define").desc("define a system property").hasArg().argName("name=value").build());
- options.addOption(
- Option.builder().longOpt("disableopt")
- .desc("disables one or all optimization elements. " +
- "optlist can be a comma separated list with the elements: " +
- "all (disables all optimizations), " +
- "int (disable any int based optimizations)")
- .hasArg().argName("optlist").build());
- options.addOption(Option.builder("h").hasArg(false).desc("usage information").longOpt("help").build());
- options.addOption(Option.builder("d").hasArg(false).desc("debug mode will print out full stack traces").longOpt("debug").build());
- options.addOption(Option.builder("v").hasArg(false).desc("display the Groovy and JVM versions").longOpt("version").build());
- options.addOption(Option.builder("c").argName("charset").hasArg().desc("specify the encoding of the files").longOpt("encoding").build());
- options.addOption(Option.builder("e").argName("script").hasArg().desc("specify a command line script").build());
- options.addOption(Option.builder("i").argName("extension").optionalArg(true).desc("modify files in place; create backup if extension is given (e.g. \'.bak\')").build());
- options.addOption(Option.builder("n").hasArg(false).desc("process files line by line using implicit 'line' variable").build());
- options.addOption(Option.builder("p").hasArg(false).desc("process files line by line and print result (see also -n)").build());
- options.addOption(Option.builder("l").argName("port").optionalArg(true).desc("listen on a port and process inbound lines (default: 1960)").build());
- options.addOption(Option.builder("a").argName("splitPattern").optionalArg(true).desc("split lines using splitPattern (default '\\s') using implicit 'split' variable").longOpt("autosplit").build());
- options.addOption(Option.builder().longOpt("indy").desc("enables compilation using invokedynamic").build());
- options.addOption(Option.builder().longOpt("configscript").hasArg().desc("A script for tweaking the configuration options").build());
- options.addOption(Option.builder("b").longOpt("basescript").hasArg().argName("class").desc("Base class name for scripts (must derive from Script)").build());
- return options;
+ return new Options()
+ .addOption(builder("classpath").hasArg().argName("path").desc("Specify where to find the class files - must be first argument").build())
+ .addOption(builder("cp").longOpt("classpath").hasArg().argName("path").desc("Aliases for '-classpath'").build())
+ .addOption(builder("D").longOpt("define").desc("define a system property").hasArg().argName("name=value").build())
+ .addOption(
+ builder().longOpt("disableopt")
+ .desc("disables one or all optimization elements. " +
+ "optlist can be a comma separated list with the elements: " +
+ "all (disables all optimizations), " +
+ "int (disable any int based optimizations)")
+ .hasArg().argName("optlist").build())
+ .addOption(builder("h").hasArg(false).desc("usage information").longOpt("help").build())
+ .addOption(builder("d").hasArg(false).desc("debug mode will print out full stack traces").longOpt("debug").build())
+ .addOption(builder("v").hasArg(false).desc("display the Groovy and JVM versions").longOpt("version").build())
+ .addOption(builder("c").argName("charset").hasArg().desc("specify the encoding of the files").longOpt("encoding").build())
+ .addOption(builder("e").argName("script").hasArg().desc("specify a command line script").build())
+ .addOption(builder("i").argName("extension").optionalArg(true).desc("modify files in place; create backup if extension is given (e.g. \'.bak\')").build())
+ .addOption(builder("n").hasArg(false).desc("process files line by line using implicit 'line' variable").build())
+ .addOption(builder("p").hasArg(false).desc("process files line by line and print result (see also -n)").build())
+ .addOption(builder("l").argName("port").optionalArg(true).desc("listen on a port and process inbound lines (default: 1960)").build())
+ .addOption(builder("a").argName("splitPattern").optionalArg(true).desc("split lines using splitPattern (default '\\s') using implicit 'split' variable").longOpt("autosplit").build())
+ .addOption(builder().longOpt("indy").desc("enables compilation using invokedynamic").build())
+ .addOption(builder().longOpt("configscript").hasArg().desc("A script for tweaking the configuration options").build())
+ .addOption(builder("b").longOpt("basescript").hasArg().argName("class").desc("Base class name for scripts (must derive from Script)").build());
}
private static void setSystemPropertyFrom(final String nameValue) {