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 12:59:37 UTC
[20/50] [abbrv] incubator-taverna-common-activities git commit:
activity problem
activity problem
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/0cb4858d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/0cb4858d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/0cb4858d
Branch: refs/heads/cwl-browse
Commit: 0cb4858d409b667817d91efdd7d79470cd6a8ca5
Parents: 626919d
Author: ThilinaManamgoda <ma...@gmail.com>
Authored: Wed Jul 27 05:34:51 2016 +0530
Committer: ThilinaManamgoda <ma...@gmail.com>
Committed: Wed Jul 27 05:34:51 2016 +0530
----------------------------------------------------------------------
.../apache/taverna/cwl/ui/view/CwlActivityContextViewFactory.java | 2 +-
.../java/org/apache/taverna/cwl/ui/view/CwlContextualView.java | 3 +++
.../src/main/java/org/apache/taverna/cwl/CwlDumyActivity.java | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0cb4858d/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 0e10086..af7ecc2 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
@@ -27,7 +27,7 @@ import org.apache.taverna.workbench.ui.views.contextualviews.ContextualView;
import org.apache.taverna.workbench.ui.views.contextualviews.activity.ContextualViewFactory;
-
+//FIXME generics
public class CwlActivityContextViewFactory implements ContextualViewFactory<Activity> {
public static final URI ACTIVITY_TYPE = URI.create("https://taverna.apache.org/ns/2016/activity/cwl");
private ColourManager colourManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0cb4858d/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 5b8cfaa..43fa557 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
@@ -24,6 +24,8 @@ import java.util.Map;
import javax.swing.Action;
import javax.swing.JComponent;
import javax.swing.JPanel;
+
+import org.apache.taverna.cwl.CwlDumyActivity;
import org.apache.taverna.cwl.ui.serviceprovider.CwlServiceProvider;
import org.apache.taverna.cwl.utilities.CWLUtil;
import org.apache.taverna.cwl.utilities.PortDetail;
@@ -66,6 +68,7 @@ public class CwlContextualView extends HTMLBasedActivityContextualView {
private CWLUtil cwlutil;
public CwlContextualView(Activity activity,ColourManager colourManager) {
+ //FIXME activty=>CWLActivity
super(activity, colourManager);
this.activity = activity;
this.configurationNode = activity.getConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0cb4858d/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 abc6ed5..ac0f832 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
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.taverna.reference.T2Reference;
import org.apache.taverna.workflowmodel.processor.activity.AbstractAsynchronousActivity;
import org.apache.taverna.workflowmodel.processor.activity.ActivityConfigurationException;
+import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivity;
import org.apache.taverna.workflowmodel.processor.activity.AsynchronousActivityCallback;
import com.fasterxml.jackson.databind.JsonNode;