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/08/21 13:00:02 UTC

[45/50] [abbrv] incubator-taverna-common-activities git commit: getToolName method is removed

getToolName method is removed


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/0d2640dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/0d2640dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/0d2640dc

Branch: refs/heads/cwl-browse
Commit: 0d2640dc2ab2598b420af046957d8da68305ee78
Parents: bf952bd
Author: ThilinaManamgoda <ma...@gmail.com>
Authored: Fri Aug 12 04:26:05 2016 +0530
Committer: ThilinaManamgoda <ma...@gmail.com>
Committed: Fri Aug 12 04:26:05 2016 +0530

----------------------------------------------------------------------
 .../cwl/ui/serviceprovider/CwlServiceDesc.java  |  5 +---
 .../taverna/cwl/utilities/CwlScripting.java     | 31 ++++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0d2640dc/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java
----------------------------------------------------------------------
diff --git a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java
index ab79af3..93a54db 100644
--- a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java
+++ b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java
@@ -44,7 +44,7 @@ public class CwlServiceDesc extends ServiceDescription {
 	public String getDescription() {
 
 		// see whether description is too long
-		if (cwlConfiguration.has(DESCRIPTION)) {
+		if (cwlConfiguration.get(CwlServiceProvider.CWL_CONF).has(DESCRIPTION)) {
 			String description = cwlConfiguration.get(CwlServiceProvider.CWL_CONF).path(DESCRIPTION).asText();
 			if ((description.length() < 40))
 				return description;
@@ -87,9 +87,6 @@ public class CwlServiceDesc extends ServiceDescription {
 
 	private String toolName;
 
-	public String getToolName() {
-		return toolName;
-	}
 
 	public void setToolName(String toolName) {
 		this.toolName = toolName;

http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0d2640dc/taverna-cwl-utilities/src/main/java/org/apache/taverna/cwl/utilities/CwlScripting.java
----------------------------------------------------------------------
diff --git a/taverna-cwl-utilities/src/main/java/org/apache/taverna/cwl/utilities/CwlScripting.java b/taverna-cwl-utilities/src/main/java/org/apache/taverna/cwl/utilities/CwlScripting.java
new file mode 100644
index 0000000..b007647
--- /dev/null
+++ b/taverna-cwl-utilities/src/main/java/org/apache/taverna/cwl/utilities/CwlScripting.java
@@ -0,0 +1,31 @@
+package org.apache.taverna.cwl.utilities;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+public class CwlScripting {
+
+	
+	public static void main(String[] args) {
+		ScriptEngineManager manager = new ScriptEngineManager();
+        ScriptEngine engine = manager.getEngineByName("nashorn");
+        ObjectMapper mapper = new ObjectMapper();
+        ObjectNode node=mapper.createObjectNode();
+        node.put("hello", "world");
+        engine.put("import.yml", node);
+        // evaluate JavaScript code
+        try {
+			engine.eval("print(\"import.yml\");");
+		} catch (ScriptException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	
+}