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/06/22 16:39:21 UTC
[02/11] incubator-taverna-common-activities git commit: label added
label added
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/495d3ee5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/495d3ee5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/495d3ee5
Branch: refs/heads/cwl-browse
Commit: 495d3ee5398af448fa5eaee308a9a3f66b28eda5
Parents: 63e2c6f
Author: ThilinaManamgoda <ma...@gmail.com>
Authored: Sat Jun 18 15:35:07 2016 +0530
Committer: ThilinaManamgoda <ma...@gmail.com>
Committed: Sat Jun 18 15:35:07 2016 +0530
----------------------------------------------------------------------
.../taverna/cwl/ui/serviceprovider/Testing.java | 17 +++++---
.../ui/view/CwlActivityContextViewFactory.java | 16 +++++++
.../taverna/cwl/ui/view/CwlContextualView.java | 45 ++++++++++++++++----
.../org/apache/taverna/cwl/CwlDumyActivity.java | 19 ++++++---
.../java/org/apache/taverna/cwl/PortDetail.java | 23 ++++++++++
5 files changed, 100 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/495d3ee5/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/Testing.java
----------------------------------------------------------------------
diff --git a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/Testing.java b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/Testing.java
index ef33834..8abca8c 100644
--- a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/Testing.java
+++ b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/Testing.java
@@ -29,7 +29,7 @@ import org.apache.taverna.cwl.CwlActivityConfigurationBean;
import org.yaml.snakeyaml.Yaml;
public class Testing {
- private static final File cwlFilesLocation = new File("/home/maanadev/cwlToolsTesting");
+ private static final File cwlFilesLocation = new File("/home/maanadev/cwlTools");
private static final String INPUTS = "inputs";
private static final String ID = "id";
private static final String TYPE = "type";
@@ -41,6 +41,7 @@ public class Testing {
private static final int DEPTH_0 = 0;
private static final int DEPTH_1 = 1;
private static final int DEPTH_2 = 2;
+ private static final String LABEL = "label";
// public static void main(String[] args) {
// File[] cwlFiles = getCwlFiles();
@@ -76,14 +77,15 @@ public static void main(String[] args) {
File[] cwlFiles = getCwlFiles();
- Map cwlFile = null;
// Load the CWL file using SnakeYaml lib
- Yaml cwlReader = new Yaml();
+ for(File file:cwlFiles)
try {
- cwlFile = (Map) cwlReader.load(new FileInputStream(cwlFiles[0]));
- System.out.println(cwlFile.get("description"));
+ Yaml cwlReader = new Yaml();
+ System.out.println(file.getName());
+ Map cwlFile = (Map) cwlReader.load(new FileInputStream(file));
+ processInputs(cwlFile);
}catch(Exception e){
-
+ System.out.println(e.getMessage());
}
}
private static HashMap<String, Integer> processInputs(Map cwlFile) {
@@ -98,6 +100,9 @@ public static void main(String[] args) {
for (Map input :( ArrayList<Map>)inputs) {
String currentInputId = (String) input.get(ID);
Object typeConfigurations;
+ if(input.containsKey(LABEL)){
+ System.out.println(input.get(LABEL));
+ }
try {
typeConfigurations = input.get(TYPE);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/495d3ee5/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/view/CwlActivityContextViewFactory.java
----------------------------------------------------------------------
diff --git a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/view/CwlActivityContextViewFactory.java b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/view/CwlActivityContextViewFactory.java
index 31c3bc8..ce35c72 100644
--- a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/view/CwlActivityContextViewFactory.java
+++ b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/view/CwlActivityContextViewFactory.java
@@ -1,3 +1,19 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *******************************************************************************/
package org.apache.taverna.cwl.ui.view;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/495d3ee5/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/view/CwlContextualView.java
----------------------------------------------------------------------
diff --git a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/view/CwlContextualView.java b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/view/CwlContextualView.java
index ae4936f..0035183 100644
--- a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/view/CwlContextualView.java
+++ b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/view/CwlContextualView.java
@@ -1,3 +1,19 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *******************************************************************************/
package org.apache.taverna.cwl.ui.view;
import java.awt.BorderLayout;
@@ -13,10 +29,14 @@ import org.apache.taverna.cwl.CwlDumyActivity;
import org.apache.taverna.cwl.PortDetail;
import net.sf.taverna.t2.workbench.ui.actions.activity.HTMLBasedActivityContextualView;
import net.sf.taverna.t2.workflowmodel.processor.activity.Activity;
-
+/*
+ * This class is responsible for producing service detail panel for each tool
+ *
+ * */
public class CwlContextualView extends HTMLBasedActivityContextualView<CwlActivityConfigurationBean> {
private static final String DESCRIPTION = "description";
+ private static final String LABEL = "label";
private final CwlActivityConfigurationBean configurationBean;
private final CwlDumyActivity activity;
@@ -65,7 +85,7 @@ public class CwlContextualView extends HTMLBasedActivityContextualView<CwlActivi
public Action getConfigureAction(final Frame owner) {
return null;
}
-
+ //format long description using html <p> tags
private String paragraphToHtml(String summery, String paragraph) {
summery += "<tr><td colspan='2' align='left'>";
@@ -85,8 +105,12 @@ public class CwlContextualView extends HTMLBasedActivityContextualView<CwlActivi
Map cwlFile = configurationBean.getCwlConfigurations();
String description = "";
+ if (cwlFile.containsKey(LABEL)) {
+ summery += "<tr><th colspan='2' align='left'>Label</th></tr>";
+ summery += "<tr><td colspan='2' align='left'>" + (String) cwlFile.get(LABEL) + "</td></tr>";
+ }
if (cwlFile.containsKey(DESCRIPTION)) {
-
+
description = (String) cwlFile.get(DESCRIPTION);
summery = paragraphToHtml(summery, description);
@@ -95,28 +119,33 @@ public class CwlContextualView extends HTMLBasedActivityContextualView<CwlActivi
summery += "<tr><th colspan='2' align='left'>Inputs</th></tr>";
HashMap<String, PortDetail> inputs = activity.getProcessedInputs();
- if (inputs != null)
+ if (inputs != null && !inputs.isEmpty())
for (String id : inputs.keySet()) {
PortDetail detail = inputs.get(id);
summery += "<tr align='left'><td> ID: " + id + " </td><td>Depth: " + detail.getDepth() + "</td></tr>";
-
+ if (detail.getLabel() != null) {
+ summery += "<tr><td align ='left' colspan ='2'>Label: " + detail.getLabel() + "</td></tr>";
+ }
if (detail.getDescription() != null) {
summery = paragraphToHtml(summery, detail.getDescription());
}
+ // putting a space
summery += "<tr></tr>";
}
summery += "<tr><th colspan='2' align='left'>Outputs</th></tr>";
HashMap<String, PortDetail> outPuts = activity.getProcessedOutputs();
-
- if (outPuts != null)
+
+ if (outPuts != null && !outPuts.isEmpty())
for (String id : outPuts.keySet()) {
PortDetail detail = outPuts.get(id);
summery += "<tr align='left'><td> ID: " + id + " </td><td>Depth: " + detail.getDepth() + "</td></tr>";
-
+ if (detail.getLabel() != null) {
+ summery += "<tr><td align ='left' colspan ='2'>Label: " + detail.getLabel() + "</td></tr>";
+ }
if (detail.getDescription() != null) {
summery = paragraphToHtml(summery, detail.getDescription());
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/495d3ee5/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/CwlDumyActivity.java
----------------------------------------------------------------------
diff --git a/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/CwlDumyActivity.java b/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/CwlDumyActivity.java
index 16ffbb8..e8023f1 100644
--- a/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/CwlDumyActivity.java
+++ b/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/CwlDumyActivity.java
@@ -27,7 +27,6 @@ import org.apache.taverna.workflowmodel.processor.activity.ActivityConfiguration
import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivity;
import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback;
-
public class CwlDumyActivity extends AbstractAsynchronousActivity<CwlActivityConfigurationBean>
implements AsynchronousActivity<CwlActivityConfigurationBean> {
@@ -40,10 +39,10 @@ public class CwlDumyActivity extends AbstractAsynchronousActivity<CwlActivityCon
private static final int DEPTH_0 = 0;
private static final int DEPTH_1 = 1;
private static final int DEPTH_2 = 2;
+ private static final String LABEL = "label";
private HashMap<String, PortDetail> processedInputs;
private HashMap<String, PortDetail> processedOutputs;
-
-
+
public HashMap<String, PortDetail> getProcessedInputs() {
return processedInputs;
}
@@ -60,13 +59,12 @@ public class CwlDumyActivity extends AbstractAsynchronousActivity<CwlActivityCon
this.processedOutputs = processedOutputs;
}
-
@Override
public void configure(CwlActivityConfigurationBean configurationBean) throws ActivityConfigurationException {
removeInputs();
removeOutputs();
Map cwlFile = configurationBean.getCwlConfigurations();
-
+
if (cwlFile != null) {
processedInputs = processInputs(cwlFile);
@@ -104,15 +102,24 @@ public class CwlDumyActivity extends AbstractAsynchronousActivity<CwlActivityCon
HashMap<String, PortDetail> result = new HashMap<>();
if (inputs.getClass() == ArrayList.class) {
- PortDetail detail = new PortDetail();
+
for (Map input : (ArrayList<Map>) inputs) {
+ PortDetail detail = new PortDetail();
+
String currentInputId = (String) input.get(ID);
Object typeConfigurations;
+ //get the parameter description
if (input.containsKey(DESCRIPTION)) {
detail.setDescription((String) input.get(DESCRIPTION));
} else {
detail.setDescription(null);
}
+ //get the parameter label
+ if (input.containsKey(LABEL)) {
+ detail.setLabel((String) input.get(LABEL));
+ } else {
+ detail.setLabel(null);
+ }
try {
typeConfigurations = input.get(TYPE);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/495d3ee5/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/PortDetail.java
----------------------------------------------------------------------
diff --git a/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/PortDetail.java b/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/PortDetail.java
index f42d488..8899344 100644
--- a/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/PortDetail.java
+++ b/taverna-cwl-activity/src/main/java/org/apache/taverna/cwl/PortDetail.java
@@ -1,3 +1,19 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *******************************************************************************/
package org.apache.taverna.cwl;
public class PortDetail {
@@ -6,6 +22,7 @@ public class PortDetail {
private int depth;
private String description;
+ private String label;
public int getDepth() {
return depth;
}
@@ -18,6 +35,12 @@ public class PortDetail {
public void setDescription(String description) {
this.description = description;
}
+ public String getLabel() {
+ return label;
+ }
+ public void setLabel(String label) {
+ this.label = label;
+ }
}