airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1330848 - /incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/InterpreterUtil.java
Date Thu, 26 Apr 2012 13:41:35 GMT
Author: lahiru
Date: Thu Apr 26 13:41:34 2012
New Revision: 1330848

URL: http://svn.apache.org/viewvc?rev=1330848&view=rev
Log:
reverting commit 1329916, this breaks the invocation of the next node after a endforEach,
during output reading.

Modified:
    incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/InterpreterUtil.java

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/InterpreterUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/InterpreterUtil.java?rev=1330848&r1=1330847&r2=1330848&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/InterpreterUtil.java
(original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/InterpreterUtil.java
Thu Apr 26 13:41:34 2012
@@ -20,14 +20,9 @@
 */
 package org.apache.airavata.xbaya.util;
 
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
+import java.awt.*;
+import java.util.*;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.airavata.xbaya.XBayaException;
 import org.apache.airavata.xbaya.XBayaRuntimeException;
@@ -36,6 +31,7 @@ import org.apache.airavata.xbaya.graph.N
 import org.apache.airavata.xbaya.graph.amazon.InstanceNode;
 import org.apache.airavata.xbaya.graph.gui.NodeGUI;
 import org.apache.airavata.xbaya.graph.impl.NodeImpl;
+import org.apache.airavata.xbaya.graph.subworkflow.SubWorkflowNode;
 import org.apache.airavata.xbaya.graph.system.ConstantNode;
 import org.apache.airavata.xbaya.graph.system.EndForEachNode;
 import org.apache.airavata.xbaya.graph.system.EndifNode;
@@ -53,8 +49,8 @@ import org.apache.airavata.xbaya.invoker
 import org.apache.airavata.xbaya.invoker.WorkflowInvokerWrapperForGFacInvoker;
 import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler;
 import org.xmlpull.infoset.XmlElement;
-import org.xmlpull.infoset.impl.XmlElementWithViewsImpl;
 
+import org.xmlpull.infoset.impl.XmlElementWithViewsImpl;
 import xsul5.XmlConstants;
 import xsul5.wsdl.WsdlPort;
 import xsul5.wsdl.WsdlService;
@@ -138,9 +134,10 @@ public class InterpreterUtil {
                     if(forEachInputNode.getInputPort(index) instanceof SystemDataPort){
                        outputName = ((SystemDataPort)forEachInputNode.getInputPort(index)).getWSComponentPort().getName();
                     }else if(forEachInputNode.getInputPort(index) instanceof WSPort){
-                    	   outputName = ((WSPort)forEachInputNode.getInputPort(index)).getComponentPort().getName();
+                         outputName = ((SystemDataPort)forEachInputNode.getInputPort(
+                        forEachInputNode.getOutputPorts().indexOf(inputPort.getEdge(0).getFromPort()))).getWSComponentPort().getName();
                     }
-                    returnValForProvenance = workflowInvoker
+					returnValForProvenance = workflowInvoker
 							.getOutput(outputName);
 					XmlElement msgElmt = XmlConstants.BUILDER
 							.parseFragmentFromString("<temp>"
@@ -188,9 +185,11 @@ public class InterpreterUtil {
 			outputVal = "";
 			Invoker workflowInvoker = invokerMap.get(fromNode);
 			String outputName = "";
-			if (inputPort instanceof SystemDataPort) {
+            if (inputPort instanceof SystemDataPort) {
                 outputName = ((SystemDataPort) inputPort).getWSComponentPort().getName();
-                 outputName = ((SystemDataPort)fromNode.getInputPort(
+
+            } else if (inputPort instanceof WSPort) {
+                outputName = ((SystemDataPort)fromNode.getInputPort(
                         fromNode.getOutputPorts().indexOf(inputPort.getEdge(0).getFromPort()))).getWSComponentPort().getName();
             }
 			XmlElement msgElmt = XmlConstants.BUILDER



Mime
View raw message