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:26 UTC

[19/23] incubator-taverna-language git commit: Stop the conversion if workflow has problems

Stop the conversion if workflow has problems

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/29300ed1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/29300ed1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/29300ed1

Branch: refs/heads/master
Commit: 29300ed172ec4a4ea09a08c476ece35184441ef0
Parents: 81acb4f
Author: Menaka Madushanka <me...@gmail.com>
Authored: Thu Jul 2 01:35:27 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Thu Jul 2 01:35:27 2015 +0530

----------------------------------------------------------------------
 .../main/java/org/apache/taverna/tavlang/CommandLineTool.java  | 2 ++
 .../org/apache/taverna/tavlang/tools/validate/Validate.java    | 6 ++++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/29300ed1/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 3efa17e..97673bf 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
@@ -217,6 +217,8 @@ public class CommandLineTool {
 			//Validate before convert
 			if(validate){
 				Validate validate = new Validate(files, null, false);
+				if(!validate.getCheck())
+					return;
 			}
 			
 			if (Filetypes.isRo) {

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/29300ed1/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
index 8f3fc4f..aa8ef5e 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/validate/Validate.java
@@ -42,6 +42,7 @@ public class Validate {
 	private String nonVerbose = "";
 	private String finalrep = "";
 	private boolean verbose;
+	private boolean check = false;
 	
 
 	public Validate(List<String> files, String file, boolean verbose) {
@@ -116,6 +117,7 @@ public class Validate {
 		
 		if(detect){
 			System.out.println("The workflow bundle has following problems: \n"+report2.toString());
+			check = true;
 		}
 		
 		if(verbose){
@@ -144,5 +146,9 @@ public class Validate {
 		}
 
 	}
+	
+	public boolean getCheck(){
+		return this.check;
+	}
 
 }