You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/07/02 18:51:16 UTC
[09/23] incubator-taverna-language git commit: log file error
detection fixed
log file error detection fixed
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/20c25bba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/20c25bba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/20c25bba
Branch: refs/heads/master
Commit: 20c25bbab5030896bcf1417681e80d2e328c6a2a
Parents: 81b720e
Author: Menaka Madushanka <me...@gmail.com>
Authored: Tue Jun 30 03:58:02 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Tue Jun 30 03:58:02 2015 +0530
----------------------------------------------------------------------
.../apache/taverna/tavlang/CommandLineTool.java | 34 ++++++++++++++------
1 file changed, 24 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/20c25bba/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
index cc9b04e..251b4ad 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/CommandLineTool.java
@@ -40,6 +40,7 @@ import org.apache.taverna.tavlang.tools.convert.Scufl2Convert;
import org.apache.taverna.tavlang.tools.convert.ToRobundle;
import org.apache.taverna.tavlang.tools.inspect.ProcessorNames;
import org.apache.taverna.tavlang.tools.inspect.ServiceTypes;
+import org.apache.taverna.tavlang.tools.stats.GetWfStat;
import org.apache.taverna.tavlang.tools.validate.Validate;
import com.google.common.base.Joiner;
@@ -296,6 +297,7 @@ public class CommandLineTool {
// Command for validation
@Command(name = "validate", description = "validate the given workflow")
public static class CommandValidate extends TvnLangTool{
+
@Option(name = { "-l", "--log" }, description = "Specify the file name where results should be stored ([some dir]/log.txt)")
public String file;
@@ -308,13 +310,18 @@ public class CommandLineTool {
@Override
public void execute() {
- File f = new File(file);
+ if(file!=null){
+ File f = new File(file);
- if(!f.isFile()){
- System.out.println("Invalid argument...." + " " + file);
- TvnLangTool command = parser().parse("help", "validate");
- command.execute();
+ if(!f.isFile()){
+ System.out.println("Invalid argument...." + " " + file);
+ TvnLangTool command = parser().parse("help", "validate");
+ command.execute();
+ return;
+ }
+
}
+
Validate validate = new Validate(toValidate, file);
@@ -338,13 +345,20 @@ public class CommandLineTool {
@Override
public void execute() {
// TODO Auto-generated method stub
- File f = new File(file);
+ if(file!=null){
+ File f = new File(file);
- if(!f.isFile()){
- System.out.println("Invalid argument...." + " " + file);
- TvnLangTool command = parser().parse("help", "validate");
- command.execute();
+ if(!f.isFile()){
+ System.out.println("Invalid argument...." + " " + file);
+ TvnLangTool command = parser().parse("help", "validate");
+ command.execute();
+ return;
+ }
+
}
+
+ GetWfStat stat = new GetWfStat(files, file);
+
}
}