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

[03/23] incubator-taverna-language git commit: Input file type detection restored

Input file type detection restored

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

Branch: refs/heads/master
Commit: 8aaa7f27b6043669812dd20ec04fd57d4ec9f7eb
Parents: ec51e35
Author: Menaka Madushanka <me...@gmail.com>
Authored: Thu Jun 25 22:51:17 2015 +0530
Committer: Menaka Madushanka <me...@gmail.com>
Committed: Thu Jun 25 22:51:17 2015 +0530

----------------------------------------------------------------------
 .../taverna/tavlang/tools/convert/Scufl2Convert.java      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/8aaa7f27/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
index d7267a3..cefdd67 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/Scufl2Convert.java
@@ -167,11 +167,11 @@ public class Scufl2Convert{
 	public void convertFile(File t2File, File outFile){
 		
 		//Check weather the input files are in valid format...!!!
-//		String ext = FilenameUtils.getExtension(t2File.getName());
-//		if(!ext.equals("t2flow")||!ext.equals("wfbundle")){
-//			System.err.println("Invalid input file format...!!!");
-//			return;
-//		}
+		String ext = FilenameUtils.getExtension(t2File.getName());
+		if(!ext.equalsIgnoreCase("t2flow")&&!ext.equalsIgnoreCase("wfbundle")){
+			System.err.println("Invalid input file format...!!!");
+			return;
+		}
 		
 		WorkflowBundleIO wfbio = new WorkflowBundleIO();
 		String filename = t2File.getName();