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 [1/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...
Author: samindaw
Date: Thu May 17 13:07:39 2012
New Revision: 1339587
URL: http://svn.apache.org/viewvc?rev=1339587&view=rev
Log:
https://issues.apache.org/jira/browse/AIRAVATA-414 - Decoupling model from controller/view step1 [removing gui obj from node & rearranging classes to different packages to isolate model objects]
Added:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ExitComponent.java
- copied, changed from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ExitComponent.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/system/DifferedInputComponent.java
- copied, changed from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputComponent.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/controller/
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/controller/NodeController.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/gui/
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/gui/SubWorkflowNodeGUI.java
- copied, changed from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/DifferedInputNode.java
- copied, changed from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/StreamSourceNode.java
- copied, changed from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicInvoker.java
- copied, changed from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/dynamic/DynamicInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/DynamicServiceCreator.java
- copied, changed from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicServiceCreator.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClient.java
- copied, changed from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEClientUtil.java
- copied, changed from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClientUtil.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/ODEInvoker.java
- copied, changed from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/gui/ODEInvokerWindow.java
- copied, changed from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/WorkflowExecutionState.java
- copied, changed from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/XBayaExecutionState.java
Removed:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/dynamic/DynamicInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ExitComponent.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicServiceCreator.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputComponent.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/XBayaExecutionState.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClient.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEClientUtil.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvoker.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ode/ODEInvokerWindow.java
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/StreamSourceComponent.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/SubWorkflowComponent.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/StreamSourceNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/SystemComponentRegistry.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Edge.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Graph.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphPiece.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Node.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Port.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/InstanceNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/TerminateInstanceNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/InstanceNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/TerminateInstanceNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/EdgeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/NodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/BlockNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ConstantNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndBlockNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndForEachNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndifNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ExitNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ForEachNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/IfNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/InputNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/MemoNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/OutputNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ReceiveNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/S3InputNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/BlockNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputConfigurationDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputHandler.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndBlockNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndForEachNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndifNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ExitNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ForEachNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveNodeGUI.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceConfigurationDialog.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/util/GraphUtil.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WorkflowNode.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/jython/lib/StandaloneServiceNotificationSender.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/run/RunMenuItem.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/xbaya/WorkflowFiler.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/modifier/WorkflowModifier.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/monitor/gui/MonitorEventHandler.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/ProvenanceWrite.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/WorkflowModificationTestCase.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/InterpreterUtil.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/wf/Workflow.java
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ExitComponent.java (from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ExitComponent.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ExitComponent.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ExitComponent.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ExitComponent.java&r1=1338688&r2=1339587&rev=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ExitComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ExitComponent.java Thu May 17 13:07:39 2012
@@ -19,10 +19,8 @@
*
*/
-package org.apache.airavata.xbaya.component.registry;
+package org.apache.airavata.xbaya.component;
-import org.apache.airavata.xbaya.component.ComponentControlPort;
-import org.apache.airavata.xbaya.component.ComponentDataPort;
import org.apache.airavata.xbaya.component.system.SystemComponent;
import org.apache.airavata.xbaya.component.system.SystemComponentDataPort;
import org.apache.airavata.xbaya.graph.ControlPort;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/StreamSourceComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/StreamSourceComponent.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/StreamSourceComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/StreamSourceComponent.java Thu May 17 13:07:39 2012
@@ -24,7 +24,7 @@ package org.apache.airavata.xbaya.compon
import org.apache.airavata.xbaya.component.system.SystemComponent;
import org.apache.airavata.xbaya.component.system.SystemComponentDataPort;
import org.apache.airavata.xbaya.graph.Graph;
-import org.apache.airavata.xbaya.graph.system.gui.StreamSourceNode;
+import org.apache.airavata.xbaya.graph.system.StreamSourceNode;
public class StreamSourceComponent extends SystemComponent {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/SubWorkflowComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/SubWorkflowComponent.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/SubWorkflowComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/SubWorkflowComponent.java Thu May 17 13:07:39 2012
@@ -25,7 +25,7 @@ import org.apache.airavata.xbaya.compone
import org.apache.airavata.xbaya.graph.Graph;
import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.graph.subworkflow.SubWorkflowNode;
-import org.apache.airavata.xbaya.ode.ODEClient;
+import org.apache.airavata.xbaya.invoker.ODEClient;
import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.airavata.xbaya.workflow.WorkflowClient;
import org.apache.airavata.xbaya.workflow.WorkflowEngineException;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/StreamSourceNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/StreamSourceNodeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/StreamSourceNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/StreamSourceNodeGUI.java Thu May 17 13:07:39 2012
@@ -24,9 +24,9 @@ package org.apache.airavata.xbaya.compon
import java.awt.Color;
import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.graph.system.StreamSourceNode;
import org.apache.airavata.xbaya.graph.system.gui.ConfigurableNodeGUI;
import org.apache.airavata.xbaya.graph.system.gui.StreamSourceConfigurationDialog;
-import org.apache.airavata.xbaya.graph.system.gui.StreamSourceNode;
public class StreamSourceNodeGUI extends ConfigurableNodeGUI {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/SystemComponentRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/SystemComponentRegistry.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/SystemComponentRegistry.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/SystemComponentRegistry.java Thu May 17 13:07:39 2012
@@ -25,12 +25,14 @@ import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.airavata.xbaya.component.Component;
+import org.apache.airavata.xbaya.component.ExitComponent;
import org.apache.airavata.xbaya.component.StreamSourceComponent;
import org.apache.airavata.xbaya.component.SubWorkflowComponent;
import org.apache.airavata.xbaya.component.dynamic.DynamicComponent;
import org.apache.airavata.xbaya.component.gui.ComponentTreeNode;
import org.apache.airavata.xbaya.component.system.BlockComponent;
import org.apache.airavata.xbaya.component.system.ConstantComponent;
+import org.apache.airavata.xbaya.component.system.DifferedInputComponent;
import org.apache.airavata.xbaya.component.system.EndBlockComponent;
import org.apache.airavata.xbaya.component.system.EndForEachComponent;
import org.apache.airavata.xbaya.component.system.EndifComponent;
@@ -41,7 +43,6 @@ import org.apache.airavata.xbaya.compone
import org.apache.airavata.xbaya.component.system.OutputComponent;
import org.apache.airavata.xbaya.component.system.ReceiveComponent;
import org.apache.airavata.xbaya.component.system.S3InputComponent;
-import org.apache.airavata.xbaya.graph.system.gui.DifferedInputComponent;
public class SystemComponentRegistry extends ComponentRegistry {
Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/system/DifferedInputComponent.java (from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputComponent.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/system/DifferedInputComponent.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/system/DifferedInputComponent.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputComponent.java&r1=1338688&r2=1339587&rev=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/system/DifferedInputComponent.java Thu May 17 13:07:39 2012
@@ -5,11 +5,10 @@
*
* $Id: $
*/
-package org.apache.airavata.xbaya.graph.system.gui;
+package org.apache.airavata.xbaya.component.system;
-import org.apache.airavata.xbaya.component.system.SystemComponent;
-import org.apache.airavata.xbaya.component.system.SystemComponentDataPort;
import org.apache.airavata.xbaya.graph.Graph;
+import org.apache.airavata.xbaya.graph.system.DifferedInputNode;
/**
* @author Chathura Herath
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java Thu May 17 13:07:39 2012
@@ -41,6 +41,7 @@ import org.apache.airavata.common.workfl
import org.apache.airavata.xbaya.XBayaConfiguration;
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.graph.system.InputNode;
import org.apache.airavata.xbaya.graph.util.GraphUtil;
import org.apache.airavata.xbaya.graph.ws.WSNode;
@@ -53,10 +54,10 @@ import org.apache.airavata.xbaya.gui.XBa
import org.apache.airavata.xbaya.interpretor.HeaderConstants;
import org.apache.airavata.xbaya.interpretor.NameValue;
import org.apache.airavata.xbaya.interpretor.WorkflowInterpretorStub;
+import org.apache.airavata.xbaya.invoker.ODEClient;
import org.apache.airavata.xbaya.jython.script.JythonScript;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.monitor.MonitorException;
-import org.apache.airavata.xbaya.ode.ODEClient;
import org.apache.airavata.xbaya.util.XBayaUtil;
import org.apache.airavata.xbaya.wf.Workflow;
import org.apache.axiom.om.impl.llom.util.AXIOMUtil;
@@ -249,7 +250,7 @@ public class WorkflowInterpreterLaunchWi
arguments.add(topic);
Collection<WSNode> wsNodes = GraphUtil.getWSNodes(this.engine.getWorkflow().getGraph());
for (WSNode node : wsNodes) {
- ((WSNodeGUI) node.getGUI()).setInteractiveMode(false);
+ ((WSNodeGUI) NodeController.getGUI(node)).setInteractiveMode(false);
}
// TODO error check for user inputs
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/script/BPELScript.java Thu May 17 13:07:39 2012
@@ -59,7 +59,7 @@ import org.apache.airavata.xbaya.graph.s
import org.apache.airavata.xbaya.graph.system.MemoNode;
import org.apache.airavata.xbaya.graph.system.OutputNode;
import org.apache.airavata.xbaya.graph.system.ReceiveNode;
-import org.apache.airavata.xbaya.graph.system.gui.StreamSourceNode;
+import org.apache.airavata.xbaya.graph.system.StreamSourceNode;
import org.apache.airavata.xbaya.graph.util.GraphUtil;
import org.apache.airavata.xbaya.graph.ws.WSNode;
import org.apache.airavata.xbaya.wf.Workflow;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Edge.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Edge.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Edge.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Edge.java Thu May 17 13:07:39 2012
@@ -21,18 +21,10 @@
package org.apache.airavata.xbaya.graph;
-import org.apache.airavata.xbaya.graph.gui.EdgeGUI;
public interface Edge extends GraphPiece {
/**
- * Returns the gui.
- *
- * @return the gui
- */
- public EdgeGUI getGUI();
-
- /**
* @return the port that the edget connected from
*/
public Port getFromPort();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Graph.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Graph.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Graph.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Graph.java Thu May 17 13:07:39 2012
@@ -24,17 +24,9 @@ package org.apache.airavata.xbaya.graph;
import java.util.Collection;
import java.util.List;
-import org.apache.airavata.xbaya.graph.gui.GraphGUI;
import org.xmlpull.infoset.XmlElement;
public interface Graph extends GraphPiece {
-
- /**
- * Returns the gui.
- *
- * @return the gui
- */
- public GraphGUI getGUI();
/**
* Returns if the graph should be editable
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphPiece.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphPiece.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphPiece.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/GraphPiece.java Thu May 17 13:07:39 2012
@@ -21,12 +21,7 @@
package org.apache.airavata.xbaya.graph;
-import org.apache.airavata.xbaya.graph.gui.GraphPieceGUI;
public interface GraphPiece {
- /**
- * @return The GUI of the piece.
- */
- public GraphPieceGUI getGUI();
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Node.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Node.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Node.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Node.java Thu May 17 13:07:39 2012
@@ -26,18 +26,10 @@ import java.util.Collection;
import java.util.List;
import org.apache.airavata.xbaya.component.Component;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
public interface Node extends GraphPiece {
/**
- * Return the gui.
- *
- * @return the gui
- */
- public NodeGUI getGUI();
-
- /**
* Returns the ID of the node.
*
* @return the ID of the node
@@ -202,8 +194,4 @@ public interface Node extends GraphPiece
*/
public boolean getRequireJoin();
- /**
- * @return
- */
- public boolean isFinished();
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Port.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Port.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Port.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/Port.java Thu May 17 13:07:39 2012
@@ -24,7 +24,6 @@ package org.apache.airavata.xbaya.graph;
import java.util.Collection;
import org.apache.airavata.xbaya.component.ComponentPort;
-import org.apache.airavata.xbaya.graph.gui.PortGUI;
public interface Port extends GraphPiece {
@@ -59,13 +58,6 @@ public interface Port extends GraphPiece
}
/**
- * Returns the gui
- *
- * @return the gui
- */
- public PortGUI getGUI();
-
- /**
* Returns an ID that can be used to distinguish a port, and also can be used as a variable name in scripts
*
* @return the ID
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/InstanceNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/InstanceNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/InstanceNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/InstanceNode.java Thu May 17 13:07:39 2012
@@ -30,8 +30,6 @@ import org.apache.airavata.xbaya.graph.G
import org.apache.airavata.xbaya.graph.GraphSchema;
import org.apache.airavata.xbaya.graph.Node;
import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.amazon.gui.InstanceNodeGUI;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
import org.xmlpull.infoset.XmlElement;
public class InstanceNode extends ResourceNode {
@@ -45,8 +43,6 @@ public class InstanceNode extends Resour
private static final String INSTANCE_TYPE_TAG_NAME = "type";
private static final String USERNAME_TAG_NAME = "username";
- private InstanceNodeGUI gui;
-
private boolean startNewInstance;
private String instanceId;
@@ -80,17 +76,6 @@ public class InstanceNode extends Resour
super(nodeElement);
}
- /**
- * @see org.apache.airavata.xbaya.graph.Node#getGUI()
- */
- @Override
- public NodeGUI getGUI() {
- if (this.gui == null) {
- this.gui = new InstanceNodeGUI(this);
- }
- return this.gui;
- }
-
public boolean isStartNewInstance() {
return this.startNewInstance;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/TerminateInstanceNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/TerminateInstanceNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/TerminateInstanceNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/TerminateInstanceNode.java Thu May 17 13:07:39 2012
@@ -26,14 +26,10 @@ import org.apache.airavata.xbaya.compone
import org.apache.airavata.xbaya.graph.Graph;
import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.graph.GraphSchema;
-import org.apache.airavata.xbaya.graph.amazon.gui.TerminateInstanceNodeGUI;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
import org.xmlpull.infoset.XmlElement;
public class TerminateInstanceNode extends ResourceNode {
- private TerminateInstanceNodeGUI gui;
-
private boolean startNewInstance;
/**
@@ -83,17 +79,6 @@ public class TerminateInstanceNode exten
return nodeElement;
}
- /**
- * @see org.apache.airavata.xbaya.graph.Node#getGUI()
- */
- @Override
- public NodeGUI getGUI() {
- if (this.gui == null) {
- this.gui = new TerminateInstanceNodeGUI(this);
- }
- return this.gui;
- }
-
public boolean isStartNewInstance() {
return this.startNewInstance;
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/InstanceNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/InstanceNodeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/InstanceNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/InstanceNodeGUI.java Thu May 17 13:07:39 2012
@@ -31,6 +31,7 @@ import java.util.List;
import org.apache.airavata.xbaya.XBayaEngine;
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.PortGUI;
import org.apache.airavata.xbaya.graph.system.gui.ConfigurableNodeGUI;
@@ -119,7 +120,7 @@ public class InstanceNodeGUI extends Con
// Paint all ports
for (Port port : this.node.getAllPorts()) {
- port.getGUI().paint(g);
+ NodeController.getGUI(port).paint(g);
}
paintConfiguration(g);
@@ -135,7 +136,7 @@ public class InstanceNodeGUI extends Con
for (int i = 0; i < inputPorts.size(); i++) {
Port port = inputPorts.get(i);
Point offset = new Point(PortGUI.DATA_PORT_SIZE / 2, this.headHeight + PORT_INITIAL_GAP + PORT_GAP * i);
- port.getGUI().setOffset(offset);
+ NodeController.getGUI(port).setOffset(offset);
}
// outputs
@@ -146,14 +147,14 @@ public class InstanceNodeGUI extends Con
// overwrite getBounds() to have different shape.
Point offset = new Point(this.getBounds().width - PortGUI.DATA_PORT_SIZE / 2, this.headHeight
+ PORT_INITIAL_GAP + PORT_GAP * i);
- port.getGUI().setOffset(offset);
+ NodeController.getGUI(port).setOffset(offset);
}
// control out port
List<? extends Port> controlOutPorts = this.node.getControlOutPorts();
Port controlOutPort1 = controlOutPorts.get(0);
Point offset = new Point(getBounds().width / 2, getBounds().height);
- controlOutPort1.getGUI().setOffset(offset);
+ NodeController.getGUI(controlOutPort1).setOffset(offset);
}
private void calculatePositions() {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/TerminateInstanceNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/TerminateInstanceNodeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/TerminateInstanceNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/amazon/gui/TerminateInstanceNodeGUI.java Thu May 17 13:07:39 2012
@@ -30,6 +30,7 @@ import java.util.List;
import org.apache.airavata.xbaya.graph.Port;
import org.apache.airavata.xbaya.graph.amazon.TerminateInstanceNode;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.graph.gui.NodeGUI;
import org.apache.airavata.xbaya.graph.gui.PortGUI;
@@ -110,7 +111,7 @@ public class TerminateInstanceNodeGUI ex
// Paint all ports
for (Port port : this.node.getAllPorts()) {
- port.getGUI().paint(g);
+ NodeController.getGUI(port).paint(g);
}
}
@@ -124,7 +125,7 @@ public class TerminateInstanceNodeGUI ex
for (int i = 0; i < inputPorts.size(); i++) {
Port port = inputPorts.get(i);
Point offset = new Point(PortGUI.DATA_PORT_SIZE / 2, this.headHeight + PORT_INITIAL_GAP + PORT_GAP * i);
- port.getGUI().setOffset(offset);
+ NodeController.getGUI(port).setOffset(offset);
}
// outputs
@@ -135,12 +136,12 @@ public class TerminateInstanceNodeGUI ex
// overwrite getBounds() to have different shape.
Point offset = new Point(this.getBounds().width - PortGUI.DATA_PORT_SIZE / 2, this.headHeight
+ PORT_INITIAL_GAP + PORT_GAP * i);
- port.getGUI().setOffset(offset);
+ NodeController.getGUI(port).setOffset(offset);
}
// control in port
Port controlInPort = this.node.getControlInPort();
- controlInPort.getGUI().setOffset(new Point(0, 0));
+ NodeController.getGUI(controlInPort).setOffset(new Point(0, 0));
}
private void calculatePositions() {
Added: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/controller/NodeController.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/controller/NodeController.java?rev=1339587&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/controller/NodeController.java (added)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/controller/NodeController.java Thu May 17 13:07:39 2012
@@ -0,0 +1,182 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.xbaya.graph.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.airavata.xbaya.component.gui.StreamSourceNodeGUI;
+import org.apache.airavata.xbaya.graph.Edge;
+import org.apache.airavata.xbaya.graph.Graph;
+import org.apache.airavata.xbaya.graph.GraphPiece;
+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.amazon.TerminateInstanceNode;
+import org.apache.airavata.xbaya.graph.amazon.gui.InstanceNodeGUI;
+import org.apache.airavata.xbaya.graph.amazon.gui.TerminateInstanceNodeGUI;
+import org.apache.airavata.xbaya.graph.dynamic.DynamicNode;
+import org.apache.airavata.xbaya.graph.dynamic.gui.DynamicNodeGUI;
+import org.apache.airavata.xbaya.graph.gui.EdgeGUI;
+import org.apache.airavata.xbaya.graph.gui.GraphGUI;
+import org.apache.airavata.xbaya.graph.gui.GraphPieceGUI;
+import org.apache.airavata.xbaya.graph.gui.NodeGUI;
+import org.apache.airavata.xbaya.graph.gui.PortGUI;
+import org.apache.airavata.xbaya.graph.subworkflow.SubWorkflowNode;
+import org.apache.airavata.xbaya.graph.subworkflow.gui.SubWorkflowNodeGUI;
+import org.apache.airavata.xbaya.graph.system.BlockNode;
+import org.apache.airavata.xbaya.graph.system.ConstantNode;
+import org.apache.airavata.xbaya.graph.system.DifferedInputNode;
+import org.apache.airavata.xbaya.graph.system.EndBlockNode;
+import org.apache.airavata.xbaya.graph.system.EndForEachNode;
+import org.apache.airavata.xbaya.graph.system.EndifNode;
+import org.apache.airavata.xbaya.graph.system.ExitNode;
+import org.apache.airavata.xbaya.graph.system.ForEachNode;
+import org.apache.airavata.xbaya.graph.system.IfNode;
+import org.apache.airavata.xbaya.graph.system.InputNode;
+import org.apache.airavata.xbaya.graph.system.MemoNode;
+import org.apache.airavata.xbaya.graph.system.OutputNode;
+import org.apache.airavata.xbaya.graph.system.ReceiveNode;
+import org.apache.airavata.xbaya.graph.system.S3InputNode;
+import org.apache.airavata.xbaya.graph.system.StreamSourceNode;
+import org.apache.airavata.xbaya.graph.system.gui.BlockNodeGUI;
+import org.apache.airavata.xbaya.graph.system.gui.ConstantNodeGUI;
+import org.apache.airavata.xbaya.graph.system.gui.DifferedInputNodeGUI;
+import org.apache.airavata.xbaya.graph.system.gui.EndBlockNodeGUI;
+import org.apache.airavata.xbaya.graph.system.gui.EndForEachNodeGUI;
+import org.apache.airavata.xbaya.graph.system.gui.EndifNodeGUI;
+import org.apache.airavata.xbaya.graph.system.gui.ExitNodeGUI;
+import org.apache.airavata.xbaya.graph.system.gui.ForEachNodeGUI;
+import org.apache.airavata.xbaya.graph.system.gui.IfNodeGUI;
+import org.apache.airavata.xbaya.graph.system.gui.InputNodeGUI;
+import org.apache.airavata.xbaya.graph.system.gui.MemoNodeGUI;
+import org.apache.airavata.xbaya.graph.system.gui.OutputNodeGUI;
+import org.apache.airavata.xbaya.graph.system.gui.ReceiveNodeGUI;
+import org.apache.airavata.xbaya.graph.system.gui.S3InputNodeGUI;
+import org.apache.airavata.xbaya.graph.ws.WSNode;
+import org.apache.airavata.xbaya.graph.ws.WorkflowNode;
+import org.apache.airavata.xbaya.graph.ws.gui.WSNodeGUI;
+import org.apache.airavata.xbaya.graph.ws.gui.WorkflowNodeGUI;
+import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler;
+
+public class NodeController {
+ private static Map<GraphPiece,GraphPieceGUI> nodeMap=new HashMap<GraphPiece, GraphPieceGUI>();
+// private static Map<Port,PortGUI> portMap=new HashMap<Port, PortGUI>();
+
+ public static GraphPieceGUI getGUI(GraphPiece node){
+ if (!nodeMap.containsKey(node)){
+ nodeMap.put(node,createNodeGUI(node));
+ }
+ return nodeMap.get(node);
+ }
+
+ public static GraphGUI getGUI(Graph node){
+ return (GraphGUI)getGUI((GraphPiece)node);
+ }
+
+ public static NodeGUI getGUI(Node node){
+ return (NodeGUI)getGUI((GraphPiece)node);
+ }
+
+ public static EdgeGUI getGUI(Edge port){
+ return (EdgeGUI)getGUI((GraphPiece)port);
+ }
+
+ public static PortGUI getGUI(Port port){
+ return (PortGUI)getGUI((GraphPiece)port);
+ }
+
+// public static PortGUI getGUI(Port node){
+// if (!portMap.containsKey(node)){
+// portMap.put(node,createPortGUI(node));
+// }
+// return portMap.get(node);
+// }
+//
+// private static PortGUI createPortGUI(Port port){
+// PortGUI portGUI=new PortGUI(port);
+// return portGUI;
+// }
+
+ private static GraphPieceGUI createNodeGUI(GraphPiece node){
+ GraphPieceGUI nodeGUI=null;
+ if (node instanceof SubWorkflowNode){
+ nodeGUI=new SubWorkflowNodeGUI((SubWorkflowNode)node);
+ } else if (node instanceof DynamicNode){
+ nodeGUI=new DynamicNodeGUI((DynamicNode)node);
+ } else if (node instanceof ConstantNode){
+ nodeGUI=new ConstantNodeGUI((ConstantNode)node);
+ } else if (node instanceof IfNode){
+ nodeGUI=new IfNodeGUI((IfNode)node);
+ } else if (node instanceof ExitNode){
+ nodeGUI=new ExitNodeGUI((ExitNode)node);
+ } else if (node instanceof OutputNode){
+ nodeGUI=new OutputNodeGUI((OutputNode)node);
+ } else if (node instanceof DifferedInputNode){
+ nodeGUI=new DifferedInputNodeGUI((DifferedInputNode)node);
+ } else if (node instanceof BlockNode){
+ nodeGUI=new BlockNodeGUI((BlockNode)node);
+ } else if (node instanceof EndForEachNode){
+ nodeGUI=new EndForEachNodeGUI((EndForEachNode)node);
+ } else if (node instanceof S3InputNode){
+ nodeGUI=new S3InputNodeGUI((S3InputNode)node);
+ } else if (node instanceof ForEachNode){
+ nodeGUI=new ForEachNodeGUI((ForEachNode)node);
+ } else if (node instanceof MemoNode){
+ nodeGUI=new MemoNodeGUI((MemoNode)node);
+ } else if (node instanceof ReceiveNode){
+ nodeGUI=new ReceiveNodeGUI((ReceiveNode)node);
+ } else if (node instanceof InputNode){
+ nodeGUI=new InputNodeGUI((InputNode)node);
+ } else if (node instanceof EndifNode){
+ nodeGUI=new EndifNodeGUI((EndifNode)node);
+ } else if (node instanceof EndBlockNode){
+ nodeGUI=new EndBlockNodeGUI((EndBlockNode)node);
+ } else if (node instanceof WorkflowNode){
+ nodeGUI=new WorkflowNodeGUI((WorkflowNode)node);
+ } else if (node instanceof WSNode){
+ nodeGUI=new WSNodeGUI((WSNode)node);
+// } else if (node instanceof Graph){
+// nodeGUI=new GraphGUI((Graph)node);
+// } else if (node instanceof GraphPiece){
+// nodeGUI=new GraphPieceGUI((GraphPiece)node);
+ } else if (node instanceof Port){
+ nodeGUI=new PortGUI((Port)node);
+ } else if (node instanceof Edge){
+ nodeGUI=new EdgeGUI((Edge)node);
+ } else if (node instanceof TerminateInstanceNode){
+ nodeGUI=new TerminateInstanceNodeGUI((TerminateInstanceNode)node);
+ } else if (node instanceof InstanceNode){
+ nodeGUI=new InstanceNodeGUI((InstanceNode)node);
+ } else if (node instanceof StreamSourceNode){
+ nodeGUI=new StreamSourceNodeGUI((StreamSourceNode)node);
+ } else if (node instanceof Graph){
+ nodeGUI=new GraphGUI((Graph)node);
+ }
+
+ return nodeGUI;
+ }
+
+ public static boolean isFinished(Node node){
+ return ((NodeGUI)getGUI(node)).getBodyColor() == MonitorEventHandler.NodeState.FINISHED.color;
+ }
+}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/DynamicNode.java Thu May 17 13:07:39 2012
@@ -32,16 +32,12 @@ import org.apache.airavata.xbaya.graph.E
import org.apache.airavata.xbaya.graph.Graph;
import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.dynamic.gui.DynamicNodeGUI;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
import org.apache.airavata.xbaya.graph.impl.NodeImpl;
import org.apache.airavata.xbaya.graph.impl.PortImpl;
import org.apache.airavata.xbaya.graph.util.GraphUtil;
public class DynamicNode extends NodeImpl implements PortAddable {
- private DynamicNodeGUI gui;
-
/**
* Constructs a WSNode.
*
@@ -56,16 +52,6 @@ public class DynamicNode extends NodeImp
}
/**
- * @see org.apache.airavata.xbaya.graph.Node#getGUI()
- */
- public synchronized NodeGUI getGUI() {
- if (this.gui == null) {
- this.gui = new DynamicNodeGUI(this);
- }
- return this.gui;
- }
-
- /**
* @see org.apache.airavata.xbaya.graph.Node#getComponent()
*/
@Override
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java Thu May 17 13:07:39 2012
@@ -47,7 +47,6 @@ import org.apache.airavata.xbaya.graph.N
import org.apache.airavata.xbaya.graph.Port;
import org.apache.airavata.xbaya.graph.dynamic.BasicTypeMapping;
import org.apache.airavata.xbaya.graph.dynamic.DynamicNode;
-import org.apache.airavata.xbaya.graph.dynamic.DynamicServiceCreator;
import org.apache.airavata.xbaya.graph.dynamic.SchemaCompilerUtil;
import org.apache.airavata.xbaya.graph.ws.WSNode;
import org.apache.airavata.xbaya.graph.ws.WSPort;
@@ -55,6 +54,7 @@ import org.apache.airavata.xbaya.gui.Gri
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XBayaLabel;
import org.apache.airavata.xbaya.gui.XBayaTextArea;
+import org.apache.airavata.xbaya.invoker.DynamicServiceCreator;
import org.apache.airavata.xbaya.util.RegistryConstants;
import org.xmlpull.infoset.XmlElement;
import org.xmlpull.infoset.XmlNamespace;
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicWorkflowRunnerWindow.java Thu May 17 13:07:39 2012
@@ -21,37 +21,54 @@
package org.apache.airavata.xbaya.graph.dynamic.gui;
+import java.awt.event.ActionEvent;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
+
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.xml.namespace.QName;
+
import org.apache.airavata.common.registry.api.exception.RegistryException;
import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.common.utils.XMLUtil;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.XBayaException;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.graph.system.InputNode;
import org.apache.airavata.xbaya.graph.util.GraphUtil;
import org.apache.airavata.xbaya.graph.ws.WSNode;
import org.apache.airavata.xbaya.graph.ws.gui.WSNodeGUI;
-import org.apache.airavata.xbaya.gui.*;
+import org.apache.airavata.xbaya.gui.ErrorMessages;
+import org.apache.airavata.xbaya.gui.GridPanel;
+import org.apache.airavata.xbaya.gui.XBayaDialog;
+import org.apache.airavata.xbaya.gui.XBayaLabel;
+import org.apache.airavata.xbaya.gui.XBayaTextField;
import org.apache.airavata.xbaya.interpretor.WorkflowInterpreter;
+import org.apache.airavata.xbaya.invoker.ODEClient;
import org.apache.airavata.xbaya.jython.script.JythonScript;
import org.apache.airavata.xbaya.monitor.MonitorConfiguration;
import org.apache.airavata.xbaya.monitor.MonitorException;
-import org.apache.airavata.xbaya.ode.ODEClient;
import org.apache.airavata.xbaya.util.XBayaUtil;
import org.apache.airavata.xbaya.wf.Workflow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
import org.xmlpull.v1.builder.XmlInfosetBuilder;
+
import xsul.XmlConstants;
import xsul.lead.LeadResourceMapping;
-import javax.swing.*;
-import javax.xml.namespace.QName;
-import java.awt.event.ActionEvent;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.*;
-
public class DynamicWorkflowRunnerWindow {
private static final Logger logger = LoggerFactory.getLogger(DynamicWorkflowRunnerWindow.class);
@@ -298,12 +315,12 @@ public class DynamicWorkflowRunnerWindow
LinkedList<String> nodeIDs = new LinkedList<String>();
for (WSNode node : wsNodes) {
nodeIDs.add(node.getID());
- ((WSNodeGUI) node.getGUI()).setInteractiveMode(true);
+ ((WSNodeGUI) NodeController.getGUI(node)).setInteractiveMode(true);
}
notifConfig.setInteractiveNodeIDs(nodeIDs);
} else {
for (WSNode node : wsNodes) {
- ((WSNodeGUI) node.getGUI()).setInteractiveMode(false);
+ ((WSNodeGUI) NodeController.getGUI(node)).setInteractiveMode(false);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/EdgeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/EdgeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/EdgeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/EdgeGUI.java Thu May 17 13:07:39 2012
@@ -33,6 +33,7 @@ import org.apache.airavata.xbaya.XBayaEn
import org.apache.airavata.xbaya.graph.ControlEdge;
import org.apache.airavata.xbaya.graph.Edge;
import org.apache.airavata.xbaya.graph.Port;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
public class EdgeGUI implements GraphPieceGUI {
@@ -130,11 +131,11 @@ public class EdgeGUI implements GraphPie
private Point getFromPosition() {
Port port = this.edge.getFromPort();
- return port.getGUI().getPosition();
+ return NodeController.getGUI(port).getPosition();
}
private Point getToPosition() {
Port port = this.edge.getToPort();
- return port.getGUI().getPosition();
+ return NodeController.getGUI(port).getPosition();
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphCanvas.java Thu May 17 13:07:39 2012
@@ -48,11 +48,9 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import java.util.UUID;
import javax.swing.AbstractAction;
import javax.swing.JComponent;
-import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
@@ -61,9 +59,9 @@ import javax.swing.JScrollPane;
import org.apache.airavata.common.utils.SwingUtil;
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.XBayaEngine;
import org.apache.airavata.xbaya.XBayaRuntimeException;
-import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
import org.apache.airavata.xbaya.component.Component;
import org.apache.airavata.xbaya.component.ComponentException;
import org.apache.airavata.xbaya.component.gui.ComponentSourceTransferable;
@@ -77,15 +75,15 @@ 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.Port.Kind;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
import org.apache.airavata.xbaya.graph.dynamic.DynamicNode;
import org.apache.airavata.xbaya.graph.dynamic.PortAddable;
import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.system.gui.StreamSourceNode;
-import org.apache.airavata.xbaya.graph.util.GraphUtil;
+import org.apache.airavata.xbaya.graph.system.StreamSourceNode;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.gui.XBayaExecutionModeListener;
-import org.apache.airavata.xbaya.interpretor.XBayaExecutionState;
import org.apache.airavata.xbaya.wf.Workflow;
+import org.apache.airavata.xbaya.wf.WorkflowExecutionState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
@@ -459,7 +457,7 @@ public class GraphCanvas implements XBay
* selected
*/
Point point = event.getPoint();
- GraphPiece clicked = this.graph.getGUI().getGraphPieceAt(point);
+ GraphPiece clicked = NodeController.getGUI(this.graph).getGraphPieceAt(point);
if ((clicked instanceof Node) && this.multipleSelectedNodes != null) {
Node node = (Node) clicked;
if (!this.crtlPressed) {
@@ -469,7 +467,7 @@ public class GraphCanvas implements XBay
}
// delegate the event.
- this.graph.getGUI().mouseClicked(event, this.engine);
+ NodeController.getGUI(this.graph).mouseClicked(event, this.engine);
}
private void mousePressed(MouseEvent event) {
@@ -479,7 +477,7 @@ public class GraphCanvas implements XBay
this.panel.requestFocusInWindow();
// Get select item
- GraphPiece selected = this.graph.getGUI().getGraphPieceAt(point);
+ GraphPiece selected = NodeController.getGUI(this.graph).getGraphPieceAt(point);
/*
* Doing Nothing if pressed is on the selected node
@@ -519,15 +517,15 @@ public class GraphCanvas implements XBay
if (selected instanceof Node) {
Node node = (Node) selected;
selectNode(node);
- if (!node.getGUI().isInConfig(point)) {
+ if (!NodeController.getGUI(node).isInConfig(point)) {
this.draggedNode = node;
- node.getGUI().setDraggedFlag(true);
+ NodeController.getGUI(node).setDraggedFlag(true);
this.panel.setCursor(SwingUtil.MOVE_CURSOR);
}
} else if (selected instanceof Port) {
Port port = (Port) selected;
- port.getGUI().setSelectedFlag(true);
+ NodeController.getGUI(port).setSelectedFlag(true);
switch (port.getKind()) {
case DATA_IN:
case CONTROL_IN:
@@ -562,12 +560,12 @@ public class GraphCanvas implements XBay
private void mouseReleased(MouseEvent event) {
Point point = event.getPoint();
if (this.draggedNode != null) {
- this.draggedNode.getGUI().setDraggedFlag(false);
+ NodeController.getGUI(this.draggedNode).setDraggedFlag(false);
this.panel.setCursor(SwingUtil.DEFAULT_CURSOR);
// Check if it s stream grouping
if (draggedNode instanceof InputNode) {
- StreamSourceNode streamNode = this.graph.getGUI().getStreamSourceAt(point);
+ StreamSourceNode streamNode = NodeController.getGUI(this.graph).getStreamSourceAt(point);
if (streamNode != null) {
streamNode.addInputNode((InputNode) draggedNode);
}
@@ -578,7 +576,7 @@ public class GraphCanvas implements XBay
}
if (this.draggedPort != null) {
- GraphPiece graphPiece = this.graph.getGUI().getGraphPieceAt(point);
+ GraphPiece graphPiece = NodeController.getGUI(this.graph).getGraphPieceAt(point);
if (graphPiece instanceof DynamicNode) {
if (this.draggedPort.getKind() == Kind.DATA_OUT && draggedPort instanceof DataPort) {
this.panel.setCursor(SwingUtil.CROSSHAIR_CURSOR);
@@ -634,7 +632,7 @@ public class GraphCanvas implements XBay
int y = (int) (this.mousePoint.getY() > this.mousePointForSelection.getY() ? this.mousePointForSelection
.getY() : this.mousePoint.getY());
- this.multipleSelectedNodes = this.graph.getGUI().getNodesIn(new Rectangle(x, y, (int) width, (int) height));
+ this.multipleSelectedNodes = NodeController.getGUI(this.graph).getNodesIn(new Rectangle(x, y, (int) width, (int) height));
selectNodes(this.multipleSelectedNodes);
// clear mousepoint
@@ -709,7 +707,7 @@ public class GraphCanvas implements XBay
event.consume();
}
if (this.draggedPort != null) {
- GraphPiece piece = this.graph.getGUI().getGraphPieceAt(point);
+ GraphPiece piece = NodeController.getGUI(this.graph).getGraphPieceAt(point);
if (piece instanceof Port) {
Port port = (Port) piece;
// Display the information of port that is close to the mouse
@@ -756,10 +754,10 @@ public class GraphCanvas implements XBay
private void mouseMoved(MouseEvent event) {
Point point = event.getPoint();
- GraphPiece graphPiece = this.graph.getGUI().getGraphPieceAt(point);
+ GraphPiece graphPiece = NodeController.getGUI(this.graph).getGraphPieceAt(point);
if (graphPiece instanceof Node) {
Node node = (Node) graphPiece;
- if (node.getGUI().isInConfig(point)) {
+ if (NodeController.getGUI(node).isInConfig(point)) {
this.panel.setCursor(SwingUtil.HAND_CURSOR);
} else {
this.panel.setCursor(SwingUtil.DEFAULT_CURSOR);
@@ -851,7 +849,7 @@ public class GraphCanvas implements XBay
* @return The image
*/
private BufferedImage createImage() {
- Rectangle bounds = this.graph.getGUI().getBounds();
+ Rectangle bounds = NodeController.getGUI(this.graph).getBounds();
BufferedImage image = new BufferedImage(bounds.width, bounds.height, BufferedImage.TYPE_INT_ARGB);
Graphics2D graphics = image.createGraphics();
@@ -886,18 +884,18 @@ public class GraphCanvas implements XBay
}
private void paintComponent(Graphics2D g) {
- this.graph.getGUI().paint(g);
+ NodeController.getGUI(this.graph).paint(g);
// Draws a creating edge.
if (this.draggedPort != null) {
Point p1, p2;
Kind kind = this.draggedPort.getKind();
if (kind == Kind.DATA_OUT || kind == Kind.CONTROL_OUT || kind == Kind.EPR) {
- p1 = this.draggedPort.getGUI().getPosition();
+ p1 = NodeController.getGUI(this.draggedPort).getPosition();
p2 = this.mousePoint;
} else if (kind == Kind.DATA_IN || kind == Kind.CONTROL_IN) {
p1 = this.mousePoint;
- p2 = this.draggedPort.getGUI().getPosition();
+ p2 = NodeController.getGUI(this.draggedPort).getPosition();
} else {
// This should not happen.
throw new XBayaRuntimeException();
@@ -949,7 +947,7 @@ public class GraphCanvas implements XBay
*/
private void updateSize() {
- Rectangle bounds = this.graph.getGUI().getBounds();
+ Rectangle bounds = NodeController.getGUI(this.graph).getBounds();
Dimension newDimention = new Dimension(bounds.width, bounds.height);
if (!newDimention.equals(this.graphDimention)) {
@@ -985,15 +983,15 @@ public class GraphCanvas implements XBay
*/
private void selectNode(Node node) {
deselectNode();
- node.getGUI().setSelectedFlag(true);
+ NodeController.getGUI(node).setSelectedFlag(true);
setSelectedNode(node);
}
private void selectNodes(List<Node> nodes) {
deselectNode();
for (Node node : nodes) {
- node.getGUI().setSelectedFlag(true);
- node.getGUI().setDraggedFlag(true);
+ NodeController.getGUI(node).setSelectedFlag(true);
+ NodeController.getGUI(node).setDraggedFlag(true);
}
this.multipleSelectedNodes = nodes;
notifyListeners(new GraphCanvasEvent(GraphCanvasEvent.GraphCanvasEventType.NODE_SELECTED, this, this.workflow));
@@ -1004,14 +1002,14 @@ public class GraphCanvas implements XBay
*/
private void deselectNode() {
if (this.selectedNode != null) {
- this.selectedNode.getGUI().setSelectedFlag(false);
- this.selectedNode.getGUI().setDraggedFlag(false);
+ NodeController.getGUI(this.selectedNode).setSelectedFlag(false);
+ NodeController.getGUI(this.selectedNode).setDraggedFlag(false);
setSelectedNode(null);
}
if (this.multipleSelectedNodes != null) {
for (Node node : this.multipleSelectedNodes) {
- node.getGUI().setSelectedFlag(false);
- node.getGUI().setDraggedFlag(false);
+ NodeController.getGUI(node).setSelectedFlag(false);
+ NodeController.getGUI(node).setDraggedFlag(false);
}
this.multipleSelectedNodes = null;
}
@@ -1019,8 +1017,8 @@ public class GraphCanvas implements XBay
private void deselectNode(Node node) {
if (this.multipleSelectedNodes != null && this.multipleSelectedNodes.contains(node)) {
- node.getGUI().setSelectedFlag(false);
- node.getGUI().setDraggedFlag(false);
+ NodeController.getGUI(node).setSelectedFlag(false);
+ NodeController.getGUI(node).setDraggedFlag(false);
this.multipleSelectedNodes.remove(node);
}
}
@@ -1033,13 +1031,13 @@ public class GraphCanvas implements XBay
private void selectInputPort(Port port) {
deselectInputPort();
- port.getGUI().setSelectedFlag(true);
+ NodeController.getGUI(port).setSelectedFlag(true);
setSelectedInputPort(port);
}
private void deselectInputPort() {
if (this.selectedInputPort != null) {
- this.selectedInputPort.getGUI().setSelectedFlag(false);
+ NodeController.getGUI(this.selectedInputPort).setSelectedFlag(false);
setSelectedInputPort(null);
}
}
@@ -1052,13 +1050,13 @@ public class GraphCanvas implements XBay
private void selectOutputPort(Port port) {
deselectOutputPort();
- port.getGUI().setSelectedFlag(true);
+ NodeController.getGUI(port).setSelectedFlag(true);
setSelectedOutputPort(port);
}
private void deselectOutputPort() {
if (this.selectedOutputPort != null) {
- this.selectedOutputPort.getGUI().setSelectedFlag(false);
+ NodeController.getGUI(this.selectedOutputPort).setSelectedFlag(false);
setSelectedOutputPort(null);
}
}
@@ -1066,7 +1064,7 @@ public class GraphCanvas implements XBay
private void selectEdge(Edge edge) {
if (edge != null) {
deselectEdge();
- edge.getGUI().setSelectedFlag(true);
+ NodeController.getGUI(edge).setSelectedFlag(true);
this.selectedEdge = edge;
// When an edge is selected, ports on both sides will be selected
@@ -1078,7 +1076,7 @@ public class GraphCanvas implements XBay
private void deselectEdge() {
if (this.selectedEdge != null) {
- this.selectedEdge.getGUI().setSelectedFlag(false);
+ NodeController.getGUI(this.selectedEdge).setSelectedFlag(false);
this.selectedEdge = null;
}
}
@@ -1256,7 +1254,7 @@ public class GraphCanvas implements XBay
for (DataPort dataPort : outputPorts) {
exploreNodes.addAll(dataPort.getToNodes());
}
- node.getGUI().setBodyColor(NodeGUI.DEFAULT_BODY_COLOR);
+ NodeController.getGUI(node).setBodyColor(NodeGUI.DEFAULT_BODY_COLOR);
exploreNodes.remove(0);
}
@@ -1268,11 +1266,11 @@ public class GraphCanvas implements XBay
this.nodePopup.remove(rerunItem);
this.nodePopup.remove(breakPointItem);
- if (this.engine.getWorkflow().getExecutionState() == XBayaExecutionState.PAUSED && !(node instanceof InputNode)) {
+ if (this.engine.getWorkflow().getExecutionState() == WorkflowExecutionState.PAUSED && !(node instanceof InputNode)) {
this.nodePopup.add(rerunItem);
}
- if (this.engine.getWorkflow().getExecutionState() != XBayaExecutionState.NONE) {
+ if (this.engine.getWorkflow().getExecutionState() != WorkflowExecutionState.NONE) {
if (node.isBreak()) {
breakPointItem.setText("Remove break Point");
} else {
@@ -1300,7 +1298,7 @@ public class GraphCanvas implements XBay
private void maybeShowPopup(MouseEvent event) {
if (event.isPopupTrigger()) {
- GraphPiece piece = this.graph.getGUI().getGraphPieceAt(event.getPoint());
+ GraphPiece piece = NodeController.getGUI(this.graph).getGraphPieceAt(event.getPoint());
if (piece instanceof Node) {
prepareNodePopupMenu((Node) piece);
this.nodePopup.show(event.getComponent(), event.getX(), event.getY());
@@ -1344,5 +1342,6 @@ public class GraphCanvas implements XBay
public void executionModeChanged(XBayaConfiguration config) {
editable=config.getXbayaExecutionMode()==XBayaExecutionMode.IDE;
getGraph().setEditable(editable);
+ this.workflow.setEditable(config.getXbayaExecutionMode()==XBayaExecutionMode.IDE);
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/GraphGUI.java Thu May 17 13:07:39 2012
@@ -37,8 +37,9 @@ import org.apache.airavata.xbaya.graph.G
import org.apache.airavata.xbaya.graph.GraphPiece;
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.system.MemoNode;
-import org.apache.airavata.xbaya.graph.system.gui.StreamSourceNode;
+import org.apache.airavata.xbaya.graph.system.StreamSourceNode;
import org.apache.airavata.xbaya.graph.util.GraphUtil;
public class GraphGUI implements GraphPieceGUI {
@@ -59,7 +60,7 @@ public class GraphGUI implements GraphPi
public void mouseClicked(MouseEvent event, XBayaEngine engine) {
GraphPiece piece = getGraphPieceAt(event.getPoint());
if (piece != null && graph.isEditable()) {
- piece.getGUI().mouseClicked(event, engine);
+ NodeController.getGUI(piece).mouseClicked(event, engine);
}
}
@@ -71,7 +72,7 @@ public class GraphGUI implements GraphPi
protected Rectangle getBounds() {
Rectangle bounds = new Rectangle();
for (Node node : this.graph.getNodes()) {
- bounds.add(node.getGUI().getBounds());
+ bounds.add(NodeController.getGUI(node).getBounds());
}
final int margin = 10;
bounds.height += margin;
@@ -86,7 +87,7 @@ public class GraphGUI implements GraphPi
// Calcurate the widge of the nodes.
for (Node node : this.graph.getNodes()) {
- node.getGUI().calculatePositions(g);
+ NodeController.getGUI(node).calculatePositions(g);
}
LinkedList<Node> nodes = new LinkedList<Node>(this.graph.getNodes());
@@ -95,25 +96,25 @@ public class GraphGUI implements GraphPi
// Paints the edges before nodes.
for (Edge edge : this.graph.getEdges()) {
- edge.getGUI().paint(g);
+ NodeController.getGUI(edge).paint(g);
}
// Paint regular nodes.
// The ports are painted from inside of each node.
for (Node node : nodes) {
- node.getGUI().paint(g);
+ NodeController.getGUI(node).paint(g);
}
// Print memoNodes at last so that they stay on top of everything.
for (MemoNode node : memoNodes) {
- node.getGUI().paint(g);
+ NodeController.getGUI(node).paint(g);
}
}
protected StreamSourceNode getStreamSourceAt(Point point) {
for (Node node : this.graph.getNodes()) {
// Check the node first
- if (node.getGUI().isIn(point) && node instanceof StreamSourceNode) {
+ if (NodeController.getGUI(node).isIn(point) && node instanceof StreamSourceNode) {
return (StreamSourceNode) node;
}
}
@@ -136,7 +137,7 @@ public class GraphGUI implements GraphPi
double minEdgeDist = Double.MAX_VALUE;
Edge closestEdge = null;
for (Edge edge : this.graph.getEdges()) {
- double dist = edge.getGUI().getMiddlePosition().distance(point);
+ double dist = NodeController.getGUI(edge).getMiddlePosition().distance(point);
if (dist < minEdgeDist) {
closestEdge = edge;
minEdgeDist = dist;
@@ -149,7 +150,7 @@ public class GraphGUI implements GraphPi
// Then, each node and ports of it.
for (Node node : this.graph.getNodes()) {
// Check the node first
- if (node.getGUI().isIn(point)) {
+ if (NodeController.getGUI(node).isIn(point)) {
piece = node;
}
@@ -157,7 +158,7 @@ public class GraphGUI implements GraphPi
double minPortDist = Double.MAX_VALUE;
Port closestPort = null;
for (Port port : node.getAllPorts()) {
- double dist = port.getGUI().getPosition().distance(point);
+ double dist = NodeController.getGUI(port).getPosition().distance(point);
if (dist < minPortDist) {
closestPort = port;
minPortDist = dist;
@@ -185,7 +186,7 @@ public class GraphGUI implements GraphPi
// Then, each node and ports of it.
for (Node node : this.graph.getNodes()) {
- Rectangle inter = SwingUtilities.computeIntersection(rec.x, rec.y, rec.width, rec.height, node.getGUI()
+ Rectangle inter = SwingUtilities.computeIntersection(rec.x, rec.y, rec.width, rec.height, NodeController.getGUI(node)
.getBounds());
if (inter.width != 0 && inter.height != 0)
pieces.add(node);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/NodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/NodeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/NodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/gui/NodeGUI.java Thu May 17 13:07:39 2012
@@ -36,6 +36,7 @@ import org.apache.airavata.xbaya.XBayaEn
import org.apache.airavata.xbaya.graph.DataPort;
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.monitor.gui.MonitorEventHandler.NodeState;
public abstract class NodeGUI implements GraphPieceGUI {
@@ -276,7 +277,7 @@ public abstract class NodeGUI implements
// Paint all ports
for (Port port : this.node.getAllPorts()) {
- port.getGUI().paint(g);
+ NodeController.getGUI(port).paint(g);
}
// Paint extras
@@ -294,7 +295,7 @@ public abstract class NodeGUI implements
for (int i = 0; i < inputPorts.size(); i++) {
Port port = inputPorts.get(i);
Point offset = new Point(PortGUI.DATA_PORT_SIZE / 2, this.headHeight + PORT_INITIAL_GAP + PORT_GAP * i);
- port.getGUI().setOffset(offset);
+ NodeController.getGUI(port).setOffset(offset);
}
// outputs
@@ -305,13 +306,13 @@ public abstract class NodeGUI implements
// overwrite getBounds() to have different shape.
Point offset = new Point(this.getBounds().width - PortGUI.DATA_PORT_SIZE / 2, this.headHeight
+ PORT_INITIAL_GAP + PORT_GAP * i);
- port.getGUI().setOffset(offset);
+ NodeController.getGUI(port).setOffset(offset);
}
// control-in
Port controlInPort = this.node.getControlInPort();
if (controlInPort != null) {
- controlInPort.getGUI().setOffset(new Point(0, 0));
+ NodeController.getGUI(controlInPort).setOffset(new Point(0, 0));
}
// control-outs
@@ -319,7 +320,7 @@ public abstract class NodeGUI implements
// By default, all ports will be drawn at the same place. Subclass
// should rearrange them if there are more than one control-out
// ports.
- controlOutPort.getGUI().setOffset(new Point(getBounds().width, getBounds().height));
+ NodeController.getGUI(controlOutPort).setOffset(new Point(getBounds().width, getBounds().height));
}
}
@@ -333,18 +334,18 @@ public abstract class NodeGUI implements
case EXECUTING:
for (DataPort dataPort : inputPorts) {
- ((DataPort) dataPort.getFromPort()).getGUI().removeToken(workflowName);
- dataPort.getGUI().addToken(workflowName);
+ NodeController.getGUI(((DataPort) dataPort.getFromPort())).removeToken(workflowName);
+ NodeController.getGUI(dataPort).addToken(workflowName);
}
break;
case FINISHED:
for (DataPort dataPort : inputPorts) {
- dataPort.getGUI().removeToken(workflowName);
+ NodeController.getGUI(dataPort).removeToken(workflowName);
}
List<DataPort> outputPorts = this.node.getOutputPorts();
for (DataPort dataPort : outputPorts) {
- dataPort.getGUI().addToken(workflowName);
+ NodeController.getGUI(dataPort).addToken(workflowName);
}
break;
case FAILED:
@@ -362,11 +363,11 @@ public abstract class NodeGUI implements
List<DataPort> inputPorts = this.node.getInputPorts();
for (DataPort dataPort : inputPorts) {
- dataPort.getGUI().reset();
+ NodeController.getGUI(dataPort).reset();
}
List<DataPort> outputPorts = this.node.getOutputPorts();
for (DataPort dataPort : outputPorts) {
- dataPort.getGUI().reset();
+ NodeController.getGUI(dataPort).reset();
}
}
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/EdgeImpl.java Thu May 17 13:07:39 2012
@@ -25,7 +25,6 @@ import org.apache.airavata.common.utils.
import org.apache.airavata.xbaya.graph.Edge;
import org.apache.airavata.xbaya.graph.GraphException;
import org.apache.airavata.xbaya.graph.GraphSchema;
-import org.apache.airavata.xbaya.graph.gui.EdgeGUI;
import org.xmlpull.infoset.XmlElement;
/**
@@ -39,9 +38,6 @@ public abstract class EdgeImpl implement
private PortImpl fromPort;
private PortImpl toPort;
-
- private EdgeGUI gui;
-
// The followings are used only during parsing the XML.
private String fromPortID;
@@ -67,16 +63,6 @@ public abstract class EdgeImpl implement
}
/**
- * @see org.apache.airavata.xbaya.graph.Edge#getGUI()
- */
- public EdgeGUI getGUI() {
- if (this.gui == null) {
- this.gui = new EdgeGUI(this);
- }
- return this.gui;
- }
-
- /**
* @see org.apache.airavata.xbaya.graph.Edge#getFromPort()
*/
public PortImpl getFromPort() {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/GraphImpl.java Thu May 17 13:07:39 2012
@@ -42,11 +42,10 @@ 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.Port.Kind;
-import org.apache.airavata.xbaya.graph.gui.GraphGUI;
import org.apache.airavata.xbaya.graph.system.InputNode;
import org.apache.airavata.xbaya.graph.system.OutputNode;
+import org.apache.airavata.xbaya.graph.system.StreamSourceNode;
import org.apache.airavata.xbaya.graph.system.SystemDataPort;
-import org.apache.airavata.xbaya.graph.system.gui.StreamSourceNode;
import org.apache.airavata.xbaya.graph.util.GraphUtil;
import org.apache.airavata.xbaya.graph.ws.WSPort;
import org.slf4j.Logger;
@@ -80,22 +79,11 @@ public abstract class GraphImpl implemen
private GraphFactory factory;
- private GraphGUI gui;
-
-
/**
* @param factory
*/
public GraphImpl(GraphFactory factory) {
this.factory = factory;
- this.gui = new GraphGUI(this);
- }
-
- /**
- * @see org.apache.airavata.xbaya.graph.Graph#getGUI()
- */
- public GraphGUI getGUI() {
- return this.gui;
}
/**
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/NodeImpl.java Thu May 17 13:07:39 2012
@@ -40,7 +40,6 @@ 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.Port.Kind;
-import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xmlpull.infoset.XmlElement;
@@ -675,7 +674,5 @@ public abstract class NodeImpl implement
public boolean getRequireJoin() {
return this.requireJoin;
}
- public boolean isFinished(){
- return this.getGUI().getBodyColor() == MonitorEventHandler.NodeState.FINISHED.color;
- }
+
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/impl/PortImpl.java Thu May 17 13:07:39 2012
@@ -33,10 +33,6 @@ import org.apache.airavata.xbaya.graph.G
import org.apache.airavata.xbaya.graph.GraphSchema;
import org.apache.airavata.xbaya.graph.Node;
import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.gui.PortGUI;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.system.OutputNode;
-import org.apache.airavata.xbaya.graph.system.SystemDataPort;
import org.xmlpull.infoset.XmlElement;
/**
@@ -74,8 +70,6 @@ public abstract class PortImpl implement
private ComponentPort componentPort;
- private PortGUI gui;
-
/**
* The ID of the node that this port belongs to. This is used only during parsing the XML.
*/
@@ -98,15 +92,6 @@ public abstract class PortImpl implement
parse(portElement);
}
- /**
- * @see org.apache.airavata.xbaya.graph.Port#getGUI()
- */
- public PortGUI getGUI() {
- if (this.gui == null) {
- this.gui = new PortGUI(this);
- }
- return this.gui;
- }
/**
* @see org.apache.airavata.xbaya.graph.Port#getID()