You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2012/06/29 00:14:31 UTC
svn commit: r1355181 - in
/incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system:
DoWhileNode.java EndDoWhileNode.java
Author: raminder
Date: Thu Jun 28 22:14:30 2012
New Revision: 1355181
URL: http://svn.apache.org/viewvc?rev=1355181&view=rev
Log:
organized imports and fixed AIRAVATA-505
Modified:
incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DoWhileNode.java
incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java
Modified: incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DoWhileNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DoWhileNode.java?rev=1355181&r1=1355180&r2=1355181&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DoWhileNode.java (original)
+++ incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/DoWhileNode.java Thu Jun 28 22:14:30 2012
@@ -23,22 +23,13 @@ package org.apache.airavata.workflow.mod
import java.util.List;
-import javax.xml.namespace.QName;
-
-import org.apache.airavata.common.utils.WSConstants;
import org.apache.airavata.workflow.model.component.ComponentDataPort;
import org.apache.airavata.workflow.model.component.system.DoWhileComponent;
-import org.apache.airavata.workflow.model.exceptions.WorkflowRuntimeException;
-import org.apache.airavata.workflow.model.graph.DataEdge;
import org.apache.airavata.workflow.model.graph.DataPort;
-import org.apache.airavata.workflow.model.graph.EPRPort;
-import org.apache.airavata.workflow.model.graph.Edge;
import org.apache.airavata.workflow.model.graph.Graph;
import org.apache.airavata.workflow.model.graph.GraphException;
import org.apache.airavata.workflow.model.graph.GraphSchema;
import org.apache.airavata.workflow.model.graph.Node;
-import org.apache.airavata.workflow.model.graph.Port;
-import org.apache.airavata.workflow.model.graph.Port.Kind;
import org.xmlpull.infoset.XmlElement;
public class DoWhileNode extends SystemNode {
@@ -145,7 +136,6 @@ public class DoWhileNode extends SystemN
super.parseConfiguration(configElement);
XmlElement element = configElement.element(null, XPATH_TAG_NAME);
if (element != null) {
- // TODO
this.xpath = element.requiredText();
}
}
Modified: incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java?rev=1355181&r1=1355180&r2=1355181&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java (original)
+++ incubator/airavata/trunk/modules/workflow-model/workflow-model-core/src/main/java/org/apache/airavata/workflow/model/graph/system/EndDoWhileNode.java Thu Jun 28 22:14:30 2012
@@ -231,7 +231,7 @@ public class EndDoWhileNode extends Syst
@Override
protected XmlElement toXML() {
XmlElement nodeElement = super.toXML();
- nodeElement.setAttributeValue(GraphSchema.NS, GraphSchema.NODE_TYPE_ATTRIBUTE, GraphSchema.NODE_TYPE_MERGE);
+ nodeElement.setAttributeValue(GraphSchema.NS, GraphSchema.NODE_TYPE_ATTRIBUTE, GraphSchema.NODE_TYPE_ENDDOWHILE);
return nodeElement;
}