Minor edits Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/b894afd7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/b894afd7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/b894afd7
Branch: refs/heads/master Commit: b894afd7d060a1ff8c29418cbe28bb58cfc7d17c Parents: f1ad74a Author: Menaka <menaka12...@gmail.com> Authored: Sun Jun 7 23:21:33 2015 +0530 Committer: Stian Soiland-Reyes <st...@apache.org> Committed: Thu Jun 11 17:33:28 2015 +0100 ---------------------------------------------------------------------- .../taverna/commandline/CommandLineTool.java | 35 ++++++++++++++------ .../taverna/commandline/TavernaCommandline.java | 2 +- .../commandline/test/CommandLineTest.java | 3 +- 3 files changed, 27 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b894afd7/taverna-language-commandline/src/main/java/org/apache/taverna/commandline/CommandLineTool.java ---------------------------------------------------------------------- diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/commandline/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/taverna/commandline/CommandLineTool.java index 46af29f..c636abb 100644 --- a/taverna-language-commandline/src/main/java/org/apache/taverna/commandline/CommandLineTool.java +++ b/taverna-language-commandline/src/main/java/org/apache/taverna/commandline/CommandLineTool.java @@ -46,7 +46,7 @@ import com.google.common.collect.Lists; public class CommandLineTool { private Cli<TvnLangTool> parser(){ - CliBuilder<TvnLangTool> build = Cli.<TvnLangTool>builder("tvnlang") + CliBuilder<TvnLangTool> build = Cli.<TvnLangTool>builder("tavlang") .withDescription("Convert, manage workflows") .withDefaultCommand(HelpCommand.class) .withCommand(CommandConvert.class) @@ -61,7 +61,7 @@ public class CommandLineTool { public CommandLineTool(){}; public void parse(String... args) { - System.out.println("$ tvnlang " + Joiner.on(" ").join(args)); + System.out.println("$ tavlang " + Joiner.on(" ").join(args)); TvnLangTool command = parser().parse(args); command.execute(); System.out.println(); @@ -100,6 +100,20 @@ public class CommandLineTool { else return null; } + } + + public static class Inspect{ + @Option(name = "-servicetypes", description = "List the service types") + public static boolean servicetypes = false; + + @Option(name = "-processornames", description = "List the processor names") + public static boolean processor = false; + + public String getWay(){ + if(servicetypes) return "servicetypes"; + else if (processor) return "processornames"; + else return null; + } } @@ -107,6 +121,10 @@ public class CommandLineTool { //Placeholder for optional parameters: Ex: -i, -o public static class Optional{ + + @Option(name={"-l", "--log"}, description = "Save a results to a file") + public boolean log = false; + //The input file or directory @Option(name = {"-i", "--input"}, description="Input file/ file dir for convertion") public static String in_file_dir; @@ -123,9 +141,6 @@ public class CommandLineTool { return out_file_dir; } -// public boolean isMulti(){ -// return this.multi; -// } } @Command(name = "help", description = "Display help information about Tvarna") @@ -194,7 +209,7 @@ public class CommandLineTool { @Override public void execute() { // TODO Auto-generated method stub - + System.out.println("Apache Taverna Language Command line tool. \nVersion 1.0 "); } } @@ -206,13 +221,14 @@ public class CommandLineTool { @Inject Optional optional = new Optional(); - @Option(name={"-l", "--log"}, description = "Save a results to a file") - public String log_file; + @Inject + Inspect inspect = new Inspect(); @Override public void execute() { // TODO Auto-generated method stub + } } @@ -224,9 +240,6 @@ public class CommandLineTool { @Inject Optional optional = new Optional(); - @Option(name={"-l", "--log"}, description = "Save a results to a file") - public String log_file; - @Override public void execute() { // TODO Auto-generated method stub http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b894afd7/taverna-language-commandline/src/main/java/org/apache/taverna/commandline/TavernaCommandline.java ---------------------------------------------------------------------- diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/commandline/TavernaCommandline.java b/taverna-language-commandline/src/main/java/org/apache/taverna/commandline/TavernaCommandline.java index f7b998e..61beedb 100644 --- a/taverna-language-commandline/src/main/java/org/apache/taverna/commandline/TavernaCommandline.java +++ b/taverna-language-commandline/src/main/java/org/apache/taverna/commandline/TavernaCommandline.java @@ -23,7 +23,7 @@ public class TavernaCommandline { public static void main(String args[]){ CommandLineTool tool = new CommandLineTool(); - tool.parse(args); + tool.parse("version"); } } http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b894afd7/taverna-language-commandline/src/test/java/org/apache/commandline/test/CommandLineTest.java ---------------------------------------------------------------------- diff --git a/taverna-language-commandline/src/test/java/org/apache/commandline/test/CommandLineTest.java b/taverna-language-commandline/src/test/java/org/apache/commandline/test/CommandLineTest.java index 112cbfa..9a07552 100644 --- a/taverna-language-commandline/src/test/java/org/apache/commandline/test/CommandLineTest.java +++ b/taverna-language-commandline/src/test/java/org/apache/commandline/test/CommandLineTest.java @@ -11,13 +11,14 @@ public class CommandLineTest { public void test(){ // Assert commandLineTool.parse(); + commandLineTool.parse("version"); commandLineTool.parse("help"); commandLineTool.parse("help", "convert"); commandLineTool.parse("help", "inspect"); commandLineTool.parse("help", "validate"); commandLineTool.parse("help", "help"); - commandLineTool.parse("convert","-m", "-r", "-wfdesc", "this", "that", "-o", "/files/dir", "-i", "/files0/dir"); + commandLineTool.parse("convert","-m", "-r", "-wfdesc", "-o", "/files/dir", "-i", "/files0/dir"); // commandLineTool.parse(); // commandLineTool.parse(); // commandLineTool.parse();
