You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2011/12/18 18:55:41 UTC
svn commit: r1220504 -
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/Workflow.java
Author: chathura
Date: Sun Dec 18 17:55:41 2011
New Revision: 1220504
URL: http://svn.apache.org/viewvc?rev=1220504&view=rev
Log:
Updating workflow with Stream deprecations Bugfix
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/Workflow.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/Workflow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/Workflow.java?rev=1220504&r1=1220503&r2=1220504&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/Workflow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/Workflow.java Sun Dec 18 17:55:41 2011
@@ -163,63 +163,7 @@ public class Workflow implements Cloneab
this.graph = WSGraphFactory.createGraph();
}
- public static Workflow getWorkflow(Workflow parentWorkflow, List<Node> subworkflowNodes, String subworkflowName)
- throws GraphException {
- HashMap<String, Node> nodeMap = new HashMap<String, Node>();
- for (Node node : subworkflowNodes) {
- nodeMap.put(node.getID(), node);
- }
-
- Workflow subWorkflow = parentWorkflow.clone();
- final LinkedList<NodeImpl> genericSubWorkflowNodes = GraphUtil.getGenericSubWorkflowNodes(parentWorkflow
- .getGraph());
- if (null == subworkflowName) {
- subWorkflow.setName(subWorkflow.getName() + "_subWorkflow_" + genericSubWorkflowNodes.size());
- } else {
- subWorkflow.setName(subworkflowName);
- }
- List<NodeImpl> allOldNodes = subWorkflow.getGraph().getNodes();
- LinkedList<NodeImpl> removeList = new LinkedList<NodeImpl>();
- for (NodeImpl nodeImpl : allOldNodes) {
- if (null == nodeMap.get(nodeImpl.getID())) {
- removeList.add(nodeImpl);
- }
- }
- for (NodeImpl nodeImpl : removeList) {
- subWorkflow.removeNode(nodeImpl);
- }
-
- List<NodeImpl> nodes = subWorkflow.getGraph().getNodes();
- for (int i = 0; i < nodes.size(); ++i) {
- NodeImpl nodeImpl = nodes.get(i);
- List<DataPort> inputPorts = nodeImpl.getInputPorts();
- int count = 0;
- for (DataPort dataPort : inputPorts) {
- if (dataPort.getFromNode() == null) {
- Node inputNode = subWorkflow.addNode(new InputComponent());
- inputNode.setPosition(new Point(Math.max(0, nodeImpl.getPosition().x - 200),
- nodeImpl.getPosition().y + count * 50));
- subWorkflow.getGraph().addEdge(inputNode.getOutputPort(0), dataPort);
- ++count;
- }
- }
- count = 0;
- List<DataPort> outputPorts = nodeImpl.getOutputPorts();
- for (DataPort dataPort : outputPorts) {
- if (dataPort.getToNodes().size() == 0) {
- Node outputNode = subWorkflow.addNode(new OutputComponent());
- outputNode.setPosition(new Point(nodeImpl.getPosition().x + 200, nodeImpl.getPosition().y + count
- * 50));
- subWorkflow.getGraph().addEdge(dataPort, outputNode.getInputPort(0));
- ++count;
- }
- }
-
- }
-
- return subWorkflow;
- }
-
+
/**
* Constructs a Workflow.
*
@@ -251,11 +195,6 @@ public class Workflow implements Cloneab
parse(workflowElement);
}
- public HashMap<String, LinkedList<Node>> partition() throws XBayaException {
- HashMap<String, LinkedList<Node>> partitionSets = this.graph.labelIntroduceJoinsAndGetSubSets();
- return partitionSets;
-
- }
/**
* This is used for ODE