You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/05/17 15:07:43 UTC
svn commit: r1339587 [3/3] - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
component/ component/dynamic/ component/gui/ component/registry/
component/system/ experiment/gui/ gpel/script/ graph/ graph/amazon/ gr...
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicInvoker.java (from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/dynamic/DynamicInvoker.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicInvoker.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicInvoker.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/dynamic/DynamicInvoker.java&r1=1338688&r2=1339587&rev=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/dynamic/DynamicInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicInvoker.java Thu May 17 13:07:39 2012
@@ -19,14 +19,13 @@
*
*/
-package org.apache.airavata.xbaya.component.dynamic;
+package org.apache.airavata.xbaya.invoker;
import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.invoker.Invoker;
import xsul.wsif.WSIFMessage;
import xsul.xwsif_runtime.WSIFClient;
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicServiceCreator.java (from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicServiceCreator.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicServiceCreator.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicServiceCreator.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicServiceCreator.java&r1=1338688&r2=1339587&rev=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicServiceCreator.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicServiceCreator.java Thu May 17 13:07:39 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.graph.dynamic;
+package org.apache.airavata.xbaya.invoker;
import java.io.File;
import java.net.URI;
@@ -27,7 +27,6 @@ import java.net.URI;
import javax.xml.namespace.QName;
import org.apache.airavata.xbaya.XBayaException;
-import org.apache.airavata.xbaya.invoker.Invoker;
import org.apache.airavata.xbaya.invoker.factory.InvokerFactory;
import xsul.wsdl.WsdlDefinitions;
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClient.java (from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClient.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClient.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java&r1=1338688&r2=1339587&rev=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClient.java Thu May 17 13:07:39 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.ode;
+package org.apache.airavata.xbaya.invoker;
import java.net.URI;
import java.util.LinkedList;
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java (from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClientUtil.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClientUtil.java&r1=1338688&r2=1339587&rev=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClientUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java Thu May 17 13:07:39 2012
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.airavata.xbaya.ode;
+package org.apache.airavata.xbaya.invoker;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.xbaya.XBayaConstants;
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java (from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java&r1=1338688&r2=1339587&rev=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java Thu May 17 13:07:39 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.ode;
+package org.apache.airavata.xbaya.invoker;
import java.net.URI;
import java.util.List;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/StandaloneServiceNotificationSender.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/StandaloneServiceNotificationSender.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/StandaloneServiceNotificationSender.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/StandaloneServiceNotificationSender.java Thu May 17 13:07:39 2012
@@ -21,17 +21,16 @@
package org.apache.airavata.xbaya.jython.lib;
-import java.awt.Color;
-import java.net.URI;
-
-import org.apache.airavata.xbaya.XBayaConstants;
-import org.apache.airavata.xbaya.graph.Node;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
-import org.apache.airavata.xbaya.wf.Workflow;
-import org.apache.axis2.addressing.EndpointReference;
-
-import xsul.wsif.WSIFMessage;
+import java.net.URI;
+
+import org.apache.airavata.xbaya.XBayaConstants;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.graph.gui.NodeGUI;
+import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
+import org.apache.airavata.xbaya.wf.Workflow;
+import org.apache.axis2.addressing.EndpointReference;
+
+import xsul.wsif.WSIFMessage;
public class StandaloneServiceNotificationSender implements ServiceNotifiable {
@@ -63,31 +62,35 @@ public class StandaloneServiceNotificati
@Override
public void invokingService(WSIFMessage inputs) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.EXECUTING.color);
+ getNodeGUI().setBodyColor(NodeState.EXECUTING.color);
}
@Override
public void serviceFinished(WSIFMessage outputs) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FINISHED.color);
+ getNodeGUI().setBodyColor(NodeState.FINISHED.color);
}
@Override
public void invocationFailed(String message, Throwable e) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
+ getNodeGUI().setBodyColor(NodeState.FAILED.color);
}
@Override
public void receivedFault(String message) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
+ getNodeGUI().setBodyColor(NodeState.FAILED.color);
}
@Override
public void receivedFault(WSIFMessage fault) {
- this.workflow.getGraph().getNode(this.serviceID).getGUI().setBodyColor(NodeState.FAILED.color);
+ getNodeGUI().setBodyColor(NodeState.FAILED.color);
- }
+ }
+
+ private NodeGUI getNodeGUI() {
+ return NodeController.getGUI(this.workflow.getGraph().getNode(this.serviceID));
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java Thu May 17 13:07:39 2012
@@ -48,7 +48,6 @@ import org.apache.airavata.xbaya.gui.Err
import org.apache.airavata.xbaya.gui.ToolbarButton;
import org.apache.airavata.xbaya.gui.XBayaExecutionModeListener;
import org.apache.airavata.xbaya.gui.XBayaToolBar;
-import org.apache.airavata.xbaya.interpretor.XBayaExecutionState;
import org.apache.airavata.xbaya.jython.gui.JythonRunnerWindow;
import org.apache.airavata.xbaya.menues.MenuIcons;
import org.apache.airavata.xbaya.monitor.Monitor;
@@ -56,6 +55,7 @@ import org.apache.airavata.xbaya.monitor
import org.apache.airavata.xbaya.monitor.MonitorException;
import org.apache.airavata.xbaya.monitor.gui.MonitorConfigurationWindow;
import org.apache.airavata.xbaya.monitor.gui.MonitorStarter;
+import org.apache.airavata.xbaya.wf.WorkflowExecutionState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -313,7 +313,7 @@ public class RunMenuItem implements Eve
int count = 0;
//there is a possibility the ealier run is not yet cleanedup yet.. so wait until it finishes
// and sets the execution state to NONE as the last task of scheduleDynamically
- while(engine.getWorkflow().getExecutionState() != XBayaExecutionState.NONE){
+ while(engine.getWorkflow().getExecutionState() != WorkflowExecutionState.NONE){
try {
Thread.sleep(500);
} catch (InterruptedException e) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/WorkflowFiler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/WorkflowFiler.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/WorkflowFiler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/WorkflowFiler.java Thu May 17 13:07:39 2012
@@ -107,8 +107,6 @@ public class WorkflowFiler {
} else {
XmlElement workflowElement = XMLUtil.loadXML(file);
workflow = new Workflow(workflowElement);
- engine.getConfiguration().registerExecutionModeChangeListener(workflow);
- workflow.executionModeChanged(engine.getConfiguration());
}
GraphCanvas newGraphCanvas = engine.getGUI().newGraphCanvas(true);
newGraphCanvas.setWorkflow(workflow);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java Thu May 17 13:07:39 2012
@@ -37,6 +37,7 @@ import org.apache.airavata.xbaya.compone
import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.graph.Node;
import org.apache.airavata.xbaya.graph.Port;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.graph.impl.PortImpl;
import org.apache.airavata.xbaya.graph.system.InputNode;
import org.apache.airavata.xbaya.graph.util.GraphUtil;
@@ -133,7 +134,7 @@ public class WorkflowModifier {
private void removeFinishedNodes(WSGraph originalGraph, WSGraph graph) throws GraphException {
ArrayList<Node> finishedNodes = new ArrayList<Node>();
for (Node node : originalGraph.getNodes()) {
- Color color = node.getGUI().getBodyColor();
+ Color color = NodeController.getGUI(node).getBodyColor();
if (NodeState.FINISHED.color.equals(color)) {
finishedNodes.add(node);
}
@@ -184,7 +185,7 @@ public class WorkflowModifier {
graph.addEdge(inputNode.getPort(), toPort);
if (first) {
first = false;
- Point position = originalToPort.getGUI().getPosition();
+ Point position = NodeController.getGUI(originalToPort).getPosition();
Point inputNodePosition = new Point(0, position.y);
inputNode.setPosition(inputNodePosition);
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java Thu May 17 13:07:39 2012
@@ -45,6 +45,7 @@ import org.apache.airavata.xbaya.graph.G
import org.apache.airavata.xbaya.graph.Node;
import org.apache.airavata.xbaya.graph.Port;
import org.apache.airavata.xbaya.graph.amazon.InstanceNode;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.graph.gui.GraphCanvas;
import org.apache.airavata.xbaya.graph.gui.NodeGUI;
import org.apache.airavata.xbaya.graph.impl.NodeImpl;
@@ -266,18 +267,18 @@ public class MonitorEventHandler impleme
// workflowStarted(graph, forward);
LinkedList<InputNode> inputNodes = getInputNodes(graph);
for (InputNode inputNode : inputNodes) {
- inputNode.getGUI().setToken(instanceName, NodeState.FINISHED);
+ NodeController.getGUI(inputNode).setToken(instanceName, NodeState.FINISHED);
}
} else if (type == MonitorUtil.EventType.WORKFLOW_INITIALIZED) {
// workflowStarted(graph, forward);
LinkedList<InputNode> inputNodes = getInputNodes(graph);
for (InputNode inputNode : inputNodes) {
- inputNode.getGUI().setToken(instanceName, NodeState.FINISHED);
+ NodeController.getGUI(inputNode).setToken(instanceName, NodeState.FINISHED);
}
} else if (type == MonitorUtil.EventType.WORKFLOW_TERMINATED) {
LinkedList<OutputNode> outputNodes = getOutputNodes(graph);
for (OutputNode outputNode : outputNodes) {
- outputNode.getGUI().setToken(instanceName, NodeState.EXECUTING);
+ NodeController.getGUI(outputNode).setToken(instanceName, NodeState.EXECUTING);
}
} else if (type == EventType.INVOKING_SERVICE
// TODO this should be removed when GPEL sends all notification
@@ -286,7 +287,7 @@ public class MonitorEventHandler impleme
if (node == null) {
logger.warn("There is no node that has ID, " + nodeID);
} else {
- node.getGUI().setToken(instanceName, NodeState.EXECUTING);
+ NodeController.getGUI(node).setToken(instanceName, NodeState.EXECUTING);
}
} else if (type == MonitorUtil.EventType.RECEIVED_RESULT
// TODO this should be removed when GPEL sends all notification
@@ -295,7 +296,7 @@ public class MonitorEventHandler impleme
if (node == null) {
logger.warn("There is no node that has ID, " + nodeID);
} else {
- node.getGUI().setToken(instanceName, NodeState.FINISHED);
+ NodeController.getGUI(node).setToken(instanceName, NodeState.FINISHED);
}
} else if (type == EventType.INVOKING_SERVICE_FAILED || type == EventType.RECEIVED_FAULT
// TODO
@@ -303,7 +304,7 @@ public class MonitorEventHandler impleme
if (node == null) {
logger.warn("There is no node that has ID, " + nodeID);
} else {
- node.getGUI().setToken(instanceName, NodeState.FAILED);
+ NodeController.getGUI(node).setToken(instanceName, NodeState.FAILED);
}
} else if (type == MonitorUtil.EventType.RESOURCE_MAPPING) {
if (node == null) {
@@ -462,7 +463,7 @@ public class MonitorEventHandler impleme
private void nodeStarted(Node node, boolean forward) {
if (forward) {
- if (!node.getGUI().getBodyColor().equals(NodeState.FINISHED.color)) {
+ if (!NodeController.getGUI(node).getBodyColor().equals(NodeState.FINISHED.color)) {
executeNode(node);
finishPredecessorNodes(node);
}
@@ -492,7 +493,7 @@ public class MonitorEventHandler impleme
private void nodeResourceMapped(Node node, XmlElement event, boolean forward) {
String resource = MonitorUtil.getMappedResource(event);
String retryCount = MonitorUtil.getRetryCount(event);
- NodeGUI nodeGUI = node.getGUI();
+ NodeGUI nodeGUI = NodeController.getGUI(node);
if (forward) {
LinkedList<ResourcePaintable> paintables = this.resourcePaintableMap.get(node);
if (paintables == null) {
@@ -537,20 +538,20 @@ public class MonitorEventHandler impleme
}
private void executeNode(Node node) {
- node.getGUI().setBodyColor(NodeState.EXECUTING.color);
+ NodeController.getGUI(node).setBodyColor(NodeState.EXECUTING.color);
}
private void finishNode(Node node) {
- node.getGUI().setBodyColor(NodeState.FINISHED.color);
+ NodeController.getGUI(node).setBodyColor(NodeState.FINISHED.color);
}
private void failNode(Node node) {
- node.getGUI().setBodyColor(NodeState.FAILED.color);
+ NodeController.getGUI(node).setBodyColor(NodeState.FAILED.color);
}
private void resetNode(Node node) {
- node.getGUI().setBodyColor(NodeGUI.DEFAULT_BODY_COLOR);
- node.getGUI().resetTokens();
+ NodeController.getGUI(node).setBodyColor(NodeGUI.DEFAULT_BODY_COLOR);
+ NodeController.getGUI(node).resetTokens();
}
/**
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEInvokerWindow.java (from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEInvokerWindow.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEInvokerWindow.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java&r1=1338688&r2=1339587&rev=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEInvokerWindow.java Thu May 17 13:07:39 2012
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.ode;
+package org.apache.airavata.xbaya.ode.gui;
import java.awt.event.ActionEvent;
import java.net.URI;
@@ -40,7 +40,6 @@ import javax.xml.namespace.QName;
import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.xbaya.XBayaConfiguration;
-import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.component.ComponentException;
import org.apache.airavata.xbaya.component.ws.WSComponentPort;
@@ -54,6 +53,7 @@ import org.apache.airavata.xbaya.gui.XBa
import org.apache.airavata.xbaya.gui.XBayaTextArea;
import org.apache.airavata.xbaya.gui.XBayaTextComponent;
import org.apache.airavata.xbaya.gui.XBayaTextField;
+import org.apache.airavata.xbaya.invoker.ODEInvoker;
import org.apache.airavata.xbaya.lead.LEADTypes;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.myproxy.MyProxyClient;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java Thu May 17 13:07:39 2012
@@ -33,6 +33,7 @@ import org.apache.airavata.xbaya.concurr
import org.apache.airavata.xbaya.graph.DataPort;
import org.apache.airavata.xbaya.graph.ForEachExecutableNode;
import org.apache.airavata.xbaya.graph.Node;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.graph.system.EndForEachNode;
import org.apache.airavata.xbaya.graph.system.ForEachNode;
import org.apache.airavata.xbaya.graph.system.InputNode;
@@ -81,7 +82,7 @@ public final class ProvenanceWrite imple
}
public boolean isReady() {
- return this.node.isFinished() && invokerMap.get(node) != null;
+ return NodeController.isFinished(this.node) && invokerMap.get(node) != null;
}
private void saveNodeOutputs(Node node,
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java Thu May 17 13:07:39 2012
@@ -53,6 +53,7 @@ import org.apache.airavata.xbaya.file.XB
import org.apache.airavata.xbaya.gpel.DSCUtil;
import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.graph.Node;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.graph.gui.GraphCanvas;
import org.apache.airavata.xbaya.graph.impl.NodeImpl;
import org.apache.airavata.xbaya.graph.ws.WSGraph;
@@ -67,7 +68,6 @@ import org.apache.airavata.xbaya.test.se
import org.apache.airavata.xbaya.test.util.WorkflowCreator;
import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.airavata.xbaya.workflow.WorkflowClient;
-import org.apache.axis2.addressing.EndpointReference;
import org.apache.xmlbeans.XmlObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -203,9 +203,9 @@ public class WorkflowModificationTestCas
sendNotification(adderWSDL, adder1ID, "add", inputMap1, outputMap1, notifier);
// These are needed because without GUI, the nodes' color won't be
// changed.
- a.getGUI().setBodyColor(NodeState.FINISHED.color);
- b.getGUI().setBodyColor(NodeState.FINISHED.color);
- adder.getGUI().setBodyColor(NodeState.FINISHED.color);
+ NodeController.getGUI(a).setBodyColor(NodeState.FINISHED.color);
+ NodeController.getGUI(b).setBodyColor(NodeState.FINISHED.color);
+ NodeController.getGUI(adder).setBodyColor(NodeState.FINISHED.color);
repaintAndWait(3);
HashMap<String, String> inputMap2 = new HashMap<String, String>();
@@ -215,9 +215,9 @@ public class WorkflowModificationTestCas
outputMap2.put("z", "9");
sendNotification(adderWSDL, adder2ID, "add", inputMap2, outputMap2, notifier);
- c.getGUI().setBodyColor(NodeState.FINISHED.color);
- d.getGUI().setBodyColor(NodeState.FINISHED.color);
- adder2.getGUI().setBodyColor(NodeState.FINISHED.color);
+ NodeController.getGUI(c).setBodyColor(NodeState.FINISHED.color);
+ NodeController.getGUI(d).setBodyColor(NodeState.FINISHED.color);
+ NodeController.getGUI(adder2).setBodyColor(NodeState.FINISHED.color);
repaintAndWait(3);
}
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=1339587&r1=1339586&r2=1339587&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 May 17 13:07:39 2012
@@ -20,25 +20,30 @@
*/
package org.apache.airavata.xbaya.util;
-import java.awt.*;
-import java.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.util.List;
+import java.util.Map;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.graph.DataPort;
import org.apache.airavata.xbaya.graph.Node;
import org.apache.airavata.xbaya.graph.amazon.InstanceNode;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
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.DifferedInputNode;
import org.apache.airavata.xbaya.graph.system.EndForEachNode;
import org.apache.airavata.xbaya.graph.system.EndifNode;
import org.apache.airavata.xbaya.graph.system.ForEachNode;
import org.apache.airavata.xbaya.graph.system.InputNode;
import org.apache.airavata.xbaya.graph.system.SystemDataPort;
-import org.apache.airavata.xbaya.graph.system.gui.DifferedInputNode;
import org.apache.airavata.xbaya.graph.ws.WSGraph;
import org.apache.airavata.xbaya.graph.ws.WSNode;
import org.apache.airavata.xbaya.graph.ws.WSPort;
@@ -49,8 +54,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 xsul5.XmlConstants;
import xsul5.wsdl.WsdlPort;
import xsul5.wsdl.WsdlService;
@@ -367,7 +372,7 @@ public class InterpreterUtil {
ArrayList<Node> list = new ArrayList<Node>();
List<NodeImpl> nodes = graph.getNodes();
for (Node node : nodes) {
- if (node.getGUI().getBodyColor() == color) {
+ if (NodeController.getGUI(node).getBodyColor() == color) {
list.add(node);
}
}
@@ -390,7 +395,7 @@ public class InterpreterUtil {
int sum = 0;
List<NodeImpl> nodes = graph.getNodes();
for (Node node : nodes) {
- if (node.getGUI().getBodyColor() == color) {
+ if (NodeController.getGUI(node).getBodyColor() == color) {
++sum;
}
}
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=1339587&r1=1339586&r2=1339587&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 Thu May 17 13:07:39 2012
@@ -21,7 +21,6 @@
package org.apache.airavata.xbaya.wf;
-import java.awt.Point;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -31,7 +30,6 @@ import java.net.URISyntaxException;
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -42,23 +40,18 @@ import org.apache.airavata.common.except
import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.common.utils.WSDLUtil;
import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.xbaya.XBayaConfiguration;
-import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.XBayaVersion;
import org.apache.airavata.xbaya.component.Component;
import org.apache.airavata.xbaya.component.ComponentException;
-import org.apache.airavata.xbaya.component.system.InputComponent;
-import org.apache.airavata.xbaya.component.system.OutputComponent;
import org.apache.airavata.xbaya.component.ws.WSComponent;
import org.apache.airavata.xbaya.component.ws.WSComponentFactory;
import org.apache.airavata.xbaya.component.ws.WSComponentKey;
import org.apache.airavata.xbaya.component.ws.WSComponentPort;
import org.apache.airavata.xbaya.gpel.script.BPELScript;
import org.apache.airavata.xbaya.gpel.script.BPELScriptType;
-import org.apache.airavata.xbaya.graph.DataPort;
import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.graph.GraphSchema;
import org.apache.airavata.xbaya.graph.Node;
@@ -67,8 +60,6 @@ import org.apache.airavata.xbaya.graph.u
import org.apache.airavata.xbaya.graph.ws.WSGraph;
import org.apache.airavata.xbaya.graph.ws.WSGraphFactory;
import org.apache.airavata.xbaya.graph.ws.WSNode;
-import org.apache.airavata.xbaya.gui.XBayaExecutionModeListener;
-import org.apache.airavata.xbaya.interpretor.XBayaExecutionState;
import org.apache.airavata.xbaya.ode.ODEBPELTransformer;
import org.apache.airavata.xbaya.ode.ODEDeploymentDescriptor;
import org.apache.airavata.xbaya.ode.ODEWSDLTransformer;
@@ -85,7 +76,7 @@ import org.xmlpull.infoset.XmlNamespace;
import xsul5.XmlConstants;
import xsul5.wsdl.WsdlDefinitions;
-public class Workflow implements Cloneable, XBayaExecutionModeListener {
+public class Workflow implements Cloneable {
/**
* Namespace prefix
@@ -153,7 +144,7 @@ public class Workflow implements Cloneab
private QName qname;
- private volatile XBayaExecutionState executionState = XBayaExecutionState.NONE;
+ private volatile WorkflowExecutionState executionState = WorkflowExecutionState.NONE;
private WsdlDefinitions tridentWSDL;
@@ -895,22 +886,25 @@ public class Workflow implements Cloneab
/**
* @return
*/
- public synchronized XBayaExecutionState getExecutionState() {
+ public synchronized WorkflowExecutionState getExecutionState() {
return this.executionState;
}
/**
* @param state
*/
- public synchronized void setExecutionState(XBayaExecutionState state) {
+ public synchronized void setExecutionState(WorkflowExecutionState state) {
this.executionState = state;
}
+ public boolean isEditable() {
+ return editable;
+ }
+
- @Override
- public void executionModeChanged(XBayaConfiguration config) {
- editable=config.getXbayaExecutionMode()==XBayaExecutionMode.IDE;
- getGraph().setEditable(editable);
+ public void setEditable(boolean editable) {
+ this.editable = editable;
+ getGraph().setEditable(isEditable());
}
}
\ No newline at end of file
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/WorkflowExecutionState.java (from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/XBayaExecutionState.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/WorkflowExecutionState.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/WorkflowExecutionState.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/XBayaExecutionState.java&r1=1338688&r2=1339587&rev=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/XBayaExecutionState.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/WorkflowExecutionState.java Thu May 17 13:07:39 2012
@@ -19,9 +19,9 @@
*
*/
-package org.apache.airavata.xbaya.interpretor;
+package org.apache.airavata.xbaya.wf;
-public enum XBayaExecutionState {
+public enum WorkflowExecutionState {
NONE, RUNNING, PAUSED, STEP, STOPPED
}
\ No newline at end of file