Changed class 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/56d6d0d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/56d6d0d1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/56d6d0d1
Branch: refs/heads/master Commit: 56d6d0d17fc5f06116b937620e0ad9b2853952b3 Parents: a246f81 Author: menaka121 <menaka12...@gmail.com> Authored: Thu Jun 11 16:16:23 2015 +0530 Committer: Stian Soiland-Reyes <st...@apache.org> Committed: Thu Jun 11 17:33:29 2015 +0100 ---------------------------------------------------------------------- .../tavlang/commandline/CommandLineTool.java | 22 +++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/56d6d0d1/taverna-language-commandline/src/main/java/org/apache/tavlang/commandline/CommandLineTool.java ---------------------------------------------------------------------- diff --git a/taverna-language-commandline/src/main/java/org/apache/tavlang/commandline/CommandLineTool.java b/taverna-language-commandline/src/main/java/org/apache/tavlang/commandline/CommandLineTool.java index 3145e4d..e121cce 100644 --- a/taverna-language-commandline/src/main/java/org/apache/tavlang/commandline/CommandLineTool.java +++ b/taverna-language-commandline/src/main/java/org/apache/tavlang/commandline/CommandLineTool.java @@ -38,7 +38,8 @@ import javax.xml.bind.JAXBException; import org.apache.taverna.scufl2.api.io.ReaderException; import org.apache.tavlang.commandline.tools.Tools; import org.apache.tavlang.commandline.tools.Tools.ConvertionTools; -import org.apache.tavlang.commandline.tools.convert.ToWfbundle; +import org.apache.tavlang.commandline.tools.convert.ToRobundle; +import org.apache.tavlang.commandline.tools.convert.Scufl2Convert; import org.apache.tavlang.commandline.tools.inspect.ProcessorNames; import org.apache.tavlang.commandline.tools.inspect.ServiceTypes; @@ -181,15 +182,22 @@ public class CommandLineTool { @Override public void execute(){ - ToWfbundle bn; - if(!filetypes.isJson || !filetypes.isRo){ + Scufl2Convert bn; + if(filetypes.isJson ){ + + }else if(filetypes.isRo){ + try { + ToRobundle ro = new ToRobundle(files, optional.getOutFile()); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + }else{ if(recurse){ - bn = new ToWfbundle(filetypes.isTrue(), optional.getInFile(), optional.getOutFile()); + bn = new Scufl2Convert(filetypes.isTrue(), optional.getInFile(), optional.getOutFile()); }else{ - bn = new ToWfbundle(filetypes.isTrue(), files, optional.getOutFile()); + bn = new Scufl2Convert(filetypes.isTrue(), files, optional.getOutFile()); } - }else{ - System.out.println("To be implemented"); } }
