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:49 UTC
[1/3] incubator-taverna-language git commit: Fixing typos and
removing unnecessary comments
Repository: incubator-taverna-language
Updated Branches:
refs/heads/master 32e51f4b7 -> 99156bd0e
Fixing typos and removing unnecessary comments
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/1be6a116
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/1be6a116
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/1be6a116
Branch: refs/heads/master
Commit: 1be6a1160282116717d0debe73cbc40c94305c36
Parents: 32e51f4
Author: menaka <me...@gmail.com>
Authored: Sun Jan 31 21:29:27 2016 +0530
Committer: menaka <me...@gmail.com>
Committed: Sun Jan 31 21:29:27 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/taverna/tavlang/CommandLineTool.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/1be6a116/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 fbfc16f..b6adaf9 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
@@ -67,7 +67,6 @@ public class CommandLineTool {
};
public void parse(String... args) {
-// System.out.println("$ tavlang " + Joiner.on(" ").join(args));
TvnLangTool command = parser().parse(args);
command.execute();
System.out.println();
@@ -83,10 +82,10 @@ public class CommandLineTool {
@Option(name = "--wfdesc", description = "Convert the workflow file to wfdesc-turtle")
public static boolean isWfdesc = false;
- @Option(name = "--wfbundle", description = "Convert the workflow file to wfbundel")
- public static boolean isWfbundel = false;
+ @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 bundel")
+ @Option(name = "--robundle", description = "Convert given bundel in to Research Object bundle")
public static boolean isRo = false;
@Option(name = "--structure", description = "Convert the workflow into *.structure")
@@ -227,7 +226,6 @@ public class CommandLineTool {
try {
new ToRobundle(files, Optional.getOutFile());
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
// else if(Filetypes.isIwir || Filetypes.isJson || Filetypes.isStructure || Filetypes.isWfbundel || Filetypes.isWfdesc)
@@ -280,7 +278,6 @@ public class CommandLineTool {
@Override
public void execute() {
- // TODO Auto-generated method stub
if (Inspect.processor) {
try {
new ProcessorNames(toInspect, file);
@@ -352,7 +349,6 @@ public class CommandLineTool {
@Override
public void execute() {
- // TODO Auto-generated method stub
GetWfStat stat = new GetWfStat(files, file, verbose);
[3/3] incubator-taverna-language git commit: bundel -> bundle. This
closes #26.
Posted by st...@apache.org.
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());
[2/3] incubator-taverna-language git commit: Fixing typos and
removing unnecessary comments
Posted by st...@apache.org.
Fixing typos and removing unnecessary comments
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/848110ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/848110ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/848110ea
Branch: refs/heads/master
Commit: 848110ea45c0fa2241b381912c3064749c81c3cd
Parents: 1be6a11
Author: menaka <me...@gmail.com>
Authored: Sun Jan 31 21:41:54 2016 +0530
Committer: menaka <me...@gmail.com>
Committed: Sun Jan 31 21:41:54 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/taverna/tavlang/CommandLineTool.java | 11 +----------
.../java/org/apache/taverna/tavlang/tools/Tools.java | 9 ---------
.../taverna/tavlang/tools/convert/Scufl2Convert.java | 5 -----
.../apache/taverna/tavlang/tools/convert/ToRobundle.java | 1 -
.../apache/taverna/tavlang/tools/stats/GetWfStat.java | 2 --
.../apache/taverna/tavlang/tools/validate/Validate.java | 3 ---
6 files changed, 1 insertion(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/848110ea/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 b6adaf9..b0bfe3d 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
@@ -255,8 +255,6 @@ public class CommandLineTool {
@Override
public void execute() {
- // TODO Auto-generated method stub
-
System.out.print(getClass().getPackage().getImplementationTitle());
System.out.println(" " + getClass().getPackage().getImplementationVersion());
}
@@ -283,14 +281,12 @@ public class CommandLineTool {
new ProcessorNames(toInspect, file);
} catch (ReaderException | IOException | JAXBException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
} else if (Inspect.servicetypes) {
try {
new ServiceTypes(toInspect, file);
} catch (IOException | ReaderException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
@@ -313,9 +309,6 @@ public class CommandLineTool {
@Option(name = {"-v", "--verbose"}, description = "Verbose mode")
public boolean verbose;
-
-// @Inject
-// Optional optional = new Optional();
// @Arguments(usage = "<option> <input files> <output dir>", description = "Validate the given workflow file/s")
@Arguments(usage = "input files", description = "Validate the given workflow file/s")
@@ -334,9 +327,7 @@ public class CommandLineTool {
//Command for getting workflow stats
@Command (name = "stats", description = "Shows the workflow statistics")
public static class CommandStat extends TvnLangTool{
-//
-// @Option(name={"-wf", "--workflow"}, description ="Specify the input is workflow file or bundle")
-// public boolean isWf;
+
@Option(name = {"-l", "--log"}, description ="Save the workflow statictics in a file")
public String file;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/848110ea/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java
index c708b3c..c78c7a2 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/Tools.java
@@ -30,8 +30,6 @@ public class Tools {
@Override
public String getMediaType(ConvertionTools t) {
- // TODO Auto-generated method stub
-// System.out.println(mediaType);
return this.mediaType;
}
},
@@ -41,8 +39,6 @@ public class Tools {
@Override
public String getMediaType(ConvertionTools t) {
- // TODO Auto-generated method stub
-// System.out.println(mediaType);
return mediaType;
}
},
@@ -61,7 +57,6 @@ public class Tools {
@Override
public String getMediaType(ConvertionTools t) {
- // TODO Auto-generated method stub
return null;
}
@@ -71,8 +66,6 @@ public class Tools {
@Override
public String getMediaType(ConvertionTools t) {
- // TODO Auto-generated method stub
-// System.out.println(mediaType);
return mediaType;
}
},
@@ -82,8 +75,6 @@ public class Tools {
@Override
public String getMediaType(ConvertionTools t) {
- // TODO Auto-generated method stub
-// System.out.println(mediaType);
return mediaType;
}
};
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/848110ea/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 54dbb06..da4dff0 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
@@ -78,7 +78,6 @@ public class Scufl2Convert{
FileUtils.forceMkdir(outFile);
this.output = outFile.getAbsolutePath();
} catch (IOException e1) {
- // TODO Auto-generated catch block
System.err.println("Error: The directory cannot be created...!!!!");
e1.printStackTrace();
}
@@ -88,7 +87,6 @@ public class Scufl2Convert{
FileUtils.forceMkdir(outFile);
} catch (IOException e1) {
- // TODO Auto-generated catch block
System.err.println("Error: The directory cannot be created...!!!!");
e1.printStackTrace();
}
@@ -175,7 +173,6 @@ public class Scufl2Convert{
WorkflowBundleIO wfbio = new WorkflowBundleIO();
String filename = t2File.getName();
filename = filename.replaceFirst("\\..*", this.type);
-// System.out.println(filename);
File scufl2File = new File(outFile.getAbsolutePath(), filename);
WorkflowBundle wfBundle;
@@ -197,10 +194,8 @@ public class Scufl2Convert{
System.out.println(scufl2File.getPath() + " is created.");
}catch (ReaderException e){
System.err.println("Error: Connot read the file");
-// e.printStackTrace();
}catch(IOException e){
System.err.println("Error: File not found");
-// e.printStackTrace();
}catch(WriterException e) {
System.err.println("Error: Cannot write to the file");
// e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/848110ea/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java
index 394f9ec..6ab14bc 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/convert/ToRobundle.java
@@ -50,7 +50,6 @@ public class ToRobundle{
//Recursive conversion
public ToRobundle(String type, String in, String out) {
- // TODO Auto-generated constructor stub
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/848110ea/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
----------------------------------------------------------------------
diff --git a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
index 9dcfa5a..7daa38e 100644
--- a/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
+++ b/taverna-language-commandline/src/main/java/org/apache/taverna/tavlang/tools/stats/GetWfStat.java
@@ -153,7 +153,6 @@ public class GetWfStat {
}
} catch (ReaderException | IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
}
@@ -178,7 +177,6 @@ public class GetWfStat {
writer.close();
System.out.println("Results were saved into " + file.getPath());
} catch (IOException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/848110ea/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 74f960c..fc05e3b 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
@@ -68,11 +68,9 @@ public class Validate {
this.finalrep += validate(io.readBundle(file, null), file.getName());
} catch (ReaderException e) {
- // TODO Auto-generated catch block
System.err.println(e.getMessage());
} catch (IOException e) {
- // TODO Auto-generated catch block
System.err.println("Workflow bundle not found!");
System.err.println(e.getMessage());
@@ -141,7 +139,6 @@ public class Validate {
logwriter.close();
System.out.println("Results were saved into " + logFile.getPath());
} catch (IOException e) {
- // TODO Auto-generated catch block
System.err.println("Error writing to the file \n" + e.getMessage());
}