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 2016/02/01 10:04:51 UTC

[3/3] incubator-taverna-language git commit: bundel -> bundle. This closes #26.

bundel -> bundle. This closes #26.


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

Branch: refs/heads/master
Commit: 99156bd0ee294636130c5f12fe42251cbb2c08e4
Parents: 848110e
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Feb 1 09:04:39 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Feb 1 09:04:39 2016 +0000

----------------------------------------------------------------------
 .../java/org/apache/taverna/tavlang/CommandLineTool.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/99156bd0/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 b0bfe3d..068c933 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
@@ -85,7 +85,7 @@ public class CommandLineTool {
 		@Option(name = "--wfbundle", description = "Convert the workflow file to wfbundle")
 		public static boolean isWfbundle = false;
 
-		@Option(name = "--robundle", description = "Convert given bundel in to Research Object bundle")
+		@Option(name = "--robundle", description = "Convert given bundle in to Research Object bundle")
 		public static boolean isRo = false;
 
 		@Option(name = "--structure", description = "Convert the workflow into *.structure")
@@ -104,7 +104,7 @@ public class CommandLineTool {
 		public static String isTrue() {
 			if (isWfdesc)
 				return "wfdesc";
-			else if (isWfbundel)
+			else if (isWfbundle)
 				return "wfbundle";
 			else if (isRo)
 				return "robundle";
@@ -228,8 +228,8 @@ public class CommandLineTool {
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
-//				else if(Filetypes.isIwir || Filetypes.isJson || Filetypes.isStructure || Filetypes.isWfbundel || Filetypes.isWfdesc)
-			} else if(Filetypes.isIwir || Filetypes.isJson || Filetypes.isStructure || Filetypes.isWfbundel || Filetypes.isWfdesc){
+//				else if(Filetypes.isIwir || Filetypes.isJson || Filetypes.isStructure || Filetypes.isWfbundle || Filetypes.isWfdesc)
+			} else if(Filetypes.isIwir || Filetypes.isJson || Filetypes.isStructure || Filetypes.isWfbundle || Filetypes.isWfdesc){
 				if (recurse) {
 					new Scufl2Convert(Filetypes.isTrue(),
 							Optional.getInFile(), Optional.getOutFile());