airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1339587 [2/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...
Date Thu, 17 May 2012 13:07:43 GMT
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNode.java Thu May 17 13:07:39 2012
@@ -21,21 +21,19 @@
 
 package org.apache.airavata.xbaya.graph.subworkflow;
 
+import java.util.List;
+
 import org.apache.airavata.xbaya.component.SubWorkflowComponent;
 import org.apache.airavata.xbaya.graph.DataPort;
 import org.apache.airavata.xbaya.graph.Edge;
 import org.apache.airavata.xbaya.graph.Graph;
 import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
 import org.apache.airavata.xbaya.graph.impl.NodeImpl;
 import org.apache.airavata.xbaya.graph.util.GraphUtil;
 import org.apache.airavata.xbaya.wf.Workflow;
 
-import java.util.List;
-
 public class SubWorkflowNode extends NodeImpl {
 
-    private SubWorkflowNodeGUI gui;
     private Workflow workflow;
 
     /**
@@ -47,15 +45,6 @@ public class SubWorkflowNode extends Nod
         super(graph);
     }
 
-    /**
-     * @see org.apache.airavata.xbaya.graph.ws.WSNode#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new SubWorkflowNodeGUI(this);
-        }
-        return this.gui;
-    }
 
     /**
      * @see org.apache.airavata.xbaya.graph.ws.WSNode#getComponent()

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/gui/SubWorkflowNodeGUI.java (from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNodeGUI.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/gui/SubWorkflowNodeGUI.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/gui/SubWorkflowNodeGUI.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNodeGUI.java&r1=1338688&r2=1339587&rev=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/SubWorkflowNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/subworkflow/gui/SubWorkflowNodeGUI.java Thu May 17 13:07:39 2012
@@ -19,7 +19,7 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.subworkflow;
+package org.apache.airavata.xbaya.graph.subworkflow.gui;
 
 import java.awt.Color;
 import java.awt.event.MouseEvent;
@@ -28,6 +28,7 @@ import org.apache.airavata.xbaya.XBayaEn
 import org.apache.airavata.xbaya.component.ComponentException;
 import org.apache.airavata.xbaya.graph.GraphException;
 import org.apache.airavata.xbaya.graph.gui.NodeGUI;
+import org.apache.airavata.xbaya.graph.subworkflow.SubWorkflowNode;
 import org.apache.airavata.xbaya.gui.ErrorMessages;
 import org.apache.airavata.xbaya.wf.Workflow;
 import org.apache.airavata.xbaya.workflow.WorkflowClient;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/BlockNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/BlockNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/BlockNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/BlockNode.java Thu May 17 13:07:39 2012
@@ -25,14 +25,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.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.gui.BlockNodeGUI;
 import org.xmlpull.infoset.XmlElement;
 
 public class BlockNode extends SystemNode {
 
-    private BlockNodeGUI gui;
-
     /**
      * Creates a InputNode.
      * 
@@ -53,16 +49,6 @@ public class BlockNode extends SystemNod
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new BlockNodeGUI(this);
-        }
-        return this.gui;
-    }
-
-    /**
      * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#getComponent()
      */
     @Override

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ConstantNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ConstantNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ConstantNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ConstantNode.java Thu May 17 13:07:39 2012
@@ -36,8 +36,6 @@ import org.apache.airavata.xbaya.graph.G
 import org.apache.airavata.xbaya.graph.GraphException;
 import org.apache.airavata.xbaya.graph.GraphSchema;
 import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.gui.ConstantNodeGUI;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xmlpull.infoset.XmlElement;
@@ -54,8 +52,6 @@ public class ConstantNode extends System
 
     private Object value;
 
-    private ConstantNodeGUI gui;
-
     /**
      * Creates a InputNode.
      * 
@@ -76,16 +72,6 @@ public class ConstantNode extends System
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new ConstantNodeGUI(this);
-        }
-        return this.gui;
-    }
-
-    /**
      * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#getComponent()
      */
     @Override

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/DifferedInputNode.java (from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputNode.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/DifferedInputNode.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/DifferedInputNode.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputNode.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/DifferedInputNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/DifferedInputNode.java Thu May 17 13:07:39 2012
@@ -5,7 +5,7 @@
  *
  * $Id: $
  */
-package org.apache.airavata.xbaya.graph.system.gui;
+package org.apache.airavata.xbaya.graph.system;
 
 import java.util.List;
 
@@ -14,6 +14,7 @@ import javax.xml.namespace.QName;
 import org.apache.airavata.common.utils.WSConstants;
 import org.apache.airavata.xbaya.XBayaRuntimeException;
 import org.apache.airavata.xbaya.component.Component;
+import org.apache.airavata.xbaya.component.system.DifferedInputComponent;
 import org.apache.airavata.xbaya.component.system.InputComponent;
 import org.apache.airavata.xbaya.component.ws.WSComponentPort;
 import org.apache.airavata.xbaya.graph.DataEdge;
@@ -23,8 +24,6 @@ import org.apache.airavata.xbaya.graph.G
 import org.apache.airavata.xbaya.graph.GraphException;
 import org.apache.airavata.xbaya.graph.GraphSchema;
 import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.system.ParameterNode;
-import org.apache.airavata.xbaya.graph.system.SystemDataPort;
 import org.apache.airavata.xbaya.graph.ws.WSPort;
 import org.xmlpull.infoset.XmlElement;
 
@@ -41,8 +40,6 @@ public class DifferedInputNode extends P
 
     private Object defaultValue;
 
-    private DifferedInputNodeGUI gui;
-
     /**
      * Creates an InputNode.
      * 
@@ -63,17 +60,6 @@ public class DifferedInputNode extends P
     }
 
     /**
-     * @see edu.indiana.extreme.xbaya.graph.Node#getGUI()
-     */
-    @Override
-	public DifferedInputNodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new DifferedInputNodeGUI(this);
-        }
-        return this.gui;
-    }
-
-    /**
      * @see edu.indiana.extreme.xbaya.graph.impl.NodeImpl#getComponent()
      */
     @Override

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndBlockNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndBlockNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndBlockNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndBlockNode.java Thu May 17 13:07:39 2012
@@ -34,14 +34,10 @@ import org.apache.airavata.xbaya.graph.G
 import org.apache.airavata.xbaya.graph.GraphException;
 import org.apache.airavata.xbaya.graph.GraphSchema;
 import org.apache.airavata.xbaya.graph.Port.Kind;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.gui.EndBlockNodeGUI;
 import org.xmlpull.infoset.XmlElement;
 
 public class EndBlockNode extends SystemNode {
 
-    private EndBlockNodeGUI gui;
-
     /**
      * Creates a InputNode.
      * 
@@ -62,16 +58,6 @@ public class EndBlockNode extends System
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new EndBlockNodeGUI(this);
-        }
-        return this.gui;
-    }
-
-    /**
      * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#getComponent()
      */
     @Override

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndForEachNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndForEachNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndForEachNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndForEachNode.java Thu May 17 13:07:39 2012
@@ -38,14 +38,10 @@ import org.apache.airavata.xbaya.graph.G
 import org.apache.airavata.xbaya.graph.GraphSchema;
 import org.apache.airavata.xbaya.graph.Port;
 import org.apache.airavata.xbaya.graph.Port.Kind;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.gui.EndForEachNodeGUI;
 import org.xmlpull.infoset.XmlElement;
 
 public class EndForEachNode extends SystemNode {
 
-    private EndForEachNodeGUI gui;
-
     /**
      * Creates a InputNode.
      * 
@@ -66,16 +62,6 @@ public class EndForEachNode extends Syst
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new EndForEachNodeGUI(this);
-        }
-        return this.gui;
-    }
-
-    /**
      * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#getComponent()
      */
     @Override

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndifNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndifNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndifNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/EndifNode.java Thu May 17 13:07:39 2012
@@ -34,14 +34,10 @@ import org.apache.airavata.xbaya.graph.G
 import org.apache.airavata.xbaya.graph.GraphException;
 import org.apache.airavata.xbaya.graph.GraphSchema;
 import org.apache.airavata.xbaya.graph.Port.Kind;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.gui.EndifNodeGUI;
 import org.xmlpull.infoset.XmlElement;
 
 public class EndifNode extends SystemNode {
 
-    private EndifNodeGUI gui;
-
     /**
      * Creates a InputNode.
      * 
@@ -61,15 +57,6 @@ public class EndifNode extends SystemNod
         super(nodeElement);
     }
 
-    /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new EndifNodeGUI(this);
-        }
-        return this.gui;
-    }
 
     /**
      * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#getComponent()

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ExitNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ExitNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ExitNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ExitNode.java Thu May 17 13:07:39 2012
@@ -23,21 +23,17 @@ package org.apache.airavata.xbaya.graph.
 
 import java.util.List;
 
-import org.apache.airavata.xbaya.component.registry.ExitComponent;
+import org.apache.airavata.xbaya.component.ExitComponent;
 import org.apache.airavata.xbaya.graph.ControlEdge;
 import org.apache.airavata.xbaya.graph.Edge;
 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.gui.NodeGUI;
 import org.apache.airavata.xbaya.graph.impl.PortImpl;
-import org.apache.airavata.xbaya.graph.system.gui.ExitNodeGUI;
 import org.xmlpull.infoset.XmlElement;
 
 public class ExitNode extends SystemNode {
 
-    private ExitNodeGUI gui;
-
     /**
      * Constructs a BPELExitNode.
      * 
@@ -48,16 +44,6 @@ public class ExitNode extends SystemNode
         // TODO Auto-generated constructor stub
     }
 
-    /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (gui == null) {
-            this.gui = new ExitNodeGUI(this);
-        }
-        return gui;
-    }
-
     @Override
     protected void parseComponent(XmlElement componentElement) {
         // No need to parse the XML.

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ForEachNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ForEachNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ForEachNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ForEachNode.java Thu May 17 13:07:39 2012
@@ -39,16 +39,12 @@ import org.apache.airavata.xbaya.graph.G
 import org.apache.airavata.xbaya.graph.Port;
 import org.apache.airavata.xbaya.graph.Port.Kind;
 import org.apache.airavata.xbaya.graph.dynamic.PortAddable;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.gui.ForEachNodeGUI;
 import org.xmlpull.infoset.XmlElement;
 
 public class ForEachNode extends SystemNode implements PortAddable{
 
     // private static final MLogger logger = MLogger.getLogger();
 
-    private ForEachNodeGUI gui;
-
     /**
      * Creates a InputNode.
      *
@@ -73,18 +69,6 @@ public class ForEachNode extends SystemN
      * @return
      */
     @Override
-	public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new ForEachNodeGUI(this);
-        }
-        return this.gui;
-    }
-
-    /**
-     *
-     * @return
-     */
-    @Override
     public ForEachComponent getComponent() {
         ForEachComponent component = (ForEachComponent) super.getComponent();
         if (component == null) {

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/IfNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/IfNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/IfNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/IfNode.java Thu May 17 13:07:39 2012
@@ -29,16 +29,12 @@ import org.apache.airavata.xbaya.graph.D
 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.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.gui.IfNodeGUI;
 import org.xmlpull.infoset.XmlElement;
 
 public class IfNode extends SystemNode {
 
     private static final String XPATH_TAG_NAME = "xpath";
 
-    private IfNodeGUI gui;
-
     private String xpath;
 
     /**
@@ -84,16 +80,6 @@ public class IfNode extends SystemNode {
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new IfNodeGUI(this);
-        }
-        return this.gui;
-    }
-
-    /**
      * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#getComponent()
      */
     @Override

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/InputNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/InputNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/InputNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/InputNode.java Thu May 17 13:07:39 2012
@@ -37,8 +37,6 @@ import org.apache.airavata.xbaya.graph.G
 import org.apache.airavata.xbaya.graph.GraphException;
 import org.apache.airavata.xbaya.graph.GraphSchema;
 import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.gui.InputNodeGUI;
 import org.apache.airavata.xbaya.graph.ws.WSPort;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,8 +52,6 @@ public class InputNode extends Parameter
 
     private Object defaultValue;
 
-    private InputNodeGUI gui;
-
     private boolean visibility;
 
     /**
@@ -79,16 +75,6 @@ public class InputNode extends Parameter
         super(nodeElement);
     }
 
-    /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new InputNodeGUI(this);
-        }
-        return this.gui;
-    }
-
     public boolean isVisibility() {
         return visibility;
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/MemoNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/MemoNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/MemoNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/MemoNode.java Thu May 17 13:07:39 2012
@@ -24,14 +24,10 @@ package org.apache.airavata.xbaya.graph.
 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.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.gui.MemoNodeGUI;
 import org.xmlpull.infoset.XmlElement;
 
 public class MemoNode extends SystemNode {
 
-    private MemoNodeGUI gui;
-
     private String memo;
 
     /**
@@ -74,16 +70,6 @@ public class MemoNode extends SystemNode
         this.memo = memo;
     }
 
-    /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new MemoNodeGUI(this);
-        }
-        return this.gui;
-    }
-
     @Override
     protected XmlElement toXML() {
         XmlElement nodeElement = super.toXML();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/OutputNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/OutputNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/OutputNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/OutputNode.java Thu May 17 13:07:39 2012
@@ -36,15 +36,11 @@ import org.apache.airavata.xbaya.graph.G
 import org.apache.airavata.xbaya.graph.GraphException;
 import org.apache.airavata.xbaya.graph.GraphSchema;
 import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.gui.OutputNodeGUI;
 import org.apache.airavata.xbaya.graph.ws.WSPort;
 import org.xmlpull.infoset.XmlElement;
 
 public class OutputNode extends ParameterNode {
 
-    private OutputNodeGUI gui;
-
     /**
      * Creates a OutputNode.
      * 
@@ -65,16 +61,6 @@ public class OutputNode extends Paramete
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new OutputNodeGUI(this);
-        }
-        return this.gui;
-    }
-
-    /**
      * Returns the type of the parameter
      * 
      * @return The type of the parameter (e.g. string, int)

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ReceiveNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ReceiveNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ReceiveNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/ReceiveNode.java Thu May 17 13:07:39 2012
@@ -30,14 +30,10 @@ 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.GraphSchema;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.gui.ReceiveNodeGUI;
 import org.xmlpull.infoset.XmlElement;
 
 public class ReceiveNode extends SystemNode {
 
-    private ReceiveNodeGUI gui;
-
     /**
      * Creates a InputNode.
      * 
@@ -58,16 +54,6 @@ public class ReceiveNode extends SystemN
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new ReceiveNodeGUI(this);
-        }
-        return this.gui;
-    }
-
-    /**
      * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#getComponent()
      */
     @Override

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/S3InputNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/S3InputNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/S3InputNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/S3InputNode.java Thu May 17 13:07:39 2012
@@ -37,8 +37,6 @@ import org.apache.airavata.xbaya.graph.G
 import org.apache.airavata.xbaya.graph.GraphException;
 import org.apache.airavata.xbaya.graph.GraphSchema;
 import org.apache.airavata.xbaya.graph.Port;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.gui.S3InputNodeGUI;
 import org.apache.airavata.xbaya.graph.ws.WSPort;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,8 +50,6 @@ public class S3InputNode extends InputNo
 
     private Object defaultValue;
 
-    private S3InputNodeGUI gui;
-
     /**
      * Creates an InputNode.
      * 
@@ -74,16 +70,6 @@ public class S3InputNode extends InputNo
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new S3InputNodeGUI(this);
-        }
-        return this.gui;
-    }
-
-    /**
      * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#getComponent()
      */
     @Override

Copied: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/StreamSourceNode.java (from r1338688, incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceNode.java)
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/StreamSourceNode.java?p2=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/StreamSourceNode.java&p1=incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceNode.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/StreamSourceNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/StreamSourceNode.java Thu May 17 13:07:39 2012
@@ -19,22 +19,17 @@
  *
  */
 
-package org.apache.airavata.xbaya.graph.system.gui;
+package org.apache.airavata.xbaya.graph.system;
 
 import java.awt.Point;
 import java.util.ArrayList;
 
 import org.apache.airavata.xbaya.component.Component;
 import org.apache.airavata.xbaya.component.StreamSourceComponent;
-import org.apache.airavata.xbaya.component.gui.StreamSourceNodeGUI;
 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.Port;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.system.InputNode;
-import org.apache.airavata.xbaya.graph.system.ParameterNode;
-import org.apache.airavata.xbaya.graph.system.SystemDataPort;
 import org.apache.axiom.om.util.UUIDGenerator;
 import org.xmlpull.infoset.XmlElement;
 
@@ -42,8 +37,6 @@ public class StreamSourceNode extends Pa
 
     private String streamSourceURL;
 
-    private StreamSourceNodeGUI gui;
-
     private ArrayList<InputNode> inputNodes = new ArrayList<InputNode>();
 
     private String label;
@@ -70,16 +63,6 @@ public class StreamSourceNode extends Pa
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new StreamSourceNodeGUI(this);
-        }
-        return this.gui;
-    }
-
-    /**
      * @see org.apache.airavata.xbaya.graph.impl.NodeImpl#getComponent()
      */
     @Override

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/BlockNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/BlockNodeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/BlockNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/BlockNodeGUI.java Thu May 17 13:07:39 2012
@@ -27,6 +27,7 @@ import java.awt.Point;
 import java.util.List;
 
 import org.apache.airavata.xbaya.graph.Port;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
 import org.apache.airavata.xbaya.graph.gui.NodeGUI;
 import org.apache.airavata.xbaya.graph.system.BlockNode;
 
@@ -68,18 +69,18 @@ public class BlockNodeGUI extends NodeGU
 
         Port controlInPort = this.node.getControlInPort();
         if (controlInPort != null) {
-            controlInPort.getGUI().setOffset(new Point(0, 0));
+        	NodeController.getGUI(controlInPort).setOffset(new Point(0, 0));
         }
 
         // There are two controlOutPorts.
         List<? extends Port> controlOutPorts = this.node.getControlOutPorts();
         Port controlOutPort1 = controlOutPorts.get(0);
         Point offset = new Point(getBounds().width, +getBounds().height / 2);
-        controlOutPort1.getGUI().setOffset(offset);
+        NodeController.getGUI(controlOutPort1).setOffset(offset);
 
         Port controlOutPort2 = controlOutPorts.get(1);
         offset = new Point(this.getBounds().width, getBounds().height);
-        controlOutPort2.getGUI().setOffset(offset);
+        NodeController.getGUI(controlOutPort2).setOffset(offset);
 
         // No outputs
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputConfigurationDialog.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputConfigurationDialog.java Thu May 17 13:07:39 2012
@@ -17,6 +17,8 @@ import javax.xml.namespace.QName;
 import org.apache.airavata.common.utils.WSConstants;
 import org.apache.airavata.common.utils.XMLUtil;
 import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.graph.system.DifferedInputNode;
 import org.apache.airavata.xbaya.gui.GridPanel;
 import org.apache.airavata.xbaya.gui.XBayaDialog;
 import org.apache.airavata.xbaya.gui.XBayaLabel;
@@ -126,7 +128,7 @@ public class DifferedInputConfigurationD
     private void hide() {
     	
         this.dialog.hide();
-        this.node.getGUI().closingDisplay();
+        ((DifferedInputNodeGUI)NodeController.getGUI(this.node)).closingDisplay();
     }
 
     private void setInput() {
@@ -184,7 +186,7 @@ public class DifferedInputConfigurationD
         this.node.setDescription(description);
         this.node.setDefaultValue(value);
         this.node.setMetadata(metadata);
-        this.node.getGUI().setBodyColor(NodeState.FINISHED.color);
+        NodeController.getGUI(this.node).setBodyColor(NodeState.FINISHED.color);
         
         hide();
         this.engine.getGUI().getGraphCanvas().repaint();

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputHandler.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputHandler.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputHandler.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputHandler.java Thu May 17 13:07:39 2012
@@ -12,6 +12,8 @@ import java.util.List;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.DataPort;
 import org.apache.airavata.xbaya.graph.Node;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
+import org.apache.airavata.xbaya.graph.system.DifferedInputNode;
 
 /**
  * @author Chathura Herath
@@ -32,7 +34,7 @@ public class DifferedInputHandler {
 						
 						@Override
 						public void run() {
-							differedInputNode.getGUI().showConfigurationDialog(engine );
+							((DifferedInputNodeGUI)NodeController.getGUI(differedInputNode)).showConfigurationDialog(engine );
 						}
 					};
 					new Thread(task).start();
@@ -51,7 +53,7 @@ public class DifferedInputHandler {
 		boolean atleadOneDifferedInputNodeIsIncomplete = false; 
 		for (DataPort dataPort : inputPorts) {
 			Node fromNode = dataPort.getFromNode();
-			if(fromNode.isFinished()){
+			if(NodeController.isFinished(fromNode)){
 				//no op
 			}else if(isDifferedInputNode(fromNode)){
 				//not finished

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputNodeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/DifferedInputNodeGUI.java Thu May 17 13:07:39 2012
@@ -10,6 +10,7 @@ package org.apache.airavata.xbaya.graph.
 import java.awt.Color;
 
 import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.graph.system.DifferedInputNode;
 import org.apache.airavata.xbaya.gui.ErrorMessages;
 
 /**

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndBlockNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndBlockNodeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndBlockNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndBlockNodeGUI.java Thu May 17 13:07:39 2012
@@ -30,6 +30,7 @@ import java.util.List;
 
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.Port;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
 import org.apache.airavata.xbaya.graph.gui.PortGUI;
 import org.apache.airavata.xbaya.graph.system.EndBlockNode;
 
@@ -118,7 +119,7 @@ public class EndBlockNodeGUI extends Con
 
         // Paint all ports
         for (Port port : this.node.getAllPorts()) {
-            port.getGUI().paint(g);
+            NodeController.getGUI(port).paint(g);
         }
 
         paintConfiguration(g);
@@ -139,7 +140,7 @@ public class EndBlockNodeGUI extends Con
             } else {
                 offset = new Point(PortGUI.DATA_PORT_SIZE / 2, this.headHeight + PORT_INITIAL_GAP + PORT_GAP * (i + 1));
             }
-            port.getGUI().setOffset(offset);
+            NodeController.getGUI(port).setOffset(offset);
         }
 
         // outputs
@@ -148,18 +149,18 @@ public class EndBlockNodeGUI extends Con
             Port port = outputPorts.get(i);
             Point offset = new Point(this.getBounds().width - PortGUI.DATA_PORT_SIZE / 2, (int) (this.headHeight
                     + PORT_INITIAL_GAP + PORT_GAP * (outputPorts.size() / 2.0 + 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-out
         for (Port controlOutPort : this.node.getControlOutPorts()) {
-            controlOutPort.getGUI().setOffset(new Point(getBounds().width, getBounds().height - this.headHeight / 2));
+        	NodeController.getGUI(controlOutPort).setOffset(new Point(getBounds().width, getBounds().height - this.headHeight / 2));
             break; // Has only one
         }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndForEachNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndForEachNodeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndForEachNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndForEachNodeGUI.java Thu May 17 13:07:39 2012
@@ -29,6 +29,7 @@ import java.awt.Rectangle;
 
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.Port;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
 import org.apache.airavata.xbaya.graph.system.EndForEachNode;
 
 public class EndForEachNodeGUI extends ConfigurableNodeGUI {
@@ -116,7 +117,7 @@ public class EndForEachNodeGUI extends C
 
         // Paint all ports
         for (Port port : this.node.getAllPorts()) {
-            port.getGUI().paint(g);
+            NodeController.getGUI(port).paint(g);
         }
 
         paintConfiguration(g);
@@ -140,7 +141,7 @@ public class EndForEachNodeGUI extends C
         super.setPortPositions();
 
         for (Port controlOutPort : this.node.getControlOutPorts()) {
-            controlOutPort.getGUI().setOffset(new Point(getBounds().width, getBounds().height - this.headHeight / 2));
+        	NodeController.getGUI(controlOutPort).setOffset(new Point(getBounds().width, getBounds().height - this.headHeight / 2));
             break; // Has only one
         }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndifNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndifNodeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndifNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/EndifNodeGUI.java Thu May 17 13:07:39 2012
@@ -30,6 +30,7 @@ import java.util.List;
 
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.Port;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
 import org.apache.airavata.xbaya.graph.gui.PortGUI;
 import org.apache.airavata.xbaya.graph.system.EndifNode;
 
@@ -118,7 +119,7 @@ public class EndifNodeGUI extends Config
 
         // Paint all ports
         for (Port port : this.node.getAllPorts()) {
-            port.getGUI().paint(g);
+            NodeController.getGUI(port).paint(g);
         }
 
         paintConfiguration(g);
@@ -139,7 +140,7 @@ public class EndifNodeGUI extends Config
             } else {
                 offset = new Point(PortGUI.DATA_PORT_SIZE / 2, this.headHeight + PORT_INITIAL_GAP + PORT_GAP * (i + 1));
             }
-            port.getGUI().setOffset(offset);
+            NodeController.getGUI(port).setOffset(offset);
         }
 
         // outputs
@@ -148,18 +149,18 @@ public class EndifNodeGUI extends Config
             Port port = outputPorts.get(i);
             Point offset = new Point(this.getBounds().width - PortGUI.DATA_PORT_SIZE / 2, (int) (this.headHeight
                     + PORT_INITIAL_GAP + PORT_GAP * (outputPorts.size() / 2.0 + 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-out
         for (Port controlOutPort : this.node.getControlOutPorts()) {
-            controlOutPort.getGUI().setOffset(new Point(getBounds().width, getBounds().height - this.headHeight / 2));
+        	NodeController.getGUI(controlOutPort).setOffset(new Point(getBounds().width, getBounds().height - this.headHeight / 2));
             break; // Has only one
         }
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ExitNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ExitNodeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ExitNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ExitNodeGUI.java Thu May 17 13:07:39 2012
@@ -28,6 +28,7 @@ import java.awt.Graphics2D;
 import java.awt.Point;
 
 import org.apache.airavata.xbaya.graph.Port;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
 import org.apache.airavata.xbaya.graph.gui.NodeGUI;
 import org.apache.airavata.xbaya.graph.gui.Paintable;
 import org.apache.airavata.xbaya.graph.system.ExitNode;
@@ -82,7 +83,7 @@ public class ExitNodeGUI extends NodeGUI
 
         // Paint all ports
         for (Port port : this.node.getAllPorts()) {
-            port.getGUI().paint(g);
+            NodeController.getGUI(port).paint(g);
         }
 
         // Paint extras

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ForEachNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ForEachNodeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ForEachNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ForEachNodeGUI.java Thu May 17 13:07:39 2012
@@ -29,6 +29,7 @@ import java.awt.Rectangle;
 
 import org.apache.airavata.xbaya.XBayaEngine;
 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.ForEachNode;
 
@@ -127,7 +128,7 @@ public class ForEachNodeGUI extends Conf
 
         // Paint all ports
         for (Port port : this.node.getAllPorts()) {
-            port.getGUI().paint(g);
+            NodeController.getGUI(port).paint(g);
         }
 
         paintConfiguration(g);
@@ -154,7 +155,7 @@ public class ForEachNodeGUI extends Conf
         PortImpl controlInPort = this.node.getControlInPort();
         if (controlInPort != null) {
             Point off = new Point(0, this.headHeight / 2);
-            controlInPort.getGUI().setOffset(off);
+            NodeController.getGUI(controlInPort).setOffset(off);
         }
     }
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfNodeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/IfNodeGUI.java Thu May 17 13:07:39 2012
@@ -30,6 +30,7 @@ import java.util.List;
 
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.Port;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
 import org.apache.airavata.xbaya.graph.gui.PortGUI;
 import org.apache.airavata.xbaya.graph.impl.PortImpl;
 import org.apache.airavata.xbaya.graph.system.IfNode;
@@ -130,7 +131,7 @@ public class IfNodeGUI extends Configura
 
         // Paint all ports
         for (Port port : this.node.getAllPorts()) {
-            port.getGUI().paint(g);
+            NodeController.getGUI(port).paint(g);
         }
 
         paintConfiguration(g);
@@ -145,24 +146,24 @@ public class IfNodeGUI extends Configura
         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);
         }
 
         PortImpl controlInPort = this.node.getControlInPort();
         if (controlInPort != null) {
             Point offset = new Point(0, this.headHeight / 2);
-            controlInPort.getGUI().setOffset(offset);
+            NodeController.getGUI(controlInPort).setOffset(offset);
         }
 
         // There are two controlOutPorts.
         List<? extends Port> controlOutPorts = this.node.getControlOutPorts();
         Port controlOutPort1 = controlOutPorts.get(0);
         Point offset = new Point(getBounds().width, +this.headHeight / 2);
-        controlOutPort1.getGUI().setOffset(offset);
+        NodeController.getGUI(controlOutPort1).setOffset(offset);
 
         Port controlOutPort2 = controlOutPorts.get(1);
         offset = new Point(this.getBounds().width, getBounds().height - this.headHeight / 2);
-        controlOutPort2.getGUI().setOffset(offset);
+        NodeController.getGUI(controlOutPort2).setOffset(offset);
 
         // No outputs
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveNodeGUI.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/ReceiveNodeGUI.java Thu May 17 13:07:39 2012
@@ -29,6 +29,7 @@ import java.awt.Rectangle;
 
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.Port;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
 import org.apache.airavata.xbaya.graph.system.ReceiveNode;
 
 public class ReceiveNodeGUI extends ConfigurableNodeGUI {
@@ -116,7 +117,7 @@ public class ReceiveNodeGUI extends Conf
 
         // Paint all ports
         for (Port port : this.node.getAllPorts()) {
-            port.getGUI().paint(g);
+            NodeController.getGUI(port).paint(g);
         }
 
         paintConfiguration(g);
@@ -139,12 +140,12 @@ public class ReceiveNodeGUI extends Conf
         super.setPortPositions();
 
         for (Port controlOutPort : this.node.getControlOutPorts()) {
-            controlOutPort.getGUI().setOffset(new Point(getBounds().width, getBounds().height - this.headHeight / 2));
+        	NodeController.getGUI(controlOutPort).setOffset(new Point(getBounds().width, getBounds().height - this.headHeight / 2));
             break; // Has only one
         }
 
         Port port = this.node.getEPRPort();
-        port.getGUI().setOffset(new Point(getBounds().width / 2, this.headHeight / 4));
+        NodeController.getGUI(port).setOffset(new Point(getBounds().width / 2, this.headHeight / 4));
     }
 
 }
\ No newline at end of file

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceConfigurationDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceConfigurationDialog.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceConfigurationDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/system/gui/StreamSourceConfigurationDialog.java Thu May 17 13:07:39 2012
@@ -28,6 +28,7 @@ import javax.swing.JButton;
 import javax.swing.JPanel;
 
 import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.graph.system.StreamSourceNode;
 import org.apache.airavata.xbaya.gui.GridPanel;
 import org.apache.airavata.xbaya.gui.XBayaDialog;
 import org.apache.airavata.xbaya.gui.XBayaLabel;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/util/GraphUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/util/GraphUtil.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/util/GraphUtil.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/util/GraphUtil.java Thu May 17 13:07:39 2012
@@ -54,7 +54,7 @@ import org.apache.airavata.xbaya.graph.i
 import org.apache.airavata.xbaya.graph.subworkflow.SubWorkflowNode;
 import org.apache.airavata.xbaya.graph.system.InputNode;
 import org.apache.airavata.xbaya.graph.system.OutputNode;
-import org.apache.airavata.xbaya.graph.system.gui.StreamSourceNode;
+import org.apache.airavata.xbaya.graph.system.StreamSourceNode;
 import org.apache.airavata.xbaya.graph.ws.WSGraph;
 import org.apache.airavata.xbaya.graph.ws.WSNode;
 import org.apache.airavata.xbaya.graph.ws.WSPort;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSGraphFactory.java Thu May 17 13:07:39 2012
@@ -53,8 +53,8 @@ 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.StreamSourceNode;
 import org.apache.airavata.xbaya.graph.system.SystemDataPort;
-import org.apache.airavata.xbaya.graph.system.gui.StreamSourceNode;
 import org.apache.airavata.xbaya.gui.ErrorMessages;
 import org.xmlpull.infoset.XmlElement;
 

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WSNode.java Thu May 17 13:07:39 2012
@@ -26,11 +26,13 @@ import javax.xml.namespace.QName;
 import org.apache.airavata.xbaya.component.ComponentException;
 import org.apache.airavata.xbaya.component.ws.WSComponent;
 import org.apache.airavata.xbaya.component.ws.WSComponentFactory;
-import org.apache.airavata.xbaya.graph.*;
-import org.apache.airavata.xbaya.graph.gui.NodeGUI;
+import org.apache.airavata.xbaya.graph.Edge;
+import org.apache.airavata.xbaya.graph.ForEachExecutableNode;
+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.impl.NodeImpl;
 import org.apache.airavata.xbaya.graph.util.GraphUtil;
-import org.apache.airavata.xbaya.graph.ws.gui.WSNodeGUI;
 import org.apache.airavata.xbaya.gui.ErrorMessages;
 import org.xmlpull.infoset.XmlElement;
 
@@ -42,8 +44,6 @@ public class WSNode extends NodeImpl imp
 
     protected String operationName;
 
-    private WSNodeGUI gui;
-
     /**
      * Constructs a WsdlNode.
      * 
@@ -64,16 +64,6 @@ public class WSNode extends NodeImpl imp
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.Node#getGUI()
-     */
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new WSNodeGUI(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/ws/WorkflowNode.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WorkflowNode.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WorkflowNode.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/ws/WorkflowNode.java Thu May 17 13:07:39 2012
@@ -25,14 +25,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.gui.NodeGUI;
-import org.apache.airavata.xbaya.graph.ws.gui.WorkflowNodeGUI;
 import org.xmlpull.infoset.XmlElement;
 
 public class WorkflowNode extends WSNode {
 
-    private WorkflowNodeGUI gui;
-
     /**
      * Constructs a WorkflowNode.
      * 
@@ -53,17 +49,6 @@ public class WorkflowNode extends WSNode
     }
 
     /**
-     * @see org.apache.airavata.xbaya.graph.ws.WSNode#getGUI()
-     */
-    @Override
-    public NodeGUI getGUI() {
-        if (this.gui == null) {
-            this.gui = new WorkflowNodeGUI(this);
-        }
-        return this.gui;
-    }
-
-    /**
      * @see org.apache.airavata.xbaya.graph.ws.WSNode#getComponent()
      */
     @Override

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gui/XBayaToolBar.java Thu May 17 13:07:39 2012
@@ -43,8 +43,8 @@ import javax.swing.border.Border;
 import org.apache.airavata.common.utils.SwingUtil;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.graph.GraphException;
-import org.apache.airavata.xbaya.interpretor.XBayaExecutionState;
 import org.apache.airavata.xbaya.wf.Workflow;
+import org.apache.airavata.xbaya.wf.WorkflowExecutionState;
 
 import com.amazonaws.transform.MapEntry;
 
@@ -174,12 +174,12 @@ public class XBayaToolBar implements XBa
             public void actionPerformed(ActionEvent e1) {
                 try {
                     Workflow workflow = engine.getWorkflow();
-                    XBayaExecutionState executionState = workflow.getExecutionState();
-                    if (executionState == XBayaExecutionState.RUNNING || executionState == XBayaExecutionState.STEP) {
-                        workflow.setExecutionState(XBayaExecutionState.PAUSED);
+                    WorkflowExecutionState executionState = workflow.getExecutionState();
+                    if (executionState == WorkflowExecutionState.RUNNING || executionState == WorkflowExecutionState.STEP) {
+                        workflow.setExecutionState(WorkflowExecutionState.PAUSED);
                         play.setIcon(PLAY_ICON);
-                    } else if (executionState == XBayaExecutionState.PAUSED) {
-                        workflow.setExecutionState(XBayaExecutionState.RUNNING);
+                    } else if (executionState == WorkflowExecutionState.PAUSED) {
+                        workflow.setExecutionState(WorkflowExecutionState.RUNNING);
                         play.setIcon(PAUSE_ICON);
                     } else {
                         throw new IllegalStateException("Unknown state :" + executionState);
@@ -201,8 +201,8 @@ public class XBayaToolBar implements XBa
              */
             public void actionPerformed(ActionEvent e2) {
                 try {
-                    if (engine.getWorkflow().getExecutionState() == XBayaExecutionState.PAUSED) {
-                        engine.getWorkflow().setExecutionState(XBayaExecutionState.STEP);
+                    if (engine.getWorkflow().getExecutionState() == WorkflowExecutionState.PAUSED) {
+                        engine.getWorkflow().setExecutionState(WorkflowExecutionState.STEP);
                     } else {
                         throw new IllegalStateException("Unknown state :" + engine.getWorkflow().getExecutionState());
                     }
@@ -223,9 +223,9 @@ public class XBayaToolBar implements XBa
              */
             public void actionPerformed(ActionEvent e1) {
                 try {
-                    if (engine.getWorkflow().getExecutionState() != XBayaExecutionState.NONE
-                            || engine.getWorkflow().getExecutionState() != XBayaExecutionState.STOPPED) {
-                        engine.getWorkflow().setExecutionState(XBayaExecutionState.STOPPED);
+                    if (engine.getWorkflow().getExecutionState() != WorkflowExecutionState.NONE
+                            || engine.getWorkflow().getExecutionState() != WorkflowExecutionState.STOPPED) {
+                        engine.getWorkflow().setExecutionState(WorkflowExecutionState.STOPPED);
                     } else {
                         throw new IllegalStateException("Unknown state :" + engine.getWorkflow().getExecutionState());
                     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/StandaloneNotificationSender.java Thu May 17 13:07:39 2012
@@ -26,6 +26,7 @@ import java.util.List;
 
 import org.apache.airavata.common.utils.StringUtil;
 import org.apache.airavata.xbaya.XBayaConstants;
+import org.apache.airavata.xbaya.graph.controller.NodeController;
 import org.apache.airavata.xbaya.graph.system.InputNode;
 import org.apache.airavata.xbaya.graph.system.OutputNode;
 import org.apache.airavata.xbaya.graph.util.GraphUtil;
@@ -56,7 +57,7 @@ public class StandaloneNotificationSende
     public void workflowStarted(PyObject[] args, String[] keywords) {
         List<InputNode> inputs = GraphUtil.getInputNodes(this.workflow.getGraph());
         for (InputNode inputNode : inputs) {
-            inputNode.getGUI().setBodyColor(NodeState.FINISHED.color);
+            NodeController.getGUI(inputNode).setBodyColor(NodeState.FINISHED.color);
         }
 
     }
@@ -65,7 +66,7 @@ public class StandaloneNotificationSende
     public void workflowStarted(Object[] args, String[] keywords) {
         List<InputNode> inputs = GraphUtil.getInputNodes(this.workflow.getGraph());
         for (InputNode inputNode : inputs) {
-            inputNode.getGUI().setBodyColor(NodeState.FINISHED.color);
+            NodeController.getGUI(inputNode).setBodyColor(NodeState.FINISHED.color);
         }
     }
 
@@ -73,7 +74,7 @@ public class StandaloneNotificationSende
     public void workflowFinished(Object[] args, String[] keywords) {
         List<OutputNode> outputs = GraphUtil.getOutputNodes(this.workflow.getGraph());
         for (OutputNode outputNode : outputs) {
-            outputNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
+        	NodeController.getGUI(outputNode).setBodyColor(NodeState.EXECUTING.color);
         }
 
     }
@@ -88,7 +89,7 @@ public class StandaloneNotificationSende
     public void workflowFinished(PyObject[] args, String[] keywords) {
         List<OutputNode> outputs = GraphUtil.getOutputNodes(this.workflow.getGraph());
         for (OutputNode outputNode : outputs) {
-            outputNode.getGUI().setBodyColor(NodeState.EXECUTING.color);
+        	NodeController.getGUI(outputNode).setBodyColor(NodeState.EXECUTING.color);
         }
 
     }

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/TestWorkflowInterpreter.java Thu May 17 13:07:39 2012
@@ -34,7 +34,7 @@ import org.apache.airavata.xbaya.XBayaCo
 import org.apache.airavata.xbaya.XBayaConstants;
 import org.apache.airavata.xbaya.XBayaException;
 import org.apache.airavata.xbaya.component.ws.WSComponentPort;
-import org.apache.airavata.xbaya.ode.ODEClient;
+import org.apache.airavata.xbaya.invoker.ODEClient;
 import org.apache.airavata.xbaya.security.SecurityUtil;
 import org.apache.airavata.common.utils.Pair;
 import org.apache.airavata.xbaya.wf.Workflow;

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpreter.java Thu May 17 13:07:39 2012
@@ -21,7 +21,6 @@
 
 package org.apache.airavata.xbaya.interpretor;
 
-import java.awt.Color;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -44,9 +43,7 @@ import org.apache.airavata.common.regist
 import org.apache.airavata.common.utils.Pair;
 import org.apache.airavata.common.utils.WSDLUtil;
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.registry.api.AiravataRegistry;
 import org.apache.airavata.registry.api.WorkflowExecutionStatus.ExecutionStatus;
-import org.apache.airavata.registry.api.impl.AiravataJCRRegistry;
 import org.apache.airavata.xbaya.XBayaConfiguration;
 import org.apache.airavata.xbaya.XBayaEngine;
 import org.apache.airavata.xbaya.XBayaException;
@@ -57,8 +54,8 @@ import org.apache.airavata.xbaya.compone
 import org.apache.airavata.xbaya.component.amazon.InstanceComponent;
 import org.apache.airavata.xbaya.component.amazon.TerminateInstanceComponent;
 import org.apache.airavata.xbaya.component.dynamic.DynamicComponent;
-import org.apache.airavata.xbaya.component.dynamic.DynamicInvoker;
 import org.apache.airavata.xbaya.component.system.ConstantComponent;
+import org.apache.airavata.xbaya.component.system.DifferedInputComponent;
 import org.apache.airavata.xbaya.component.system.EndForEachComponent;
 import org.apache.airavata.xbaya.component.system.EndifComponent;
 import org.apache.airavata.xbaya.component.system.ForEachComponent;
@@ -72,16 +69,16 @@ import org.apache.airavata.xbaya.compone
 import org.apache.airavata.xbaya.concurrent.PredicatedTaskRunner;
 import org.apache.airavata.xbaya.graph.ControlPort;
 import org.apache.airavata.xbaya.graph.DataPort;
-import org.apache.airavata.xbaya.graph.Graph;
 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.dynamic.BasicTypeMapping;
 import org.apache.airavata.xbaya.graph.dynamic.DynamicNode;
 import org.apache.airavata.xbaya.graph.gui.NodeGUI;
 import org.apache.airavata.xbaya.graph.impl.EdgeImpl;
 import org.apache.airavata.xbaya.graph.impl.NodeImpl;
 import org.apache.airavata.xbaya.graph.subworkflow.SubWorkflowNode;
-import org.apache.airavata.xbaya.graph.subworkflow.SubWorkflowNodeGUI;
+import org.apache.airavata.xbaya.graph.subworkflow.gui.SubWorkflowNodeGUI;
 import org.apache.airavata.xbaya.graph.system.ConstantNode;
 import org.apache.airavata.xbaya.graph.system.EndForEachNode;
 import org.apache.airavata.xbaya.graph.system.EndifNode;
@@ -89,16 +86,18 @@ import org.apache.airavata.xbaya.graph.s
 import org.apache.airavata.xbaya.graph.system.IfNode;
 import org.apache.airavata.xbaya.graph.system.InputNode;
 import org.apache.airavata.xbaya.graph.system.OutputNode;
-import org.apache.airavata.xbaya.graph.system.gui.DifferedInputComponent;
 import org.apache.airavata.xbaya.graph.system.gui.DifferedInputHandler;
 import org.apache.airavata.xbaya.graph.ws.WSGraph;
 import org.apache.airavata.xbaya.graph.ws.WSNode;
 import org.apache.airavata.xbaya.graph.ws.WSPort;
 import org.apache.airavata.xbaya.gui.Cancelable;
 import org.apache.airavata.xbaya.gui.WaitDialog;
+import org.apache.airavata.xbaya.invoker.DynamicInvoker;
 import org.apache.airavata.xbaya.invoker.EmbeddedGFacInvoker;
 import org.apache.airavata.xbaya.invoker.GenericInvoker;
 import org.apache.airavata.xbaya.invoker.Invoker;
+import org.apache.airavata.xbaya.invoker.ODEClient;
+import org.apache.airavata.xbaya.invoker.ODEClientUtil;
 import org.apache.airavata.xbaya.invoker.WorkflowInvokerWrapperForGFacInvoker;
 import org.apache.airavata.xbaya.jython.lib.NotificationSender;
 import org.apache.airavata.xbaya.jython.lib.WorkflowNotifiable;
@@ -107,8 +106,6 @@ import org.apache.airavata.xbaya.monitor
 import org.apache.airavata.xbaya.monitor.gui.MonitorEventHandler.NodeState;
 import org.apache.airavata.xbaya.myproxy.MyProxyClient;
 import org.apache.airavata.xbaya.myproxy.gui.MyProxyChecker;
-import org.apache.airavata.xbaya.ode.ODEClient;
-import org.apache.airavata.xbaya.ode.ODEClientUtil;
 import org.apache.airavata.xbaya.provenance.ProvenanceReader;
 import org.apache.airavata.xbaya.provenance.ProvenanceWrite;
 import org.apache.airavata.xbaya.security.SecurityUtil;
@@ -117,16 +114,14 @@ import org.apache.airavata.xbaya.util.Am
 import org.apache.airavata.xbaya.util.InterpreterUtil;
 import org.apache.airavata.xbaya.util.XBayaUtil;
 import org.apache.airavata.xbaya.wf.Workflow;
+import org.apache.airavata.xbaya.wf.WorkflowExecutionState;
 import org.apache.axis2.context.ConfigurationContext;
 import org.ietf.jgss.GSSCredential;
 import org.xmlpull.infoset.XmlElement;
-import org.xmlpull.infoset.impl.XmlElementWithViewsImpl;
 
 import xsul.lead.LeadContextHeader;
 import xsul.lead.LeadResourceMapping;
 import xsul5.XmlConstants;
-import xsul5.wsdl.WsdlPort;
-import xsul5.wsdl.WsdlService;
 
 public class WorkflowInterpreter {
 
@@ -283,12 +278,12 @@ public class WorkflowInterpreter {
 	public void scheduleDynamically() throws XBayaException {
 		try {
 			if (!this.isSubWorkflow
-					&& this.getWorkflow().getExecutionState() != XBayaExecutionState.NONE) {
+					&& this.getWorkflow().getExecutionState() != WorkflowExecutionState.NONE) {
 				throw new WorkFlowInterpreterException(
 						"XBaya is already running a workflow");
 			}
 
-			this.getWorkflow().setExecutionState(XBayaExecutionState.RUNNING);
+			this.getWorkflow().setExecutionState(WorkflowExecutionState.RUNNING);
 			if (actOnProvenance) {
 				try {
 					this.configuration
@@ -305,7 +300,7 @@ public class WorkflowInterpreter {
 			String[] keywords = new String[inputNodes.size()];
 			for (int i = 0; i < inputNodes.size(); ++i) {
 				Node node = inputNodes.get(i);
-				node.getGUI().setBodyColor(NodeState.FINISHED.color);
+				NodeController.getGUI(node).setBodyColor(NodeState.FINISHED.color);
 				if (this.mode == GUI_MODE) {
 					this.engine.getGUI().getGraphCanvas().repaint();
 				}
@@ -313,17 +308,17 @@ public class WorkflowInterpreter {
 				values[i] = ((InputNode) node).getDefaultValue();
 			}
 			this.notifier.workflowStarted(values, keywords);
-			while (this.getWorkflow().getExecutionState() != XBayaExecutionState.STOPPED) {
+			while (this.getWorkflow().getExecutionState() != WorkflowExecutionState.STOPPED) {
 				if (getRemainNodesDynamically() == 0) {
 					if (this.mode == GUI_MODE) {
 						this.notifyPause();
 					} else {
 						this.getWorkflow().setExecutionState(
-								XBayaExecutionState.STOPPED);
+								WorkflowExecutionState.STOPPED);
 					}
 				}
 				// ok we have paused sleep
-				while (this.getWorkflow().getExecutionState() == XBayaExecutionState.PAUSED) {
+				while (this.getWorkflow().getExecutionState() == WorkflowExecutionState.PAUSED) {
 					try {
 						Thread.sleep(400);
 					} catch (InterruptedException e) {
@@ -337,8 +332,8 @@ public class WorkflowInterpreter {
 						this.notifyPause();
 						break;
 					}
-					if (this.getWorkflow().getExecutionState() == XBayaExecutionState.PAUSED
-							|| this.getWorkflow().getExecutionState() == XBayaExecutionState.STOPPED) {
+					if (this.getWorkflow().getExecutionState() == WorkflowExecutionState.PAUSED
+							|| this.getWorkflow().getExecutionState() == WorkflowExecutionState.STOPPED) {
 						break;
 						// stop executing and sleep in the outer loop cause we
 						// want
@@ -355,9 +350,9 @@ public class WorkflowInterpreter {
 					// if (!nodeOutputLoadedFromProvenance) {
 					executeDynamically(node);
 					// }
-					if (this.getWorkflow().getExecutionState() == XBayaExecutionState.STEP) {
+					if (this.getWorkflow().getExecutionState() == WorkflowExecutionState.STEP) {
 						this.getWorkflow().setExecutionState(
-								XBayaExecutionState.PAUSED);
+								WorkflowExecutionState.PAUSED);
 						break;
 					}
 				}
@@ -372,7 +367,7 @@ public class WorkflowInterpreter {
 					if (InterpreterUtil.getRunningNodeCountDynamically(this.graph) == 0
 							&& InterpreterUtil.getFailedNodeCountDynamically(this.graph) != 0) {
 						this.getWorkflow().setExecutionState(
-								XBayaExecutionState.PAUSED);
+								WorkflowExecutionState.PAUSED);
 					}
 
 					try {
@@ -442,12 +437,12 @@ public class WorkflowInterpreter {
 			} else {
 				finish();
 			}
-			this.workflow.setExecutionState(XBayaExecutionState.NONE);
+			this.workflow.setExecutionState(WorkflowExecutionState.NONE);
 		} catch (RuntimeException e) {
 			// we reset all the state
 			cleanup();
 			this.notifier.cleanup();
-			this.workflow.setExecutionState(XBayaExecutionState.NONE);
+			this.workflow.setExecutionState(WorkflowExecutionState.NONE);
 			raiseException(e);
 		}
 	}
@@ -497,7 +492,7 @@ public class WorkflowInterpreter {
 				}
 
 				this.invokerMap.put(node, invoker);
-				node.getGUI().setBodyColor(NodeState.FINISHED.color);
+				NodeController.getGUI(node).setBodyColor(NodeState.FINISHED.color);
 				return true;
 			}
 		} catch (Exception e) {
@@ -542,8 +537,8 @@ public class WorkflowInterpreter {
 	private void notifyPause() {
 		if (this.mode == GUI_MODE) {
 
-			if (this.getWorkflow().getExecutionState() == XBayaExecutionState.RUNNING
-					|| this.getWorkflow().getExecutionState() == XBayaExecutionState.STEP) {
+			if (this.getWorkflow().getExecutionState() == WorkflowExecutionState.RUNNING
+					|| this.getWorkflow().getExecutionState() == WorkflowExecutionState.STEP) {
 				this.engine.getGUI().getToolbar().getPlayAction()
 						.actionPerformed(null);
 			} else {
@@ -556,7 +551,7 @@ public class WorkflowInterpreter {
 	 * @throws MonitorException
 	 */
 	public void cleanup() throws MonitorException {
-		this.workflow.setExecutionState(XBayaExecutionState.STOPPED);
+		this.workflow.setExecutionState(WorkflowExecutionState.STOPPED);
 		if (this.mode == GUI_MODE) {
 			this.engine.resetWorkflowInterpreter();
 			try {
@@ -577,7 +572,7 @@ public class WorkflowInterpreter {
 				// next run
 				// even if the next run runs before the notification arrives
 
-				node.getGUI().setBodyColor(NodeState.EXECUTING.color);
+				NodeController.getGUI(node).setBodyColor(NodeState.EXECUTING.color);
 				// OutputNode node = (OutputNode) outputNode;
 				List<DataPort> inputPorts = node.getInputPorts();
 
@@ -624,7 +619,7 @@ public class WorkflowInterpreter {
 													// Templates.
 						}
 					}
-					node.getGUI().setBodyColor(NodeState.FINISHED.color);
+					NodeController.getGUI(node).setBodyColor(NodeState.FINISHED.color);
 				}
 				System.out.println("Looping");
 			}
@@ -639,7 +634,7 @@ public class WorkflowInterpreter {
 		List<NodeImpl> nodes = this.graph.getNodes();
 		for (Node node : nodes) {
 			if (node instanceof OutputNode) {
-				if (node.getInputPort(0).getFromNode().getGUI().getBodyColor() == NodeState.FINISHED.color) {
+				if (NodeController.getGUI(node.getInputPort(0).getFromNode()).getBodyColor() == NodeState.FINISHED.color) {
 					outoutNodes.add(node);
 				} else {
 					// The workflow is incomplete so return without sending
@@ -664,7 +659,7 @@ public class WorkflowInterpreter {
 									+ node.getID());
 				}
 				// Some node not yet updated
-				if (node.getGUI().getBodyColor() != NodeState.FINISHED.color) {
+				if (NodeController.getGUI(node).getBodyColor() != NodeState.FINISHED.color) {
 					if (actOnProvenance) {
 						try {
 							if (val instanceof String) {
@@ -697,7 +692,7 @@ public class WorkflowInterpreter {
 					} else {
 						((OutputNode) node).setDescription(val.toString());
 					}
-					node.getGUI().setBodyColor(NodeState.FINISHED.color);
+					NodeController.getGUI(node).setBodyColor(NodeState.FINISHED.color);
 				}
 			}
 
@@ -710,7 +705,7 @@ public class WorkflowInterpreter {
 	}
 
 	private void executeDynamically(final Node node) throws XBayaException {
-		node.getGUI().setBodyColor(NodeState.EXECUTING.color);
+		NodeController.getGUI(node).setBodyColor(NodeState.EXECUTING.color);
 		Component component = node.getComponent();
 		if (component instanceof SubWorkflowComponent) {
 			handleSubWorkComponent(node);
@@ -744,7 +739,7 @@ public class WorkflowInterpreter {
 			AmazonUtil.terminateInstances(instanceId);
 
 			// set color to done
-			node.getGUI().setBodyColor(NodeState.FINISHED.color);
+			NodeController.getGUI(node).setBodyColor(NodeState.FINISHED.color);
 		} else {
 			throw new WorkFlowInterpreterException(
 					"Encountered Node that cannot be executed:" + node);
@@ -754,7 +749,7 @@ public class WorkflowInterpreter {
 
 	private void handleSubWorkComponent(Node node) throws XBayaException {
 		if ((this.mode == GUI_MODE) && (node instanceof SubWorkflowNodeGUI)) {
-			((SubWorkflowNodeGUI) node.getGUI()).openWorkflowTab(this.engine);
+			((SubWorkflowNodeGUI) NodeController.getGUI(node)).openWorkflowTab(this.engine);
 		}
 		// setting the inputs
 		Workflow subWorkflow = ((SubWorkflowNode) node).getWorkflow();
@@ -1057,7 +1052,7 @@ public class WorkflowInterpreter {
 		this.invokerMap.put(node, dynamicInvoker);
 		dynamicInvoker.setup();
 		dynamicInvoker.invoke();
-		node.getGUI().setBodyColor(NodeState.FINISHED.color);
+		NodeController.getGUI(node).setBodyColor(NodeState.FINISHED.color);
 	}
 
 	private void handleForEach(Node node) throws XBayaException {
@@ -1140,9 +1135,9 @@ public class WorkflowInterpreter {
 						int parallelRuns = listOfValues.size()
 								* node1.getOutputPorts().size();
 						if (listOfValues.size() > 0) {
-							forEachNode.getGUI().setBodyColor(
+							NodeController.getGUI(forEachNode).setBodyColor(
 									NodeState.EXECUTING.color);
-							node1.getGUI().setBodyColor(
+							NodeController.getGUI(node1).setBodyColor(
 									NodeState.EXECUTING.color);
 							List<DataPort> outputPorts = node1.getOutputPorts();
 							final AtomicInteger counter = new AtomicInteger();
@@ -1200,9 +1195,9 @@ public class WorkflowInterpreter {
 				}
 				// we have finished execution so end foreach is finished
 				// todo this has to be done in a separate thread
-				endForEachNode.getGUI().setBodyColor(NodeState.FINISHED.color);
-				middleNode.getGUI().setBodyColor(NodeState.FINISHED.color);
-				node.getGUI().setBodyColor(NodeState.FINISHED.color);
+				NodeController.getGUI(endForEachNode).setBodyColor(NodeState.FINISHED.color);
+				NodeController.getGUI(middleNode).setBodyColor(NodeState.FINISHED.color);
+				NodeController.getGUI(node).setBodyColor(NodeState.FINISHED.color);
 
 			} else {
 
@@ -1240,9 +1235,9 @@ public class WorkflowInterpreter {
 						.size() * outputPorts1.size();
 				if (listOfValues.size() > 0) {
 
-					forEachNode.getGUI()
+					NodeController.getGUI(forEachNode)
 							.setBodyColor(NodeState.EXECUTING.color);
-					foreachWSNode.getGUI().setBodyColor(
+					NodeController.getGUI(foreachWSNode).setBodyColor(
 							NodeState.EXECUTING.color);
 					List<DataPort> outputPorts = middleNode.getOutputPorts();
 					final AtomicInteger counter = new AtomicInteger();
@@ -1276,9 +1271,9 @@ public class WorkflowInterpreter {
 					}
 					// we have finished execution so end foreach is finished
 					// todo this has to be done in a separate thread
-					middleNode.getGUI().setBodyColor(NodeState.FINISHED.color);
+					NodeController.getGUI(middleNode).setBodyColor(NodeState.FINISHED.color);
 					for (Node endForEach : endForEachNodes) {
-						endForEach.getGUI().setBodyColor(
+						NodeController.getGUI(endForEach).setBodyColor(
 								NodeState.FINISHED.color);
 					}
 				} else {
@@ -1337,7 +1332,7 @@ public class WorkflowInterpreter {
 				}
 			}
 
-			node.getGUI().setBodyColor(NodeState.FINISHED.color);
+			NodeController.getGUI(node).setBodyColor(NodeState.FINISHED.color);
 
 		} catch (XPathExpressionException e) {
 			throw new WorkFlowInterpreterException(
@@ -1377,7 +1372,7 @@ public class WorkflowInterpreter {
 
 		this.invokerMap.put(node, invoker);
 
-		node.getGUI().setBodyColor(NodeState.FINISHED.color);
+		NodeController.getGUI(node).setBodyColor(NodeState.FINISHED.color);
 	}
 
 	private Invoker createInvokerForEachSingleWSNode(Node foreachWSNode,
@@ -1581,7 +1576,7 @@ public class WorkflowInterpreter {
 			}
 			i++;
 		}
-		forEachNode.getGUI().setBodyColor(NodeState.FINISHED.color);
+		NodeController.getGUI(forEachNode).setBodyColor(NodeState.FINISHED.color);
 	}
 
 	private void invokeGFacService(LinkedList<String> listOfValues,
@@ -1705,8 +1700,8 @@ public class WorkflowInterpreter {
 		List<NodeImpl> nodes = this.graph.getNodes();
 		for (Node node : nodes) {
 			if (node instanceof OutputNode
-					&& node.getGUI().getBodyColor() == NodeGUI.DEFAULT_BODY_COLOR
-					&& node.getInputPort(0).getFromNode().getGUI()
+					&& NodeController.getGUI(node).getBodyColor() == NodeGUI.DEFAULT_BODY_COLOR
+					&& NodeController.getGUI(node.getInputPort(0).getFromNode())
 							.getBodyColor() == NodeState.FINISHED.color) {
 
 				list.add(node);

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorEventListener.java Thu May 17 13:07:39 2012
@@ -26,10 +26,7 @@ import java.net.URI;
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.xml.stream.XMLStreamException;
-
 import org.apache.airavata.common.utils.XMLUtil;
-import org.apache.airavata.commons.WorkFlowUtils;
 import org.apache.airavata.wsmg.client.ConsumerNotificationHandler;
 import org.apache.airavata.wsmg.client.MsgBrokerClientException;
 import org.apache.airavata.wsmg.client.NotificationHandler;
@@ -41,6 +38,7 @@ import org.apache.airavata.xbaya.graph.E
 import org.apache.airavata.xbaya.graph.Graph;
 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.gui.NodeGUI;
 import org.apache.airavata.xbaya.graph.impl.NodeImpl;
 import org.apache.airavata.xbaya.graph.system.InputNode;
@@ -269,20 +267,20 @@ public class WorkflowInterpretorEventLis
     }
 
     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();
     }
 
     /**

Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java?rev=1339587&r1=1339586&r2=1339587&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/interpretor/WorkflowInterpretorSkeleton.java Thu May 17 13:07:39 2012
@@ -43,8 +43,8 @@ import org.apache.airavata.xbaya.compone
 import org.apache.airavata.xbaya.concurrent.PredicatedTaskRunner;
 import org.apache.airavata.xbaya.graph.GraphException;
 import org.apache.airavata.xbaya.graph.system.InputNode;
+import org.apache.airavata.xbaya.invoker.ODEClient;
 import org.apache.airavata.xbaya.monitor.MonitorException;
-import org.apache.airavata.xbaya.ode.ODEClient;
 import org.apache.airavata.xbaya.wf.Workflow;
 import org.apache.airavata.xbaya.workflow.proxy.WorkflowContext;
 import org.apache.axiom.om.OMElement;



Mime
View raw message